commit | 70f52f6a1dab0de50e1319a40ce66c70cb78c43b | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Jan 06 22:50:17 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 06 22:50:17 2015 +0000 |
tree | 92b00356d14a197235b05c24065dc2d1065e2629 | |
parent | 1b8a5fb594e3c455a063d3b0495ff6b0585b9817 [diff] | |
parent | 5e1b4a0c8301716bd20fa172db523013e7b698bd [diff] |
am efc0bbec: (-s ours) am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 5e1b4a0 -s ours * commit '5e1b4a0c8301716bd20fa172db523013e7b698bd': Import translations. DO NOT MERGE