diff options
author | Matthew Williams <mjwilliams@google.com> | 2015-08-10 22:45:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 22:45:10 +0000 |
commit | 2c8c251e73a94ec934bbd5aefb49f2d1be866cdc (patch) | |
tree | e1416642b5cee95383fd556b66c20612b6a5512c /tests/ActivityTests/AndroidManifest.xml | |
parent | 5ca842ae0836a8daa04fd57cfc56f8e3b3e5054c (diff) | |
parent | 77d5b91401d87610128d9bf656f66c0d74bcb254 (diff) | |
download | frameworks_base-2c8c251e73a94ec934bbd5aefb49f2d1be866cdc.zip frameworks_base-2c8c251e73a94ec934bbd5aefb49f2d1be866cdc.tar.gz frameworks_base-2c8c251e73a94ec934bbd5aefb49f2d1be866cdc.tar.bz2 |
am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
* commit '77d5b91401d87610128d9bf656f66c0d74bcb254':
DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
Diffstat (limited to 'tests/ActivityTests/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions