commit | 23de74aed5d25152b788e063da8f6a2ed19cd222 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:27:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:27:45 2015 +0000 |
tree | 27538a6101c75339440c743ff698bddea7539dc9 | |
parent | 6e78bb42fc8af64f4f2208b48585451793e303c9 [diff] | |
parent | b52e5e38981639e5d0f84e6fda2c6cb602b0eeac [diff] |
am b52e5e38: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'b52e5e38981639e5d0f84e6fda2c6cb602b0eeac': Import translations. DO NOT MERGE