commit | 3ba90580a2043049696bd59f11dd523ed647ecbb | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Oct 20 16:28:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 16:28:47 2017 +0000 |
tree | e4cdcce4e72fc0f8adbc0501ca902a5f67ca8d3e | |
parent | 9646de48ab8fc10f70bc8d8f7c2f6cccacadc85f [diff] | |
parent | e42a74b86b8961d24c04960cf0d2322df294cbe9 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3f31cfa6cd -s ours am: 682e764e52 -s ours am: e42a74b86b -s ours Change-Id: Ibe5c5afa26dcadd1ddea9f8828916b2a812cb753