summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* am 9da9947d: am 05002977: Merge "Include support library resource modules whe...Jeff Brown2013-05-131-1/+2
|\
| * am 05002977: Merge "Include support library resource modules when building do...Jeff Brown2013-05-131-1/+2
| |\
| | * Include support library resource modules when building docs.Jeff Brown2013-05-101-1/+2
* | | am 2ff5a479: am a6303d8a: am 67430e8e: am 2e52e815: am 6b6fd9d1: am 36aa2759:...Dirk Dougherty2013-05-071-0/+1
|\ \ \ | |/ /
| * | am a6303d8a: am 67430e8e: am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678:...Dirk Dougherty2013-05-061-0/+1
| |\ \ | | |/
| | * am 67430e8e: am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: ...Dirk Dougherty2013-05-061-0/+1
| | |\
| | | * Doc change: delete legacy intl dir and update toc's for devsite-compatible la...Dirk Dougherty2013-05-061-0/+1
* | | | Pack preloaded framework assets in a texture atlasRomain Guy2013-05-021-0/+1
* | | | am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-301-1/+2
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-291-1/+2
| |\ \ \
| | * | | Track change to JSSE providerKenny Root2013-04-291-1/+2
* | | | | am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aospJeff Brown2013-04-261-14/+23
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aospJeff Brown2013-04-261-14/+23
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Generate SDK docs for v7 support library packages.Jeff Brown2013-04-261-13/+22
* | | | | am 09e9e1a5: am edced26f: Merge "Add ContentValues & CursorWindow to framewor...Nick Pelly2013-04-231-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | am edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into ...Nick Pelly2013-04-231-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Add ContentValues & CursorWindow to framework.aidlNick Pelly2013-04-231-1/+3
* | | | | am d5af1724: am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-devJaikumar Ganesh2013-04-171-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-devJaikumar Ganesh2013-04-171-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Hardware geofence API changes.Jaikumar Ganesh2013-04-171-0/+1
* | | | | am 2f8caf6a: am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" ...Scott Main2013-04-111-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" into jb-mr2-devScott Main2013-04-111-0/+1
| |\ \ \ \ | | |/ / /
| | * | | add api level 18 to javadoc 'since' tagsScott Main2013-04-111-0/+1
* | | | | am 7228e1ae: am 8ce470dd: GPS Hardware geofencing.Jaikumar Ganesh2013-04-101-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 8ce470dd: GPS Hardware geofencing.Jaikumar Ganesh2013-04-101-0/+4
| |\ \ \ \ | | |/ / /
| | * | | GPS Hardware geofencing.Jaikumar Ganesh2013-04-101-0/+4
* | | | | resolved conflicts for merge of 29211d3a to masterJohn Spurlock2013-04-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 5feceebb: New NotificationListenerService.Daniel Sandler2013-04-051-1/+1
| |\ \ \ \ | | |/ / /
| | * | | New NotificationListenerService.Daniel Sandler2013-04-051-1/+1
* | | | | am 3c7df09d: am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."Brian Carlstrom2013-04-031-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."Brian Carlstrom2013-04-031-1/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Adjust the HttpResponseCache for OkHttp.jwilson2013-04-031-1/+2
| | * | Revert "makefile changes for gcm javadocs"Robert Ly2013-02-121-27/+0
* | | | am 901b77c6: am ca3d655d: Merge "Use input transport for communications betwe...Jeff Brown2013-03-261-2/+0
|\ \ \ \ | |/ / /
| * | | Use input transport for communications between app and IME.Jeff Brown2013-03-261-2/+0
* | | | am 621c35e4: am 765ddb4b: Merge "Separate sessionCreated and finishedEvents c...Michael Wright2013-03-221-0/+1
|\ \ \ \ | |/ / /
| * | | Separate sessionCreated and finishedEvents callbacksMichael Wright2013-03-211-0/+1
| * | | DO NOT MERGE - Full backup/restore now handles OBBs sensiblyChristopher Tate2013-03-081-0/+1
* | | | Full backup/restore now handles OBBs sensiblyChristopher Tate2013-03-071-0/+1
* | | | am 530b2b1c: am a5513616: Merge "Add new WindowId for cross-process monitorin...Dianne Hackborn2013-03-051-1/+3
|\ \ \ \ | |/ / /
| * | | Add new WindowId for cross-process monitoring of focus.Dianne Hackborn2013-03-051-1/+3
* | | | Post-review Keyguard cleanup.Jim Miller2013-02-281-1/+2
* | | | am 23b046c4: Merge "Initial version of BLE support for Bluedroid" into jb-mr2...Matthew Xie2013-02-281-0/+3
|\ \ \ \ | |/ / /
| * | | Initial version of BLE support for BluedroidGanesh Ganapathi Batta2013-02-271-0/+3
* | | | Move keyguard to its own process.Jim Miller2013-02-271-0/+2
|/ / /
* | | New INotificationListener interface.Daniel Sandler2013-02-191-0/+1
* | | Remove the unnecessary framework-res-package-targetYing Wang2013-02-121-6/+0
* | | am e47033f9: am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge "Rever...Robert Ly2013-02-121-27/+0
|\ \ \ | | |/ | |/|
| * | am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-devRobert Ly2013-02-121-27/+0
| |\ \
| | * | Revert "makefile changes for gcm javadocs"Robert Ly2013-02-121-27/+0