commit | 3b937e62a29459395c983afd4fd4492e34baa77d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 05:03:23 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 05:03:23 2016 +0000 |
tree | 5c5093a140b0b6f2511619e174eaf6395214b6db | |
parent | c7421fc5e217085ee3582a12472e3ea9662d030e [diff] | |
parent | 3aca33df86b4954d246dc265157485d537bfc2ce [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: 3aca33df86 -s ours Change-Id: I021c66cdef761d5eac267b21f5e3c28ec9e8a883