| commit | 2e800c017bc4400a360d002db5767a2142710186 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:31:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:31:11 2014 +0000 |
| tree | 0ab9f5066e7fe522540774e39282baffb608138f | |
| parent | f3a2bb195ec08960c54d8ad0e875a6c072c8abf5 [diff] | |
| parent | 70f7b1b6deb5ba2ccefb121b60d285e79598ff17 [diff] |
am 70f7b1b6: (-s ours) am cb9247ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '70f7b1b6deb5ba2ccefb121b60d285e79598ff17': Import translations. DO NOT MERGE