| commit | a033e8fdc6a77ed8f37831bcbddc28ffcc7b7354 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 12 10:36:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 10:36:32 2014 +0000 |
| tree | a5f1453c705e8adfd3e5b7c00b2a71540d0380c5 | |
| parent | ca8935c0e1fb75ed5656dcce9a945b0491ed5b26 [diff] | |
| parent | 9f78f92435c3c6ccb71dcf9d7bdcb38ad2660a99 [diff] |
am 9f78f924: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '9f78f92435c3c6ccb71dcf9d7bdcb38ad2660a99': Import translations. DO NOT MERGE