tree 85c8017324e2357c479e01bef23304dc922aafed
parent 6707998d1a4f30d07f0f353050fc40913da572a5
parent e40990e024969d0271529164e6112715d8b6d004
author Deepanshu Gupta <deepanshu@google.com> 1440719397 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440719397 +0000

am e40990e0: (-s ours) am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit 'e40990e024969d0271529164e6112715d8b6d004':