commit | ba3fe94b02ee5cc61fb67365389f73779127da7f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Apr 30 10:03:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Apr 30 10:03:47 2017 +0000 |
tree | 9043216d8ae691189582856b7049efde07c16a50 | |
parent | a64630c386e41b4e5e3ed43b0ac2146335fd8b3a [diff] | |
parent | 9d55911ac5b66612aa2476f8a8426f80aa4414b0 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 8d9d1ae932 -s ours am: 9d55911ac5 -s ours Change-Id: I3ebb083c11d21211a6ca33c2f77578b37dceba0d