diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2015-08-03 22:02:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 22:02:57 +0000 |
commit | 534d9485f2fad985791e947a7b8ba7dff92268c6 (patch) | |
tree | d86ee8b12247645c210e898e4a0ad323c74dd484 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a2a3b91c6896ebf0e75ec6b86f792b7b4f10e38e (diff) | |
parent | e92b2645b234a7e3555a26aacb964706509269df (diff) |
am e92b2645: am 33bdfe75: am df776b76: am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit 'e92b2645b234a7e3555a26aacb964706509269df':
Revert to using AppTheme for LayoutLib tests.
Fix Matrix_Delegate.native_getValues()
Update test image for upated nav icons.
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Fix bugs introduced in 78aa664.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions