diff options
| author | Michael Schwartz <schwartzmi@google.com> | 2018-05-22 09:48:51 -0700 |
|---|---|---|
| committer | Michael Schwartz <schwartzmi@google.com> | 2018-05-22 09:48:51 -0700 |
| commit | 645ae5df5346c679626d708a62c0a24d6b294f1a (patch) | |
| tree | fce29b11843ad95f19cf43da622027a0ebdf3ee2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a9819326731456be7da621172e7fcddb0503efa7 (diff) | |
| parent | 7ba075789a74f0df8d41359fdab5fc6083b4bcbe (diff) | |
Merge PPR1.180522.001
Conflicts:
core/java/android/view/Choreographer.java
core/res/res/values/symbols.xml
Change-Id: I46eb20e3133cc59d77bbaf7c370054ff2f902aad
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions