| commit | 42c2f63aa68eeae9e98a0a8f39f4891a2193b1fa | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:25:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:25:29 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 4e344c28e59e94df5b5647b55924aebcd8817d68 [diff] | |
| parent | 7bfcb956ced721c611b8a441fedf3026b9366481 [diff] |
am 7bfcb956: (-s ours) am ecad1b10: (-s ours) am a5b43767: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '7bfcb956ced721c611b8a441fedf3026b9366481':