diff options
| author | Xin Li <delphij@google.com> | 2016-11-11 00:00:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-11 00:00:49 +0000 |
| commit | 6ec8dd10bb902855f72975b9ec07e17dfdcebaa8 (patch) | |
| tree | 160735c389cc8ec069b82cf08a71058ca83550d5 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 5e92ece8c24d060ba7a45c20bd0b0375f8508570 (diff) | |
| parent | 9788dd5bd20cabbe3ff007d70841f212cce78611 (diff) | |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e
am: 9788dd5bd2
Change-Id: I317b0be7182896e39fd23b152ff08ebf4de37592
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions