diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-15 11:30:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-15 11:30:10 -0800 |
| commit | 0c2184bdb034179cca377ad788246d1b8c37a1cf (patch) | |
| tree | de2c368c42781d047c3bb954224abac967915faa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 356b9b87cf7eae6e45182cc1827bd4a6ee7223b3 (diff) | |
| parent | fb52c4747687819238eb4570ee7d424842c6159f (diff) | |
am fb52c474: am a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit 'fb52c4747687819238eb4570ee7d424842c6159f':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions