| commit | 6b946858382886a01636350c2d8332328bd829d1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 22:45:02 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:45:02 2013 +0000 |
| tree | f03503c967b8db75837f9840c6d72416dcb09cc8 | |
| parent | 8f77316183e2009e4d9d100abc5733f1a536e68a [diff] | |
| parent | 4569166a59e9c63b5a8272dc312f362c9d1f0916 [diff] |
am 4569166a: (-s ours) am 313e9173: (-s ours) am 979c8a8f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '4569166a59e9c63b5a8272dc312f362c9d1f0916':