diff options
| author | Andrew Solovay <asolovay@google.com> | 2015-08-17 17:35:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-17 17:35:05 +0000 |
| commit | a8f68d2da7733673d25fd1e5573539bf29b71ee4 (patch) | |
| tree | 77dac93215568648d22598dd7b9ce71ad46e6752 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c57f309a1b5be6fe9156405feb48637c036880a4 (diff) | |
| parent | af46e1b404c1d4fea17a24e5a49f23a7d0c982f7 (diff) | |
am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
* commit 'af46e1b404c1d4fea17a24e5a49f23a7d0c982f7':
docs: Updating the permissions docs for Preview 3.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions