| commit | e50efc30727d3beb90c3181b6d567bec012280a1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:19:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:19:02 2015 +0000 |
| tree | dde12831e3589ec9f2f2bd657262786dc7c94ae4 | |
| parent | 48c03762e876b359d4b688a63793cdc0615aee74 [diff] | |
| parent | 01072c69f184b0a9c513bdddd0e3f2266e0abe8f [diff] |
am 01072c69: (-s ours) am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '01072c69f184b0a9c513bdddd0e3f2266e0abe8f':