commit | c1f55e8ed5df89cc73235d0ff0c8a7bc151ff1f1 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed May 14 00:07:54 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:07:54 2014 +0000 |
tree | c2175942e3a631ad112fe6ab17da560c45fc1ae2 | |
parent | 9cc9b3bc05c9789a1c96f4cad64cc4542317daa5 [diff] | |
parent | 444cfbbd79340b8b64442cf5b1457c85dcb6f40e [diff] |
am 444cfbbd: (-s ours) am 3973bc2d: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '444cfbbd79340b8b64442cf5b1457c85dcb6f40e':