summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-02-04 18:58:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-04 18:58:09 +0000
commit151eadfde3e0da58b6ba695e747991901a2b7d6d (patch)
treebe8647922d21dfcd46f2622c6ac598ca96f6f7a3 /core/java/com
parent281dfe7fd216c1257758c0258dfeb3fdcb774227 (diff)
parent8911c2aeb17dfde123b9d412f700c20a33babbfc (diff)
downloadframeworks_base-151eadfde3e0da58b6ba695e747991901a2b7d6d.zip
frameworks_base-151eadfde3e0da58b6ba695e747991901a2b7d6d.tar.gz
frameworks_base-151eadfde3e0da58b6ba695e747991901a2b7d6d.tar.bz2
am 8911c2ae: (-s ours) Import translations. DO NOT MERGE automerge: 140a22d -s ours
* commit '8911c2aeb17dfde123b9d412f700c20a33babbfc': Import translations. DO NOT MERGE
Diffstat (limited to 'core/java/com')
0 files changed, 0 insertions, 0 deletions