commit | 3cd12a1ca72d49e6af3b3ac99006cca90dcf8642 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 15:21:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 15:21:28 2017 +0000 |
tree | 099850c4279e2674d7bfd661df3136fd07561250 | |
parent | 64465df428c93e45558707a48ccf017bcef95596 [diff] | |
parent | b39c08f9d7e87999a2d9bab0831b470f488f5325 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7 -s ours Change-Id: I32484f5c5715c17c439d5ff20fcd8e46b8061c18