commit | 480ec6bf1ff93dc2eba894835f4427a636dc12bd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Aug 19 15:42:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 19 15:42:48 2016 +0000 |
tree | 65da95b608ea546a299d1f214b2d2ca7fb107dd6 | |
parent | 75b1175ea71cc03412030ea842db11898c8631c7 [diff] | |
parent | d1ec21e26a31ed1e91730029ba75f7f3fc580bb1 [diff] |
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4122130005 -s ours am: d1ec21e26a -s ours Change-Id: I5c472506d02ff9a808c0c0d0ba7a77910d7bebab