commit | 16ec3c30e5bee7c0d016307ff848caa1f237c415 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 12:48:51 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 12:48:51 2017 +0000 |
tree | 3d8cc9cd2493904e4ae43551114f1625bb939a50 | |
parent | d570ab15950554321c0ded9258a7167d0961bd18 [diff] | |
parent | 5386943cf2bce16c7a8e53a818c8abb81043966d [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours am: 5386943cf2 -s ours Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab