commit | 9b4f8d1a92e93d07d1ca9cf3f803002b043cb8b9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 04:47:08 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 04:47:08 2016 +0000 |
tree | 5c5093a140b0b6f2511619e174eaf6395214b6db | |
parent | 560ad742400a74accec0b5a9cb9182ac59c3550d [diff] | |
parent | 036c415394b0ad3b988e1ba374165956058ed1fe [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: 036c415394 -s ours Change-Id: I5e2c9b89ed067793303ab901de2ac95401ea37a3