diff options
author | Geoff Mendal <mendal@google.com> | 2015-04-28 15:14:13 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-28 15:14:13 +0000 |
commit | 7d6a36f08dda0dc3bccd7ea5680c0b5d8b33a868 (patch) | |
tree | 15ad1ffb11825b6684626242c9a608d6398dca5f /packages | |
parent | b40b49577c12d14f33abedeba7a1811c7a4eda6d (diff) | |
parent | 7825b9d01c4721b5d2134c00521d1d92d1799d94 (diff) | |
download | frameworks_base-7d6a36f08dda0dc3bccd7ea5680c0b5d8b33a868.zip frameworks_base-7d6a36f08dda0dc3bccd7ea5680c0b5d8b33a868.tar.gz frameworks_base-7d6a36f08dda0dc3bccd7ea5680c0b5d8b33a868.tar.bz2 |
am 7825b9d0: (-s ours) am bbca11e5: (-s ours) am 69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '7825b9d01c4721b5d2134c00521d1d92d1799d94':
Import translations. DO NOT MERGE
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions