commit | f2b6f1043971e370dac438ebbeaea86f8d6f6253 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed May 24 11:32:33 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 24 11:32:33 2017 +0000 |
tree | 13597e5ed21a45deb269cfbc2ebb7b4a765d9c5f | |
parent | 1679a515a88e03e52a142710c016fbbd34d1db1d [diff] | |
parent | d72d69f45b51d59fedaae0593ba3e6dbf2b84028 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: d72d69f45b -s ours Change-Id: Ib193aa19e764d410ca639a48feee73b8bd84c66c