summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MtpDatabase: Fix typo affecting parent and format queriesMike Lockwood2012-09-111-2/+2
* Merge "SurfaceTexture: add updateTexImage synchronization" into jb-mr1-devJamie Gennis2012-09-101-0/+4
|\
| * SurfaceTexture: add updateTexImage synchronizationJamie Gennis2012-09-091-0/+4
* | Merge "Fix port logic in WifiDisplayController." into jb-mr1-devAndreas Huber2012-09-101-2/+7
|\ \
| * | Fix port logic in WifiDisplayController.Andreas Huber2012-09-101-2/+7
* | | Merge "Check for null ViewRootImpl when saving accessibility focus in ListVie...Svetoslav Ganov2012-09-101-14/+20
|\ \ \
| * | | Check for null ViewRootImpl when saving accessibility focus in ListView.alanv2012-09-101-14/+20
* | | | Merge "Reset GL buffer state after functor invocation" into jb-mr1-devChet Haase2012-09-101-2/+4
|\ \ \ \
| * | | | Reset GL buffer state after functor invocationChet Haase2012-09-101-2/+4
* | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-1049-50/+2254
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1049-50/+2254
| | |_|/ / | |/| | |
* | | | | Merge "Notifications: Hide ticker updates from background users." into jb-mr1...John Spurlock2012-09-102-1/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Notifications: Hide ticker updates from background users.John Spurlock2012-09-102-1/+8
| |/ / /
* | | | Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-devSvetoslav Ganov2012-09-101-6/+483
|\ \ \ \
| * | | | Improve scaling vs pan in screen magnifier.Svetoslav Ganov2012-09-101-6/+483
* | | | | Merge "Fix DevicePolicyManager crash when settings password quality (and poss...Amith Yamasani2012-09-101-1/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix DevicePolicyManager crash when settings password quality (and possibly ot...Amith Yamasani2012-09-101-1/+7
* | | | | Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-devWu-cheng Li2012-09-102-2/+1
|\ \ \ \ \
| * | | | | Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.Wu-cheng Li2012-09-072-2/+1
* | | | | | Merge "Fix device list update" into jb-mr1-devIrfan Sheriff2012-09-102-1/+2
|\ \ \ \ \ \
| * | | | | | Fix device list updateIrfan Sheriff2012-09-102-1/+2
* | | | | | | Merge "Pass EXCLUDE_FROM_RECENTS when starting secure camera." into jb-mr1-devWu-cheng Li2012-09-091-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Pass EXCLUDE_FROM_RECENTS when starting secure camera.Wu-cheng Li2012-09-071-2/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Various fixes." into jb-mr1-devDianne Hackborn2012-09-095-69/+94
|\ \ \ \ \ \ \
| * | | | | | | Various fixes.Dianne Hackborn2012-09-095-69/+94
* | | | | | | | Merge "Handle case where user info might not be available." into jb-mr1-devJeff Brown2012-09-091-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Handle case where user info might not be available.Jeff Brown2012-09-091-1/+1
* | | | | | | | Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-devIrfan Sheriff2012-09-092-2/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Update WifiP2pWfdDevInfo from device found eventIrfan Sheriff2012-09-092-2/+16
* | | | | | | | | am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header fi...Elliott Hughes2012-09-092-2/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the ...Elliott Hughes2012-09-092-2/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am bfe1ab82: Merge "Fix aapt to get expat header files from the approved loca...Elliott Hughes2012-09-092-2/+1
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge "Fix aapt to get expat header files from the approved location."Elliott Hughes2012-09-092-2/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix aapt to get expat header files from the approved location.Elliott Hughes2012-09-092-2/+1
* | | | | | | | | | | | | Merge "Add a native library to test APKs" into jb-mr1-devKenny Root2012-09-093-0/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add a native library to test APKsKenny Root2012-09-093-0/+85
* | | | | | | | | | | | | | Merge "Add more testing for native libraries" into jb-mr1-devKenny Root2012-09-091-69/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Add more testing for native librariesKenny Root2012-09-091-69/+189
* | | | | | | | | | | | | | Merge "Update PackageSetting flags when updating" into jb-mr1-devKenny Root2012-09-092-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | / / / / / / | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Update PackageSetting flags when updatingKenny Root2012-09-092-8/+9
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Use correct PowerManager call to wake up screen" into jb-mr1-devGuang Zhu2012-09-091-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use correct PowerManager call to wake up screenGuang Zhu2012-09-091-9/+9
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "A little cleanup." into jb-mr1-devDianne Hackborn2012-09-093-31/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | A little cleanup.Dianne Hackborn2012-09-093-31/+53
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Copy all mutable state before sending to clients." into jb-mr1-devJeff Brown2012-09-093-14/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Copy all mutable state before sending to clients.Jeff Brown2012-09-093-14/+23
* | | | | | | | | | | | Merge "Disable wifi display API when the adapter is not registered." into jb-...Jeff Brown2012-09-092-11/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Disable wifi display API when the adapter is not registered.Jeff Brown2012-09-092-11/+14
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Throw ALL the exceptions! (in the PackageManagerTests)Kenny Root2012-09-091-398/+493
* | | | | | | | | | Remove "protect" command from installdKenny Root2012-09-093-51/+0
| |/ / / / / / / / |/| | | | | | | |