| commit | 4569166a59e9c63b5a8272dc312f362c9d1f0916 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 19:24:02 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 19:24:02 2013 +0000 |
| tree | 701114b5c0756dc29829857bdb8d6e8048c01ac0 | |
| parent | 1ae0cf68723dfaf05f387f2759b4f59e6271ba6c [diff] | |
| parent | 313e9173b50933f93325494161103752921c6fe4 [diff] |
am 313e9173: (-s ours) am 979c8a8f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '313e9173b50933f93325494161103752921c6fe4':