summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docsScott Main2014-04-011-0/+0
|\
| * am 35682006: Merge "laptop image with redacted" into klp-docsScott Main2014-04-011-0/+0
| |\
| | * Merge "laptop image with redacted" into klp-docsScott Main2014-04-011-0/+0
| | |\
| | | * laptop image with redactedScott Main2014-03-311-0/+0
* | | | am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docsScott Main2014-04-011-22/+21
|\ \ \ \ | |/ / /
| * | | am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docsScott Main2014-04-011-22/+21
| |\ \ \ | | |/ /
| | * | Merge "dashbaord update for 4/1/14" into klp-docsScott Main2014-04-011-22/+21
| | |\ \
| | | * | dashbaord update for 4/1/14Scott Main2014-04-011-22/+21
| | | |/
* | | | am c192cdd3: am cf96f815: docs: Renamed the document on building with Android...Ricardo Cervera2014-04-012-2/+2
|\ \ \ \ | |/ / /
| * | | am cf96f815: docs: Renamed the document on building with Android StudioRicardo Cervera2014-04-012-2/+2
| |\ \ \ | | |/ /
| | * | docs: Renamed the document on building with Android StudioRicardo Cervera2014-04-012-2/+2
| | |/
* | | am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-010-0/+0
|\ \ \ | |/ /
| * | am dc5e02bd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-010-0/+0
| |\ \ | | |/ | |/|
| | * Import translations. DO NOT MERGEBaligh Uddin2014-03-312-19/+19
* | | am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
|\ \ \ | |/ /
| * | Doc Update: revert PendingIntent fix.Katie McCormick2014-03-311-2/+2
* | | am b1088bfe: Merge "update common intents guide to add calendar and alarms." ...Scott Main2014-04-011-6/+305
|\ \ \ | |/ /
| * | Merge "update common intents guide to add calendar and alarms." into klp-docsScott Main2014-03-311-6/+305
| |\ \
| | * | update common intents guide to add calendar and alarms.Scott Main2014-01-171-6/+305
* | | | Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-03-312-19/+19
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2014-03-312-19/+19
* | | | | Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-mo...Zhihai Xu2014-03-315-0/+72
|\ \ \ \ \
| * | | | | LE: Add API to configure MTU for a given connection (3/4)Andre Eisenbach2014-03-255-0/+72
* | | | | | Merge "Force refresh of stateful when a child drawable is changed." into klp-...Craig Stout2014-03-311-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Force refresh of stateful when a child drawable is changed.Craig Stout2014-03-271-0/+1
* | | | | | Merge "Replace individual methods with a consolidated CEC nativeSendmessage" ...Jinsuk Kim2014-03-312-127/+75
|\ \ \ \ \ \
| * | | | | | Replace individual methods with a consolidated CEC nativeSendmessageJinsuk Kim2014-03-272-127/+75
* | | | | | | Merge "Callback on correct method when status is unsuccessful." into klp-modu...Wei Wang2014-03-291-2/+14
|\ \ \ \ \ \ \
| * | | | | | | Callback on correct method when status is unsuccessful.Wei Wang2014-03-291-2/+14
* | | | | | | | Merge "Add InputDevice#supportsSource(int)." into klp-modular-devMichael Wright2014-03-292-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add InputDevice#supportsSource(int).Michael Wright2014-03-282-0/+13
* | | | | | | | | Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-devMichael Wright2014-03-299-22/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGEMichael Wright2014-03-263-12/+45
| * | | | | | | | | Adds API for determining confirm and cancel keys.Michael Wright2014-03-266-10/+31
| |/ / / / / / / /
* | | | | | | | | Merge "hdmi: cec: add permission name to dump permission denial message" into...Adam Hampson2014-03-281-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hdmi: cec: add permission name to dump permission denial messageAdam Hampson2014-03-271-1/+2
* | | | | | | | | | Made secure-adb's new-public-key activity configurable.Aaron Whyte2014-03-283-8/+21
* | | | | | | | | | DO NOT MERGE Enhance the NotificationListenerService api.John Spurlock2014-03-286-29/+161
* | | | | | | | | | Merge "Add comment of using same callback for start/stop advertising." into k...Wei Wang2014-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add comment of using same callback for start/stop advertising.Wei Wang2014-03-271-1/+1
* | | | | | | | | | am a3a4d466: am 83d6ae28: fix broken linksScott Main2014-03-282-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | am 83d6ae28: fix broken linksScott Main2014-03-282-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fix broken linksScott Main2014-03-272-3/+3
* | | | | | | | | | am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads.Jeff Sharkey2014-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 0bc7cea6: Enlarge space allowed for internal downloads.Jeff Sharkey2014-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Enlarge space allowed for internal downloads.Jeff Sharkey2014-03-271-1/+1
* | | | | | | | | | am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am...Brian Carlstrom2014-03-280-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-...Brian Carlstrom2014-03-280-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Rever...Brian Carlstrom2014-03-280-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunc...Brian Carlstrom2014-03-280-0/+0
| | | |\ \ \ \ \ \ \ \