| commit | b8a3f50629d22b2fdef9fcf4285a468d3f4c2a75 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 14 17:50:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:50:40 2014 +0000 |
| tree | 8ce2cf26bc6fdf5e57e5972e38e456414f5a63c2 | |
| parent | b23d6613ecaa0f613f30c8c597903ab9f2dfeef4 [diff] | |
| parent | 6daffe5c15a062b824a748b1658761b802282cad [diff] |
am 799b7f4a: (-s ours) am 63b599dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '799b7f4a60ed2e2ef9523a015ef45a1534b74cb3': Import translations. DO NOT MERGE