| commit | 7a50fdff44faba488190cabaa3b907111b31bb06 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:27:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:27:02 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | c6ab204836f31c568731b0879ac20b70c38998fb [diff] | |
| parent | ef69114ffb59392c7f2f7872e1c27d2a43f35c21 [diff] |
am ef69114f: (-s ours) am 738ad8f5: (-s ours) am 88b88fc5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'ef69114ffb59392c7f2f7872e1c27d2a43f35c21':