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