commit | 5c8732f388ba0ea6a450663941cfd0a6116232a0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Nov 30 21:57:46 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 30 21:57:46 2017 +0000 |
tree | 05053477d4038f2eaa5d2a9ee55d3a38eb6177c6 | |
parent | de59123c85ae53a14f79bed9249993b18004b92b [diff] | |
parent | 2ada5e5183fd084c1ce3cb780c41249537c61e76 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 23e0aacf9f -s ours am: 2ada5e5183 -s ours Change-Id: I7a02e761a346757f0cf9facd41c0b03743f3acf5