summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Network inspection API.Robert Greenwalt2014-07-104-24/+140
* am 0bf5cfc0: am 8348c351: am 4fea742c: Merge "Update copyFrom(BaseObj[]) for ...Stephen Hines2014-07-100-0/+0
|\
| * am 8348c351: am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects."Stephen Hines2014-07-101-5/+12
| |\
| | * am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects."Stephen Hines2014-07-101-5/+12
| | |\
| | | * Merge "Update copyFrom(BaseObj[]) for large objects."Stephen Hines2014-07-091-5/+12
| | | |\
| | | | * Update copyFrom(BaseObj[]) for large objects.Tim Murray2014-07-091-5/+12
| | | |/
* | | | Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/...Elliott Hughes2014-07-101-0/+4
|\ \ \ \
| * \ \ \ Merge "Get rid of security exception spam during boot."Dianne Hackborn2014-07-091-0/+4
| |\ \ \ \
| | * | | | Get rid of security exception spam during boot.Dianne Hackborn2014-07-091-0/+4
* | | | | | am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/and...Elliott Hughes2014-07-101-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the...Elliott Hughes2014-07-101-1/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."Elliott Hughes2014-07-101-1/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge "Switch frameworks/base/libs/androidfw to the new icu."Elliott Hughes2014-07-091-1/+0
| | | |\ \
| | | | * | Switch frameworks/base/libs/androidfw to the new icu.Elliott Hughes2014-07-091-1/+0
* | | | | | resolved conflicts for merge of f6be5a7a to masterElliott Hughes2014-07-091-2/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new i...Elliott Hughes2014-07-101-2/+1
| |\ \ \ \ | | |/ / /
| | * | | am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."Elliott Hughes2014-07-101-2/+1
| | |\ \ \ | | | |/ /
| | | * | Merge "Switch frameworks/base/core/jni to the new icu."Elliott Hughes2014-07-091-2/+1
| | | |\ \ | | | | |/
| | | | * Switch frameworks/base/core/jni to the new icu.Elliott Hughes2014-07-091-2/+1
* | | | | am 10c286d6: am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Sta...Robert Ly2014-07-101-504/+125
|\ \ \ \ \ | |/ / / /
| * | | | am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: http:...Robert Ly2014-07-101-504/+125
| |\ \ \ \
| | * \ \ \ Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.co...Robert Ly2014-07-091-504/+125
| | |\ \ \ \
| | | * | | | Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.goog...Robert Ly2014-07-101-504/+125
* | | | | | | Merge "Update copyFrom(BaseObj[]) for large objects."Tim Murray2014-07-091-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Update copyFrom(BaseObj[]) for large objects.Tim Murray2014-07-091-5/+12
* | | | | | | | Merge "Remove icon from base alert dialog, use light theme"Alan Viverette2014-07-092-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove icon from base alert dialog, use light themeAlan Viverette2014-07-092-3/+2
* | | | | | | | | Merge "Extend pm to support sessions and split APKs."Jeff Sharkey2014-07-0912-234/+522
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extend pm to support sessions and split APKs.Jeff Sharkey2014-07-0912-234/+522
* | | | | | | | | | Remove the unnessary logztenghui2014-07-091-1/+0
* | | | | | | | | | Merge "Add an API to disable data reduction proxy."Selim Gurun2014-07-093-0/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add an API to disable data reduction proxy.Selim Gurun2014-07-093-0/+50
* | | | | | | | | | | Merge "Add versionCode to split manifest; compile."Jeff Sharkey2014-07-091-8/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | Add versionCode to split manifest; compile.Jeff Sharkey2014-07-091-8/+19
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Service for reading and writing blocks to PST partition"Andres Morales2014-07-0914-33/+485
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Service for reading and writing blocks to PST partitionAndres Morales2014-07-0914-33/+485
| |/ / / / / / /
* | | | | | | | am 8e086faf: am 9afee0df: docs: Added missing instructions for copying the Go...Quddus Chong2014-07-091-21/+50
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 9afee0df: docs: Added missing instructions for copying the Google Play Ser...Quddus Chong2014-07-091-21/+50
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | docs: Added missing instructions for copying the Google Play Services library...Quddus Chong2014-07-091-21/+50
* | | | | | | | Merge "ActivityManager: pass the main uid of the app to lmkd"Colin Cross2014-07-092-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | ActivityManager: pass the main uid of the app to lmkdColin Cross2014-07-092-3/+5
* | | | | | | | | camera2: Add NoiseProfile HAL tag.Ruben Brunk2014-07-092-0/+27
* | | | | | | | | Merge "Fixing random crash when transitioning to Recents, ensuring we don't u...Winson Chung2014-07-094-17/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixing random crash when transitioning to Recents, ensuring we don't update t...Winson Chung2014-07-094-17/+28
* | | | | | | | | | Unhide the Bluetooth(BLE) offload capability apisPrerepa Viswanadham2014-07-092-3/+3
* | | | | | | | | | Decouple critical policy power update from SCREEN_ON broadcastJim Miller2014-07-091-24/+28
* | | | | | | | | | OnFound and Onlost callback integrationPrerepa Viswanadham2014-07-098-5/+46
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Upgraded system apps could be mono or cluster.Jeff Sharkey2014-07-091-1/+4
* | | | | | | | | Fix extraneous allocation and copyingAnish Athalye2014-07-091-2/+2
* | | | | | | | | am 0d15ec78: am d7880b6a: docs: fix packaging instructions again to reflect c...Robert Ly2014-07-093-30/+19
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |