diff options
| author | Alex Hills <ahills@google.com> | 2015-09-14 21:24:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-14 21:24:53 +0000 |
| commit | 03f46af3e194d58e2db61fe59e32d42bec8b8312 (patch) | |
| tree | ea09cc117264b397922126c3a044d14984acba75 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 96d9953f74ab16a9a63ebfe4119d5340ec734e87 (diff) | |
| parent | d04c6d19a589a2a0f60650675438c59ac6900f45 (diff) | |
am d04c6d19: resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp
* commit 'd04c6d19a589a2a0f60650675438c59ac6900f45':
Cherry-pick system theme rebase to fix square UI on round watches
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions