| commit | fd02e2318991ee6d8e9156c38e66fd72fa7b0fea | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 16:05:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 16:05:54 2014 +0000 |
| tree | 391da50e232f2dd994a1fc0e869c6bf7a89b92a3 | |
| parent | 30531c834552ebd1ab9aff8e6589a7b4b1b3b05d [diff] | |
| parent | 77e3ba2bcdf1f1a282df803c08bc810e5b45dee4 [diff] |
am 67ea9443: (-s ours) am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '67ea944373bdbde684a77fd856e6902e0a4fac1c': Import translations. DO NOT MERGE