diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-01-15 12:35:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 12:35:05 +0000 |
| commit | 97f1ac016b6c116dc2964ba60ffe1e405578756a (patch) | |
| tree | 869f336e560e6cf2daeeee35248030001b282143 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5304649ba89c9ebdd792e83761f8f4098c6d6465 (diff) | |
| parent | a9f9c4b90a8af25974bc74971efeafa521073df2 (diff) | |
am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
* commit 'a9f9c4b90a8af25974bc74971efeafa521073df2':
Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions