diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-07-30 22:02:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-30 22:02:48 +0000 |
| commit | 3c01ac0b199d787f6a81b01ab3b6296421ea40a0 (patch) | |
| tree | 3e1f335a37b4eaede4efe6d81a322dbd1b57aca3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | eb648679bfc13f036af459c7365295bfa5c04d66 (diff) | |
| parent | fc0b2e98c008aa7708048e558f97ae063c572f4f (diff) | |
am fc0b2e98: am df961732: am f9fdb08c: am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit 'fc0b2e98c008aa7708048e558f97ae063c572f4f':
Introduced android.permission.PEERS_MAC_ADDRESS permission
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions