diff options
| author | Andrew Solovay <asolovay@google.com> | 2015-08-17 17:54:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-17 17:54:30 +0000 |
| commit | 8552b77c6f68d67f7bf55d3f8c10039a8e9ca4fb (patch) | |
| tree | ae04dec285069cafa93dc21e135bef74eab4e5e2 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 305680d6a08f6b44d71d7c83aebc557cfcbd3f85 (diff) | |
| parent | f377bffb30c78aaa5dd4188400a018a9febc2afd (diff) | |
am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
* commit 'f377bffb30c78aaa5dd4188400a018a9febc2afd':
docs: Updating the permissions docs for Preview 3.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions