summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Expand)AuthorAgeFilesLines
* Cleanup unnecessary includes for libskia.Derek Sollenberger2014-02-271-7/+0
* Merge "Allow disabling layer rotation during screenshots"Dan Stoza2014-02-201-1/+1
|\
| * Allow disabling layer rotation during screenshotsDan Stoza2014-02-141-1/+1
* | Extend pm create-user to handle related and managed users.Kenny Guy2014-02-141-2/+33
* | am 6231c948: am dc3561df: am 01de2432: am 24d8fa73: Merge "frameworks/base: m...Dianne Hackborn2014-02-146-0/+1056
|\ \
| * \ am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/...Dianne Hackborn2014-02-146-0/+1056
| |\ \
| | * | frameworks/base: move idmap from frameworks/nativeColin Cross2014-02-116-0/+1056
* | | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-131-2/+2
* | | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-121-2/+2
| |_|/ |/| |
* | | Merge "sqlite integer fields are long"Marco Nelissen2014-01-081-1/+1
|\ \ \
| * | | sqlite integer fields are longMarco Nelissen2014-01-081-1/+1
* | | | resolved conflicts for merge of 88bfc6dd to masterCraig Mautner2014-01-081-10/+7
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Extend stack management to other displays.Craig Mautner2014-01-061-10/+7
* | | resolved conflicts for merge of b7bba718 to masterCraig Mautner2013-12-191-3/+11
|\ \ \ | |/ /
| * | Pair ActivityStacks with DisplaysCraig Mautner2013-12-181-3/+11
* | | DO NOT MERGE: Eliminate StackBox.Craig Mautner2013-12-191-43/+36
* | | am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Dr...Nick Kralevich2013-12-161-4/+0
|\ \ \ | |/ /
| * | am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loada...Nick Kralevich2013-12-161-4/+0
| |\ \
| | * \ am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abil...Nick Kralevich2013-12-161-4/+0
| | |\ \ | | | |/
| | | * [bootanimation] Drop user loadable bootanimation.zip abiltiy.Robert Craig2013-12-161-4/+0
* | | | am 411954ae: am a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set ...Nick Kralevich2013-12-111-3/+0
|\ \ \ \ | |/ / /
| * | | am a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set service.boota...Nick Kralevich2013-12-111-3/+0
| |\ \ \ | | |/ /
| | * | am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"Nick Kralevich2013-12-111-3/+0
| | |\ \ | | | |/
| | | * Don't try to set service.bootanim.exitNick Kralevich2013-12-111-3/+0
| * | | am 9f09408e: am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms ...Narayan Kamath2013-12-112-41/+60
| |\ \ \ | | |/ /
| | * | am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-112-41/+60
| | |\ \ | | | |/
| | | * Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-112-41/+60
| | | |\
| | | | * Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-092-41/+60
| | | | * Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2214-494/+364
| | | | |\
| * | | | | DO NOT MERGE: Eliminate StackBox.Craig Mautner2013-12-091-43/+36
| |/ / / /
* | | | | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-112-41/+60
* | | | | Call SkBitmap::config() instead of ::getConfig()Leon Scroggins III2013-12-031-2/+2
|/ / / /
* | | | am e3705342: am b0183f0a: Harden against transiently unavailable backup trans...Christopher Tate2013-11-191-6/+13
|\ \ \ \
| * | | | Harden against transiently unavailable backup transportsChristopher Tate2013-11-191-6/+13
* | | | | am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-devSascha Prueter2013-11-181-13/+6
|\ \ \ \ \ | |/ / / /
| * | | | Trying to unbreak build...Sascha Prueter2013-11-191-13/+6
* | | | | am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backu...Christopher Tate2013-11-181-6/+13
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Harden against transiently unavailable backup transportsChristopher Tate2013-11-181-6/+13
* | | | am 601fbc7a: am 24fe066e: Merge "Fix am argument ordering documentation." int...Jeff Sharkey2013-11-141-1/+1
|\ \ \ \ | |/ / /
| * | | Fix am argument ordering documentation.Jeff Sharkey2013-11-141-1/+1
* | | | am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-291-2/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-291-2/+2
* | | am 65d57713: am bacb5422: Merge "Also rely on enabled notification listeners ...Jean-Michel Trivi2013-10-071-0/+5
|\ \ \ | | |/ | |/|
| * | Also rely on enabled notification listeners for RemoteController registrationJean-Michel Trivi2013-10-041-0/+5
* | | am 78466f3e: am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround."Nick Kralevich2013-09-181-29/+0
|\ \ \ | |/ / |/| / | |/
| * revert ADDR_COMPAT_LAYOUT workaround.Nick Kralevich2013-09-181-29/+0
* | Implement issue #10691359: Kill long-running processesDianne Hackborn2013-09-161-0/+19
* | Add #! to 'am' shell scriptAndy McFadden2013-09-041-0/+2
* | Fix check for default source in input commandMichael Wright2013-08-221-1/+1
* | Changes needed to support Skia at r10377.Derek Sollenberger2013-08-011-1/+1