summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* am 1fa3cdf0: Merge "Move offline-pdk to where the source is." into jb-mr2-devYing Wang2013-05-221-22/+0
|\
| * Move offline-pdk to where the source is.Ying Wang2013-05-211-22/+0
* | 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 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
* | | 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
* | | | 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 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 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 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 8ce470dd: GPS Hardware geofencing.Jaikumar Ganesh2013-04-101-0/+4
|\ \ \ \ | |/ / /
| * | | GPS Hardware geofencing.Jaikumar Ganesh2013-04-101-0/+4
* | | | am 5feceebb: New NotificationListenerService.Daniel Sandler2013-04-051-1/+1
|\ \ \ \ | |/ / /
| * | | New NotificationListenerService.Daniel Sandler2013-04-051-1/+1
* | | | 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
* | | Use input transport for communications between app and IME.Jeff Brown2013-03-261-2/+0
* | | 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
* | | Add new WindowId for cross-process monitoring of focus.Dianne Hackborn2013-03-051-1/+3
* | | Initial version of BLE support for BluedroidGanesh Ganapathi Batta2013-02-271-0/+3
* | | 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
| | |\