| commit | caaca71e4e637290be6a0152ea2d5699c693e2f2 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Jun 25 01:30:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 25 01:30:11 2015 +0000 |
| tree | bac8b51b7eb5bae0e2ce9d92006e1cc6a532fc6d | |
| parent | b762df58d44181e59b315d5faf98f921a82d51dc [diff] | |
| parent | c4642c47f2f1fd39090d050564fb4e4b13cb2788 [diff] |
am c4642c47: am ce3dd0c4: am fdd4d9a7: am de3337f6: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev automerge: de95b4b * commit 'c4642c47f2f1fd39090d050564fb4e4b13cb2788': [DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses