commit | 67045b58b28e5de2fb1341a285287428e2ef8f4a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 22:04:58 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 22:04:58 2016 +0000 |
tree | 94b0baa2df3b1ae37225948a0f746b04d9e96838 | |
parent | 1be1113161e85fda8127dbb5b066c01f7d8892dd [diff] | |
parent | 8ae9bcbbd32ed2dfc463cfa5e2fac71f3f044d83 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 698db8cba9 -s ours am: f7c18ab52f -s ours am: 8ae9bcbbd3 -s ours Change-Id: I5c4fbd723b3b12eaca66b18ecaf3f35db96ca585