summaryrefslogtreecommitdiff
path: root/sample/res
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-09-24 18:02:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-24 18:02:12 +0000
commit396b6c1f1d81164d282544ba2287f94f6c5bb1eb (patch)
tree5f309f5385b52a0331569a3542d6c6b022a3aab7 /sample/res
parent236fdae9bc1ebb98162a5e5e5b4ac98edb99520b (diff)
parent2d3978f6ff5df038a4ef9deac7779ff4c413daf1 (diff)
downloadchips-396b6c1f1d81164d282544ba2287f94f6c5bb1eb.tar.gz
am 2d3978f6: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-chips-cranbrook
* commit '2d3978f6ff5df038a4ef9deac7779ff4c413daf1': Import translations. DO NOT MERGE
Diffstat (limited to 'sample/res')
0 files changed, 0 insertions, 0 deletions