commit | 30d485359f12432802c399ed02749ca45df6df3f | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed May 04 01:43:10 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 04 01:43:10 2016 +0000 |
tree | 74f25b0c443a120402d5e270c434cd646d2f32da | |
parent | eae16383e86c1b90a9244083548cab43eed0d3eb [diff] | |
parent | 424e13df65d80e4883a96298a46891ee2a8ecd80 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a -s ours am: 919ba24275 -s ours" into nyc-mr1-dev-plus-aosp am: 424e13df65 -s ours * commit '424e13df65d80e4883a96298a46891ee2a8ecd80': Change-Id: I3ef01a3890e8912920ee46dbc840d000ea4d976f