summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-04-28 14:49:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-28 14:49:54 +0000
commit7825b9d01c4721b5d2134c00521d1d92d1799d94 (patch)
tree3f2a8ebe405dac91ec711c6efc9502539f854ca5 /packages
parent7ecc6b721e5da0cc3a52dc14bdfd8d1308db84bc (diff)
parentbbca11e573d6e3e8188433a2061e2e26f28a733e (diff)
downloadframeworks_base-7825b9d01c4721b5d2134c00521d1d92d1799d94.zip
frameworks_base-7825b9d01c4721b5d2134c00521d1d92d1799d94.tar.gz
frameworks_base-7825b9d01c4721b5d2134c00521d1d92d1799d94.tar.bz2
am bbca11e5: (-s ours) am 69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'bbca11e573d6e3e8188433a2061e2e26f28a733e': Import translations. DO NOT MERGE
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions