summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-03-25 15:57:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-25 15:57:12 +0000
commit51914e7e250ed9406d936ad1746d44507686a1e1 (patch)
treeed2a7ae9c564d6f2c24b509e937605777759530c /data
parenta5ccc25fb797d45f39485319b463b1518ab5a115 (diff)
parentb0d49833be8a00a8466aeea6a839869371a90425 (diff)
downloadframeworks_base-51914e7e250ed9406d936ad1746d44507686a1e1.zip
frameworks_base-51914e7e250ed9406d936ad1746d44507686a1e1.tar.gz
frameworks_base-51914e7e250ed9406d936ad1746d44507686a1e1.tar.bz2
am b0d49833: (-s ours) am d86a584f: (-s ours) am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'b0d49833be8a00a8466aeea6a839869371a90425': Import translations. DO NOT MERGE
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions