commit | 516b3e719527b214329f6d596939f6165bb347a8 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 15:30:52 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 15:30:52 2017 +0000 |
tree | 0735977de7dc830a8bdfd4c2f222eb90873619a1 | |
parent | cdb756273d50b99c87d29e603e1a0809f5d8bf68 [diff] | |
parent | 3cd12a1ca72d49e6af3b3ac99006cca90dcf8642 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7 -s ours am: 3cd12a1ca7 -s ours Change-Id: Ibf672901baeae0668e40f04c37b2ab56801b5864