commit | f383a6c2f784fbf51c36d0c08c3c7baa6fe26f5b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 06 07:36:01 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Aug 06 07:36:01 2017 +0000 |
tree | 0653dcc62f9a6c81acb6bd6feabfba67bfdb1151 | |
parent | fca407e595828a4761af39332de2acd36af6a52a [diff] | |
parent | 9946ed57a24d54b169a24080787644cf15cb40e2 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 25a7155006 -s ours am: 9946ed57a2 -s ours Change-Id: Id6616005f104400f2c860283f5f5f27af783f772