summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-06-25 02:49:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-25 02:49:42 +0000
commitca87e9e11e1965a656c05a839bc53b0fa2e81acf (patch)
treef4675dd9bcd75b4cf7c48b3fb3cd06fa12ed3d38 /tools/layoutlib
parente75798bb0fc7eb71dcc91bda80c436a638839f6e (diff)
parent8c53c68b32ec5a97c1c82138e2fc1dcc76b03899 (diff)
downloadframeworks_base-ca87e9e11e1965a656c05a839bc53b0fa2e81acf.zip
frameworks_base-ca87e9e11e1965a656c05a839bc53b0fa2e81acf.tar.gz
frameworks_base-ca87e9e11e1965a656c05a839bc53b0fa2e81acf.tar.bz2
am 6bf62937: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '6bf62937055feab0d86bacbdffec144fa5cf0d57': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/layoutlib')
0 files changed, 0 insertions, 0 deletions