| commit | 52df2bded80d768b8f5c449a508c5813b9197fb4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:08:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:08:41 2015 +0000 |
| tree | 9c0d53b6a90df6c1005309714445247a45f94e31 | |
| parent | f23bf2520e7642f6c3ac193bb2099fddcb2c8f96 [diff] | |
| parent | e6897552c2f7e79660cffce68912b046aaad40bc [diff] |
am e6897552: (-s ours) am 7f436dee: (-s ours) am ab9a0774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e6897552c2f7e79660cffce68912b046aaad40bc':