commit | e52210a6db3f3cfca8195b41afb170a71c08dee0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 18:22:42 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:22:42 2016 +0000 |
tree | d5009816eadc2f25cfaabf253ccc201adeee0863 | |
parent | 9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250 [diff] | |
parent | 23af9abbc8597dda65369b9e05dc100a4231b9cb [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 2c709ccef9 -s ours am: bf44cb7363 -s ours am: 23af9abbc8 -s ours Change-Id: I1e37deb000da296fbdde8add2d5ab3243bb3953a