| commit | 7af8bb3aa9b79aaa72f7598e11fb89f1782e4cbb | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:58:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:58:21 2015 +0000 |
| tree | f5f2cf38e2475ee7ef8ae40a7a0144d7856e0418 | |
| parent | d5da4b3555b2b9c6a7987b4ae2931ad86d6673d7 [diff] | |
| parent | 73667881386d1cadeaa966f424af902533719efd [diff] |
am 73667881: (-s ours) am 61b83ac2: (-s ours) am ec00b01d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '73667881386d1cadeaa966f424af902533719efd':