summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am b41ea75b: am a0e6069c: am 727738ad: Merge "Add the provisioning extra admi...Sander Alewijnse2014-09-031-0/+1
|\
| * Merge "Add the provisioning extra admin extras bundle." into lmp-devSander Alewijnse2014-09-031-0/+1
| |\
| | * Add the provisioning extra admin extras bundle.Sander Alewijnse2014-09-031-0/+1
* | | am 1831e14c: am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" in...Yohei Yukawa2014-09-032-5/+19
|\ \ \ | |/ /
| * | API Review: InputConnectionYohei Yukawa2014-09-022-5/+19
* | | am 21790061: am f4b970e5: am 2705b859: Merge "Address API Council feedback fo...Vinit Deshpande2014-09-031-33/+13
|\ \ \ | |/ /
| * | Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-devVinit Deshpande2014-09-031-33/+13
| |\ \
| | * | Address API Council feedback for WifiAdapter/WPS APIsVinit Deshpande2014-08-291-33/+13
* | | | am 6a1a0ada: am 449ee1aa: am 667b31d2: Merge "API Review: CursorAnchorInfo" i...Yohei Yukawa2014-09-032-8/+22
|\ \ \ \ | |/ / /
| * | | Merge "API Review: CursorAnchorInfo" into lmp-devYohei Yukawa2014-09-022-8/+22
| |\ \ \
| | * | | API Review: CursorAnchorInfoYohei Yukawa2014-09-022-8/+22
* | | | | am 2d55b767: am 1f9c4f45: am 8070053f: Merge "Add public constant for usage s...Dianne Hackborn2014-09-031-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add public constant for usage stats app op." into lmp-devDianne Hackborn2014-09-021-0/+1
| |\ \ \ \
| | * | | | Add public constant for usage stats app op.Dianne Hackborn2014-09-021-0/+1
* | | | | | am 6b85bd4f: am be2ea906: am fb909790: Merge "Bug 17243357: Remove MessagingC...Shri Borde2014-09-031-43/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug 17243357: Remove MessagingConfigurationManagerShri Borde2014-09-021-43/+31
| | |/ / / | |/| | |
* | | | | am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Cal...Michael Wright2014-09-021-7/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "VirtualDisplay.Callbacks -> Callback" into lmp-devMichael Wright2014-09-021-7/+7
| |\ \ \ \
| | * | | | VirtualDisplay.Callbacks -> CallbackMichael Wright2014-09-011-7/+7
| | | |/ / | | |/| |
* | | | | am dbb72302: am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from ...Jean-Michel Trivi2014-09-021-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" i...Jean-Michel Trivi2014-09-021-1/+5
| |\ \ \ \
| | * | | | Move *_AUDIO_PLUG actions from Intent to android.media.AudioManagerJean-Michel Trivi2014-08-291-1/+5
* | | | | | am 347a8167: am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of Vo...Dianne Hackborn2014-09-021-78/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Hide the interaction part of VoiceInteractionService." into lmp-devDianne Hackborn2014-09-021-78/+0
| |\ \ \ \ \
| | * | | | | Hide the interaction part of VoiceInteractionService.Dianne Hackborn2014-09-021-78/+0
| | | |_|/ / | | |/| | |
* | | | | | am 5728c18a: am c9942120: am b7d24c75: Merge "Update MediaBrowser to use Stri...RoboErik2014-09-021-9/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-devRoboErik2014-09-021-9/+9
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update MediaBrowser to use String ids instead of UrisRoboErik2014-08-291-9/+9
* | | | | | am 18c6fe95: am 1cfc6db2: am 1207f7a7: Merge "Hiding videoState values in tel...Tyler Gunn2014-09-021-20/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-devTyler Gunn2014-08-301-20/+4
| |\ \ \ \ \
| | * | | | | Hiding videoState values in telecomm APIs. (1/3)Tyler Gunn2014-08-291-20/+4
* | | | | | | am 81e03816: am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into...dcashman2014-09-021-11/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Address KeySet API Review" into lmp-devdcashman2014-08-291-11/+0
| |\ \ \ \ \ \
| | * | | | | | Address KeySet API Reviewdcashman2014-08-141-11/+0
* | | | | | | | am abb2e104: am d0780328: am 325662a3: Merge "Oh sticky broadcasts, I\'d like...Dianne Hackborn2014-09-021-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Oh sticky broadcasts, I'd like to do even worse to you.Dianne Hackborn2014-08-291-6/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | am b71c4db7: am 50be1997: am 5f4f3a36: Merge "Make PhoneAccount.Builder const...Sailesh Nepal2014-09-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Make PhoneAccount.Builder constructor public" into lmp-devSailesh Nepal2014-08-291-0/+1
| |\ \ \ \ \ \
| | * | | | | | Make PhoneAccount.Builder constructor publicSailesh Nepal2014-08-291-0/+1
* | | | | | | | am e5e085e4: am 45af21e8: am 6e6a57c8: Merge "Add IDs for status and nav-bar ...George Mount2014-09-011-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add IDs for status and nav-bar backgrounds." into lmp-devGeorge Mount2014-08-291-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Add IDs for status and nav-bar backgrounds.George Mount2014-08-291-0/+2
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am 0d7dd79b: am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with...Adam Lesinski2014-09-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Make UsageStats API comply with API CouncilAdam Lesinski2014-08-291-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 3d26fdff: am 67e97c84: am 70475de3: Merge "Hide AIDL for RemoteServiceCall...Nancy Chen2014-08-291-16/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-devNancy Chen2014-08-291-16/+0
| |\ \ \ \ \ \
| | * | | | | | Hide AIDL for RemoteServiceCallback in telecommNancy Chen2014-08-281-16/+0
* | | | | | | | am 96ec882b: am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFa...Lorenzo Colitti2014-08-291-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Really remove NetworkBoundURLFactory." into lmp-devLorenzo Colitti2014-08-291-4/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Really remove NetworkBoundURLFactory.Lorenzo Colitti2014-08-281-4/+0