| commit | e7382bb53ca367ba4131d3213be618c80cbe0c5f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:19:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:19:03 2015 +0000 |
| tree | dde12831e3589ec9f2f2bd657262786dc7c94ae4 | |
| parent | e50efc30727d3beb90c3181b6d567bec012280a1 [diff] | |
| parent | b5cac10334ebe1640ab39039b6fbcbac818cb75a [diff] |
am b5cac103: (-s ours) am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b5cac10334ebe1640ab39039b6fbcbac818cb75a':