commit | d22876fdea5da02ae347e80c851dce94cbc278fd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Jan 28 07:01:49 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Jan 28 07:01:49 2018 +0000 |
tree | ff2b2407016a7bb8b8b42fde67218a764be87a85 | |
parent | 231cb066abab5faddd73d1c3a0e8e823c8e76819 [diff] | |
parent | d99cb52b1795b1952a177c6228e0793bb4dea136 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1b9eecab0 -s ours am: d99cb52b17 -s ours Change-Id: I276d2d4cc8f8c2b52b32dfd3c8d1db385c1f0639