diff options
author | Dave Langemak <dlangemak@google.com> | 2015-07-31 03:04:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 03:04:26 +0000 |
commit | 72dcb47d945a5a9e35059c01cd8a1593e6740a42 (patch) | |
tree | 348d643e521f38344aad7a5e2a8bc497bfb250d5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7b2b74e13a1d6b88b0ba8c4d8d7fd5e11a30d2d1 (diff) | |
parent | b880a036b12c8a8613fbd7fb41328ca93146bf85 (diff) |
am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit 'b880a036b12c8a8613fbd7fb41328ca93146bf85':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions