summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make isHostRoute match only host routesLorenzo Colitti2013-03-272-1/+38
* Match tests to new API.Amith Yamasani2013-03-261-7/+7
* Merge "Device Owner, a special kind of device admin" into jb-mr2-devAmith Yamasani2013-03-269-60/+349
|\
| * Device Owner, a special kind of device adminAmith Yamasani2013-03-269-60/+349
* | Merge "Fix string for tablet" into jb-mr2-devIrfan Sheriff2013-03-261-1/+2
|\ \
| * | Fix string for tabletIrfan Sheriff2013-03-261-1/+2
* | | am 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleN...Elliott Hughes2013-03-261-85/+43
|\ \ \
| * \ \ am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.get...Elliott Hughes2013-03-261-85/+43
| |\ \ \
| | * \ \ Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."Elliott Hughes2013-03-261-85/+43
| | |\ \ \
| | | * | | Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.Elliott Hughes2013-03-261-85/+43
| | |/ / /
* | | | | Merge "Update TrafficStats docs to reflect behavior." into jb-mr2-devJeff Sharkey2013-03-261-61/+72
|\ \ \ \ \
| * | | | | Update TrafficStats docs to reflect behavior.Jeff Sharkey2013-03-261-61/+72
* | | | | | Merge "Add yuv get" into jb-mr2-devJason Sams2013-03-261-0/+10
|\ \ \ \ \ \
| * | | | | | Add yuv getJason Sams2013-03-261-0/+10
* | | | | | | Merge "Fix clearing linkproperties on disconnect" into jb-mr2-devIrfan Sheriff2013-03-261-3/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix clearing linkproperties on disconnectIrfan Sheriff2013-03-261-3/+3
* | | | | | | Merge "Remove misleading documentation from SystemClock" into jb-mr2-devMichael Wright2013-03-261-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove misleading documentation from SystemClockMichael Wright2013-03-221-2/+0
* | | | | | | | Merge "It helps to catch the right exception." into jb-mr2-devJeff Sharkey2013-03-261-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | It helps to catch the right exception.Jeff Sharkey2013-03-261-1/+1
* | | | | | | | am 3e904d62: am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948:...Joe Malin2013-03-267-2/+2262
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Andro...Joe Malin2013-03-267-2/+2262
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: ...Joe Malin2013-03-267-2/+2262
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Con...Joe Malin2013-03-267-2/+2262
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into j...Joe Malin2013-03-267-2/+2262
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-devJoe Malin2013-03-267-2/+2262
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge "Android Training: Accessing Contacts" into jb-mr1-devJoe Malin2013-03-267-2/+2262
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Android Training: Accessing ContactsJoe Malin2013-03-257-2/+2262
* | | | | | | | | | | | | | am 9fa57b74: am 2aee33c1: Merge "BackupManagerService files need new security...Geremy Condra2013-03-252-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 2aee33c1: Merge "BackupManagerService files need new security labeling."Geremy Condra2013-03-252-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "BackupManagerService files need new security labeling."Geremy Condra2013-03-262-0/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | BackupManagerService files need new security labeling.rpcraig2012-12-042-0/+17
* | | | | | | | | | | | | | | Merge "Fix the build" into jb-mr2-devFabrice Di Meglio2013-03-262-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix the buildFabrice Di Meglio2013-03-252-0/+9
* | | | | | | | | | | | | | | | Merge "Fix touch processing for Overlay views" into jb-mr2-devChet Haase2013-03-264-45/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix touch processing for Overlay viewsChet Haase2013-03-254-45/+82
* | | | | | | | | | | | | | | | | Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-devGeremy Condra2013-03-265-6/+307
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add seinfo parsing to PackageManagerService.Robert Craig2013-03-255-6/+307
* | | | | | | | | | | | | | | | | am 33d388b0: am adc2d143: am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc u...kmccormick2013-03-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am adc2d143: am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bu...kmccormick2013-03-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar...kmccormick2013-03-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider doc...kmccormick2013-03-251-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-m...kmccormick2013-03-251-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docskmccormick2013-03-251-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Doc update: fix bug in Calendar Provider docs.kmccormick2013-03-251-1/+1
* | | | | | | | | | | | | | | | | | Merge "Handle external storage errors uniformly." into jb-mr2-devJeff Sharkey2013-03-261-18/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Handle external storage errors uniformly.Jeff Sharkey2013-03-251-18/+42
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-devFabrice Di Meglio2013-03-263-20/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix bug #8200928 ExpandableListView should be RTL-awareFabrice Di Meglio2013-03-223-20/+185
* | | | | | | | | | | | | | | | | Merge "AudioService: rewrite sound effects loading" into jb-mr2-devEric Laurent2013-03-251-147/+209
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |