| commit | 2ea6af4fca2246e25ea5f3fab3fbda64498f6540 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Jul 01 18:20:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 01 18:20:31 2014 +0000 |
| tree | fd78b4efc23fdcb2c6c1b4c762bef7b0d6fbc088 | |
| parent | 9b7e74f473945549b573aefae09da95b2da5bd94 [diff] | |
| parent | 5b3e66d0f65f08de89980700f0b4f0764ae85bce [diff] |
am 5b3e66d0: (-s ours) am 9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '5b3e66d0f65f08de89980700f0b4f0764ae85bce': Import translations. DO NOT MERGE