commit | a71927310161f76b50eaf60e4f63325e3f973446 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Jul 25 16:42:01 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 25 16:42:01 2014 +0000 |
tree | 90325d6253619bb04349ceb50787fad89b631459 | |
parent | d553c9baa8651928a1d0ab1e28803ce69ab34ceb [diff] | |
parent | 796c0c99bb8d6985fee9d3eb8cb7c127e952d952 [diff] |
am 796c0c99: (-s ours) am fcf1178c: (-s ours) am 04e2eb1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '796c0c99bb8d6985fee9d3eb8cb7c127e952d952': Import translations. DO NOT MERGE