| commit | 1026560ab514ae99302dbdda6687f50975774a9d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 21:47:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 21:47:09 2014 +0000 |
| tree | 24b43f9113d4996355f7769e619dd414870ef22c | |
| parent | ec04662b0178c508aa016763a0f743dc5e55c548 [diff] | |
| parent | 523a3f1bac67146529847285cff5f64efeffff15 [diff] |
am 523a3f1b: (-s ours) am d0dbc88b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '523a3f1bac67146529847285cff5f64efeffff15': Import translations. DO NOT MERGE