commit | e6c14fba027c9bced702653f09c6658ffeda1c30 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Aug 12 09:47:17 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 09:47:17 2016 +0000 |
tree | 2c81fc393cdc46043ab7ee14bfd26c1f3102cc1f | |
parent | 50ebf422f0de843beb6f45cee4ed32a08930146a [diff] | |
parent | 5798a13b5ee7c735d5e35e498bcf3803db3352bc [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d97f049315 -s ours am: a4fc5f2b76 -s ours am: 5798a13b5e -s ours Change-Id: I8f53e8edfc54644ca7f79e2c2851d4092a027f86