commit | d14ce20c77a81f3ad1cb32e333fa480930819a93 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 16 16:51:09 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 16:51:09 2014 +0000 |
tree | 35fe6b8133e0bb525364e085a6b3b5d54a02acec | |
parent | 57e258992539de135f8694be798ae11576c1cd33 [diff] | |
parent | 64334e4f7f871c8192108679db0be38d42c8c7c0 [diff] |
am 64334e4f: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '64334e4f7f871c8192108679db0be38d42c8c7c0': Import translations. DO NOT MERGE