diff options
| author | Mark Renouf <mrenouf@google.com> | 2016-06-14 21:57:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-14 21:57:37 +0000 |
| commit | 4015cdc67a1ffbd556d6412c94e0926b35dd765c (patch) | |
| tree | a53d723beeadbac0e777d0630650e4efad8a92db /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 070c52c640f7887eca730b0b68001b3ee823ba7a (diff) | |
| parent | 3dc75a85f8b3ee73b0ad201f91056bd64f5d48a6 (diff) | |
Merge changes I3352e1fc,I52ac4dda,Ie9d51041,Id643a27e into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Set hintTextColor and composingSpan style for EditText and extract view\" into nyc-mr1-dev am: a884aacb47
Merge \\"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\\" into nyc-dev am: da66010cd8 am: ab45c9df1f
Merge \\"Fix QS edit view accessibility classes\\" into nyc-dev am: 0809964452 am: a78fd8a31b
Merge \\"Delete simple reduction implementation.\\" into nyc-dev am: d749245b88 am: 9a53329b0a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions