| commit | 92fc67aae3517e727b06829b942c1093dc328002 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 16:15:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 16:15:29 2014 +0000 |
| tree | bd0683f041519a8f4fe3b10a84758ef48efa3fba | |
| parent | 5e5668de71f1c57ed9bc363bc9fca0c93c6ab7e0 [diff] | |
| parent | 1870e32a7170ede44eef5b467b2a37fa473bd087 [diff] |
am 3e3bd94c: (-s ours) am bc578bab: (-s ours) am fdb8d347: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '3e3bd94cc9afdd2d7f5afd95cad6305fa5611ed0': Import translations. DO NOT MERGE