| commit | 44249871d0e4a3a8bc1e85f513120fece7e3d30e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 20:27:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 20:27:37 2014 +0000 |
| tree | d63e14647b97b2ed0469dd79450d5cb22586428b | |
| parent | d97237071d503e2ca7104237b996edaa369b6f6d [diff] | |
| parent | 961a5836314cfb18c20002dd46d7c31776d9ce03 [diff] |
am 961a5836: (-s ours) am 65588053: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '961a5836314cfb18c20002dd46d7c31776d9ce03': Import translations. DO NOT MERGE