diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-02-24 15:06:39 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2016-02-24 15:19:15 +0900 |
| commit | 1142b2654ae36b54a61bfe759f2f43a01532ae93 (patch) | |
| tree | c6bbf2390084f2417b22e576ddc31cfc9bf82de3 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6831e8ea7601c506b1e8c61021fecfffa9cb183e (diff) | |
| parent | 51e4acb29d87fafc0d790fadfd31d0c1410521f5 (diff) | |
resolve merge conflicts of 51e4acb29d to nyc-dev
Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.
Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions