summaryrefslogtreecommitdiffstats
path: root/tests/DozeTest/res/layout
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-07-22 01:09:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-22 01:09:02 +0000
commitf89bff9ed875c1e3ad8e682e651c5994b246cc53 (patch)
tree5933fb90a99419e32da4550c2abdef4de753d562 /tests/DozeTest/res/layout
parent52948ffdf2b797a38bab06e7828e2b3d984b4746 (diff)
parentaa474ff0f3bf68110dc60f9472c062ff1a4a44ae (diff)
downloadframeworks_base-f89bff9ed875c1e3ad8e682e651c5994b246cc53.zip
frameworks_base-f89bff9ed875c1e3ad8e682e651c5994b246cc53.tar.gz
frameworks_base-f89bff9ed875c1e3ad8e682e651c5994b246cc53.tar.bz2
am aa474ff0: (-s ours) am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev
* commit 'aa474ff0f3bf68110dc60f9472c062ff1a4a44ae': LayoutLib: Fix EditText rendering [DO NOT MERGE]
Diffstat (limited to 'tests/DozeTest/res/layout')
0 files changed, 0 insertions, 0 deletions