diff options
| author | Xin Li <delphij@google.com> | 2016-11-14 13:12:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-14 13:12:42 +0000 |
| commit | 20def2e75f4d9497c4bce477aab0dd4b51e603f5 (patch) | |
| tree | e375aa011d14ccbd31a16878c1a4fb347faccfb0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 23270f13114d17357222698d9dcc2de059d92fa7 (diff) | |
| parent | ee6b51a05b24707723de38eb84e8760183264ca8 (diff) | |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours
am: ee6b51a05b
Change-Id: I114b678f9a47837a97758693f4c0e64e8eb17298
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions