summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "AudioService: fix String cast crash when mediaserver killed"Phil Burk2015-03-201-2/+2
|\
| * AudioService: fix String cast crash when mediaserver killedPhil Burk2015-03-191-2/+2
* | Merge "Start respecting View.DRAG_FLAG_GLOBAL flag."Vladislav Kaznacheev2015-03-202-2/+3
|\ \ | |/ |/|
| * Start respecting View.DRAG_FLAG_GLOBAL flag.Vladislav Kaznacheev2015-03-182-2/+3
* | am 685d33dd: am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110:...Zach Riggle2015-03-190-0/+0
|\ \
| * \ am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix N...Zach Riggle2015-03-190-0/+0
| |\ \
| | * \ am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in Flashli...Zach Riggle2015-03-190-0/+0
| | |\ \
| | | * \ am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController...Zach Riggle2015-03-190-0/+0
| | | |\ \
| | | | * \ am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-devZach Riggle2015-03-190-0/+0
| | | | |\ \
| | | | | * \ am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-devZach Riggle2015-03-191-1/+5
| | | | | |\ \
| | | | | | * \ Merge "Fix NPE in FlashlightController" into lmp-devZach Riggle2015-03-191-1/+5
| | | | | | |\ \
| | | | | | | * | Fix NPE in FlashlightControllerAdrian Roos2014-12-151-1/+5
* | | | | | | | | am 53699ec6: am d3e6428a: Merge "New API methods for Script Group"Yang Ni2015-03-191-1/+52
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am d3e6428a: Merge "New API methods for Script Group"Yang Ni2015-03-191-1/+52
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge "New API methods for Script Group"Yang Ni2015-03-191-1/+52
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | New API methods for Script GroupYang Ni2015-03-191-1/+52
| | |/ / / / / / / /
* | | | | | | | | | Merge "Fix bad nesting count when remote calls fail."Craig Mautner2015-03-194-53/+111
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix bad nesting count when remote calls fail.Craig Mautner2015-03-174-53/+111
* | | | | | | | | | | Merge "Avoid throwing ISE in Canvas#restore underflow"Chris Craik2015-03-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Avoid throwing ISE in Canvas#restore underflowChris Craik2015-03-191-2/+2
* | | | | | | | | | | | am 62c595aa: am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415:...smain@google.com2015-03-191-11/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b:...smain@google.com2015-03-191-11/+40
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add P...smain@google.com2015-03-191-11/+40
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to ...smain@google.com2015-03-191-11/+40
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location ...smain@google.com2015-03-191-11/+40
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / | | | | | |/| | | | | |
| | | | | * | | | | | | am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page"...smain@google.com2015-03-191-11/+40
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|/ / / | | | | | | |/| | | | |
| | | | | | * | | | | | am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docssmain@google.com2015-03-191-11/+40
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge "add Places API to the Location feature page" into lmp-docssmain@google.com2015-03-191-11/+40
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | add Places API to the Location feature pagesmain@google.com2015-03-061-11/+40
* | | | | | | | | | | | | | Merge "First stab at device idle mode."Dianne Hackborn2015-03-1911-63/+649
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | First stab at device idle mode.Dianne Hackborn2015-03-1911-63/+649
* | | | | | | | | | | | | | | Merge "Remove debug logging from WebView"Bo Liu2015-03-191-67/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove debug logging from WebViewBo Liu2015-03-191-67/+0
* | | | | | | | | | | | | | | | Merge "AudioService: fix crash when mediaserver killed"Paul Mclean2015-03-191-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | AudioService: fix crash when mediaserver killedPhil Burk2015-03-191-1/+2
* | | | | | | | | | | | | | | | | am f2ea0171: am c077ee31: Merge "Added copyright notice and formatted to conv...Yang Ni2015-03-191-294/+313
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am c077ee31: Merge "Added copyright notice and formatted to convention"Yang Ni2015-03-191-294/+313
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Added copyright notice and formatted to convention"Yang Ni2015-03-191-294/+313
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Added copyright notice and formatted to conventionYang Ni2015-03-161-294/+313
* | | | | | | | | | | | | | | | | | am b45d3926: am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindow...Bryce Lee2015-03-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." int...Bryce Lee2015-03-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-mod...Bryce Lee2015-03-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Fix wrong intent being passed in PhoneWindowManager.Bryce Lee2015-03-191-1/+1
* | | | | | | | | | | | | | | | | | | Merge "pass stream contents in separate thread for executeShellCommand"Guang Zhu2015-03-191-24/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | pass stream contents in separate thread for executeShellCommandGuang Zhu2015-03-181-24/+29
* | | | | | | | | | | | | | | | | | | | am 33e84c16: am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d:...Joe Fernandez2015-03-193-1/+463
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29:...Joe Fernandez2015-03-193-1/+463
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUB...Joe Fernandez2015-03-193-1/+463
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc cha...Joe Fernandez2015-03-193-1/+463
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs...Joe Fernandez2015-03-193-1/+463
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | |