summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-01-07 00:41:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-07 00:41:17 +0000
commitff1f1c452ceebd0502a5ad4110446cb0b768a6e9 (patch)
treeddbfc85ae17be0af0afa484e441fd0f6c1507e06 /docs
parenta9bec69a95e6c6a8629d76eab3d090e688f046e9 (diff)
parent24c2980cb2a9a93d1d6fe2a849f915b3819056c2 (diff)
downloadframeworks_base-ff1f1c452ceebd0502a5ad4110446cb0b768a6e9.zip
frameworks_base-ff1f1c452ceebd0502a5ad4110446cb0b768a6e9.tar.gz
frameworks_base-ff1f1c452ceebd0502a5ad4110446cb0b768a6e9.tar.bz2
am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '24c2980cb2a9a93d1d6fe2a849f915b3819056c2': Import translations. DO NOT MERGE
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions