commit | b5def6df3173775a43733f55227b5cb371fd854f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Oct 20 17:23:49 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 17:23:49 2017 +0000 |
tree | 374ec31cb49cdf2d73e22d3b474ba0c417fb1ea3 | |
parent | eae56cd53443280c526d5bd1a4411d4a79f5d0fa [diff] | |
parent | 5993317cf84b26d7270d50eefe6b21b4c59040bd [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5d9bd82bd8 -s ours am: 0c1a48ed2e -s ours am: 5993317cf8 -s ours Change-Id: I19cef82e30d7bf918e22fe69c1d2fc097d23c954