commit | 6c310d5474f5183fffc99872ae7ecd6a780fdff9 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Sep 12 19:16:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 19:16:00 2014 +0000 |
tree | 1a03ac51662a88fb6d24b7af89fba1cfbacb5df5 | |
parent | d803b5a4f6000da768c9f2c2a08a8db9ac4c755c [diff] | |
parent | 4eec42f7575fcb63cb0af7d898ba0525ec8e248f [diff] |
am 4eec42f7: (-s ours) am f8257a0e: (-s ours) am f1bc3d1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '4eec42f7575fcb63cb0af7d898ba0525ec8e248f': Import translations. DO NOT MERGE