diff options
author | Benjamin Franz <bfranz@google.com> | 2015-08-06 19:28:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 19:28:29 +0000 |
commit | a17c5bac6efff8365c1f2019311778413598e37c (patch) | |
tree | 9db36462cbe17c78764512e8095b15a558f41dc3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | cee6655097d174f25fa21b6c2e80a3bbe54aae7e (diff) | |
parent | dc89dafaa3d95fe88eaa82b888098ffe9f07e4f5 (diff) |
am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev
* commit 'dc89dafaa3d95fe88eaa82b888098ffe9f07e4f5':
Use realActivity as indicator for task locking
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions