summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-04-28 15:16:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-28 15:16:54 +0000
commita9943c99ddb63491ff7624810e6f3eeec9a451c9 (patch)
treea8b3e52ddd3e90f61a2ef439d20cfd2447863bec /docs/html
parentf8b7897bd17ca42ed16a5fd21033fd18d0579dc5 (diff)
parent55f6979a5ff52de6004e003404546cf137e50379 (diff)
downloadframeworks_base-a9943c99ddb63491ff7624810e6f3eeec9a451c9.zip
frameworks_base-a9943c99ddb63491ff7624810e6f3eeec9a451c9.tar.gz
frameworks_base-a9943c99ddb63491ff7624810e6f3eeec9a451c9.tar.bz2
am 55f6979a: (-s ours) am d34e8ebc: (-s ours) am 5d3249d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '55f6979a5ff52de6004e003404546cf137e50379': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html')
0 files changed, 0 insertions, 0 deletions