| commit | 8a668decb45c5464f55cc1eee520b4647d11c292 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 13 23:48:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:48:29 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | f5d50abec2f85057d10f769d118ddb7861ffc8bc [diff] | |
| parent | 37e29556aa5f37efadf5aa987078d4ec896fc669 [diff] |
am 37e29556: (-s ours) am b2968423: (-s ours) am 988255ea: (-s ours) am 0d445db1: (-s ours) am c5d3d025: (-s ours) am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '37e29556aa5f37efadf5aa987078d4ec896fc669':