| commit | 64667070a0c9d8f5b85486a39cb9bb4e9dd5625b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 17:02:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 17:02:10 2014 +0000 |
| tree | 31e22746cd36c2f4b87e73c58753b18d63a31669 | |
| parent | 9b400d81287c5be3c3902edfad17f09e955dbc8b [diff] | |
| parent | 46f2a32ee196c3e9a0b3328e12f274bfdc8e340d [diff] |
am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '46f2a32ee196c3e9a0b3328e12f274bfdc8e340d': Import translations. DO NOT MERGE