diff options
| author | Christopher Wiley <wiley@google.com> | 2015-08-29 01:27:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-29 01:27:57 +0000 |
| commit | c328c02888394e4dd665b38a039ec59939ebb2e8 (patch) | |
| tree | 672895a1c8eea30521eb21546dd76b19bbf227f9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 554d9edf6decc27ce7c6066317f72f489dc35644 (diff) | |
| parent | 6dea7ba05c4f2452c90e05da1761090973c8e6b5 (diff) | |
am 6dea7ba0: (-s ours) am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces"
* commit '6dea7ba05c4f2452c90e05da1761090973c8e6b5':
Do not merge namespaces
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions