summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* am 5728c18a: am c9942120: am b7d24c75: Merge "Update MediaBrowser to use Stri...RoboErik2014-09-022-13/+13
|\
| * Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-devRoboErik2014-09-022-13/+13
| |\
| | * Update MediaBrowser to use String ids instead of UrisRoboErik2014-08-292-13/+13
* | | am 0d7dd79b: am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with...Adam Lesinski2014-09-011-8/+4
|\ \ \ | |/ /
| * | Make UsageStats API comply with API CouncilAdam Lesinski2014-08-291-8/+4
* | | am e4dce761: am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API com...Adam Lesinski2014-09-011-4/+8
|\ \ \
| * \ \ Merge "Revert "Make UsageStats API comply with API Council"" into lmp-devAdam Lesinski2014-08-291-4/+8
| |\ \ \
| | * | | Revert "Make UsageStats API comply with API Council"Adam Lesinski2014-08-291-4/+8
* | | | | am 43186e07: am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with...Adam Lesinski2014-08-291-8/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Make UsageStats API comply with API Council" into lmp-devAdam Lesinski2014-08-291-8/+4
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Make UsageStats API comply with API CouncilAdam Lesinski2014-08-271-8/+4
* | | | am 601d017c: am efe6c903: am cffbcb8a: Merge "Address API review comments" in...Sandeep Siddhartha2014-08-291-2/+1
|\ \ \ \ | |/ / /
| * | | Merge "Address API review comments" into lmp-devSandeep Siddhartha2014-08-291-2/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Address API review commentsSandeep Siddhartha2014-08-271-2/+1
| | |/
* | | am 501244ea: am 563efe4c: am 85f23210: Fix test buildRoboErik2014-08-293-24/+22
|\ \ \ | |/ /
| * | Fix test buildRoboErik2014-08-283-24/+22
* | | am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per...RoboErik2014-08-281-2/+3
|\ \ \ | |/ /
| * | Merge "Update to MediaBrowser APIs per council feedback" into lmp-devRoboErik2014-08-281-2/+3
| |\ \
| | * | Update to MediaBrowser APIs per council feedbackRoboErik2014-08-281-2/+3
* | | | am 2575d022: am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActiv...Dianne Hackborn2014-08-281-5/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wr...Dianne Hackborn2014-08-281-5/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix issue #17289876: startActivityFromRecents appears to launch the wrong taskDianne Hackborn2014-08-281-5/+1
| | |/
* | | am 7a86c785: am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-devJohn Reck2014-08-281-6/+0
|\ \ \ | |/ /
| * | Merge "Animator stuff" into lmp-devJohn Reck2014-08-281-6/+0
| |\ \
| | * | Animator stuffJohn Reck2014-08-271-6/+0
* | | | am f06b6386: am f7898245: am d0f6975b: Merge "Change constant to PowerManager...Michael Wright2014-08-281-4/+4
|\ \ \ \ | |/ / /
| * | | Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into ...Michael Wright2014-08-281-4/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITYMichael Wright2014-08-271-4/+4
| | |/
* | | am 92c7379c: am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to ...Jeff Hao2014-08-262-2/+2
|\ \ \ | |/ /
| * | Add sample profiling option to am.Jeff Hao2014-08-262-2/+2
* | | am 2626a16b: am 90675431: am a707b2b8: Merge "Split up ComponentName in Usage...Adam Lesinski2014-08-261-1/+1
|\ \ \ | |/ /
| * | Merge "Split up ComponentName in UsageEvents.Event" into lmp-devAdam Lesinski2014-08-261-1/+1
| |\ \
| | * | Split up ComponentName in UsageEvents.EventAdam Lesinski2014-08-261-1/+1
| | |/
* | | am 11bba84c: am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit numb...Dianne Hackborn2014-08-264-3/+173
|\ \ \ | |/ /
| * | Merge "Fix issue #16311398: Limit number of documents a process can open" int...Dianne Hackborn2014-08-264-3/+173
| |\ \
| | * | Fix issue #16311398: Limit number of documents a process can openDianne Hackborn2014-08-264-3/+173
| | |/
* | | am 5b542584: am f53f8d5d: am aaf5d6c0: Merge "Set text color for the output l...Mohamad Ayyash2014-08-261-0/+2
|\ \ \ | |/ /
| * | Merge "Set text color for the output log." into lmp-devMohamad Ayyash2014-08-261-0/+2
| |\ \ | | |/ | |/|
| | * Set text color for the output log.Mohamad Ayyash2014-08-251-0/+2
* | | am 3c02cb6c: am 114978fd: am 874d4c00: Merge "PM: Load all splits when parsin...Adam Lesinski2014-08-261-0/+4
|\ \ \ | |/ /
| * | Merge "PM: Load all splits when parsing an app manifest" into lmp-devAdam Lesinski2014-08-251-0/+4
| |\ \
| | * | PM: Load all splits when parsing an app manifestAdam Lesinski2014-08-221-0/+4
* | | | am c95d61e1: am b6943e7b: am fe3a5e88: Merge "Fix conversion of locale from B...Sandeep Siddhartha2014-08-251-1/+1
|\ \ \ \ | |/ / /
| * | | Fix conversion of locale from BCP47 language tagSandeep Siddhartha2014-08-231-1/+1
* | | | am efd88692: am f56a5290: am fdb7e602: Merge "Implement API review feedback f...Matthew Williams2014-08-251-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "Implement API review feedback for JobScheduler" into lmp-devMatthew Williams2014-08-231-3/+3
| |\ \ \
| | * | | Implement API review feedback for JobSchedulerMatthew Williams2014-08-221-3/+3
| | |/ /
* | | | am 68f133b4: am a8d8e4c4: am e829259d: Merge "Fix the Locale story in the hot...Sandeep Siddhartha2014-08-251-1/+3
|\ \ \ \ | |/ / /
| * | | Fix the Locale story in the hotword APISandeep Siddhartha2014-08-221-1/+3
| |/ /
* | | am 7dc5efe2: am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for ...Matthew Williams2014-08-224-26/+20
|\ \ \ | |/ /