| commit | d0384c1d3e641f4eda78a296a6beed6ee442e0fe | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 27 18:51:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:27 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | edd51699eccbb684f296d754706e6f36dcab1f6f [diff] | |
| parent | 34e8a1fe12e967f8e62fb90c838f7c0ef468eeb5 [diff] |
am 34e8a1fe: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '34e8a1fe12e967f8e62fb90c838f7c0ef468eeb5':