| commit | 94f01a767ae91c660a9cd3ff77a0871ea9a54085 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 10 19:19:18 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 10 19:19:18 2014 +0000 |
| tree | 40d5435d74f0571a2e9b8e67f92ac8e24ae5d115 | |
| parent | 647130baacf4f0caf077b5bf6ce00c5e1a23107b [diff] | |
| parent | 2f5e130d4d16eb80e72e492230dec843e1d2c9b2 [diff] |
am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 2f5e130 -s ours * commit '2f5e130d4d16eb80e72e492230dec843e1d2c9b2': Import translations. DO NOT MERGE