summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | resolved conflicts for merge of 6db87978 to masterRobert Ly2013-02-121-23/+1
|\ \ \ \ | |/ / /
| * | | am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-devRobert Ly2013-02-121-23/+1
| |\ \ \
| | * | | Revert "makefile changes for s.a.c"Robert Ly2013-02-121-23/+1
* | | | | remove sac make target to fix buildRobert Ly2013-02-111-21/+21
* | | | | am a578ade2: am 1c4311cc: am 4af36f4e: am 96b1b403: am 4c01047e: makefile cha...Robert Ly2013-02-111-1/+23
|\ \ \ \ \ | |/ / / /
| * | | | am 4c01047e: makefile changes for s.a.cRobert Ly2013-02-111-1/+23
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | makefile changes for s.a.cRobert Ly2013-02-111-1/+23
| | |/
* | | am 74e8693d: am ddc0a7bd: am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makef...Robert Ly2013-02-071-0/+27
|\ \ \ | |/ /
| * | am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-devRobert Ly2013-02-071-0/+27
| |\ \ | | |/
| | * makefile changes for gcm javadocsRobert Ly2013-02-071-0/+27
* | | Merge "Move a few files from frameworks/opt/telephony to frameworks/base."Wink Saville2013-02-081-0/+1
|\ \ \
| * | | Move a few files from frameworks/opt/telephony to frameworks/base.Wink Saville2013-02-071-0/+1
* | | | App ops: track system windows, monitoring changes.Dianne Hackborn2013-02-061-0/+1
|/ / /
* | | am 25f97435: am 5fca0efa: am 6cb87b08: am 65fd9811: am 2aa47b33: Merge "Doc c...Dirk Dougherty2013-02-041-1/+2
|\ \ \ | |/ /
| * | am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for ...Dirk Dougherty2013-02-011-1/+2
| |\ \ | | |/
| | * Merge "Doc change: remove htmlified samples from docs build for now. Samples ...Dirk Dougherty2013-01-291-1/+2
| | |\
| | | * Doc change: remove htmlified samples from docs build for now. Samples are sti...Dirk Dougherty2013-01-291-1/+2
* | | | am 9dbf2479: am 960deffd: am 78bf7c9c: am 1e7e1104: am 4b7161cb: docs: switch...Scott Main2013-02-041-1/+1
|\ \ \ \ | |/ / /
| * | | am 4b7161cb: docs: switch devsite doc build to use templates-sdkScott Main2013-02-011-1/+1
| |\ \ \ | | |/ /
| | * | docs: switch devsite doc build to use templates-sdkScott Main2013-01-291-1/+1
| | |/