commit | 4ac5f68b563b432a0728e430c42dafec4045631d | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Dec 28 05:35:06 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Dec 28 05:35:06 2014 +0000 |
tree | 7d25706f688796b3cc20a61ab2cf202286f1398f | |
parent | fc9bedb4b201aaa7c25330d9ea553f786271d727 [diff] | |
parent | cecabf48ae85943b9c0e5b4805299794f5f3b857 [diff] |
am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: cecabf4 -s ours * commit 'cecabf48ae85943b9c0e5b4805299794f5f3b857': Import translations. DO NOT MERGE