diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-12 22:04:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 22:04:10 +0000 |
| commit | e260a358bfc945bf01d901f496b7f30784cbf920 (patch) | |
| tree | 2adf8c330dcddff51a6e50bb40347fe7172ad5be /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1060d75e3abd37671b0962297f4587dd3d6e0cc8 (diff) | |
| parent | 7c3212b2f4f2f4b5ee18f2db925db95ee420d489 (diff) | |
am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev
* commit '7c3212b2f4f2f4b5ee18f2db925db95ee420d489':
Propagate DrawableContainer state on mutate, fix ColorDrawable theming
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions