commit | c802ded39555ac69e6abbbf8a41abd33669fcc0e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Jun 22 17:40:02 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 22 17:40:02 2016 +0000 |
tree | 6c62422d64f4627a1fcbecb102bb083ca4b3ad57 | |
parent | 597204719043da941b9e31e069fedb91b0729225 [diff] | |
parent | 44c39e709b2ecb937338cf0630fc8d29795a54d2 [diff] |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: 44c39e709b -s ours Change-Id: Iabedf9ff2c7c4d712b41c71b24e312ff697be737