commit | 2ecd2c541a63a53615b83010b1700f7f52ccce50 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 00:09:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 00:09:27 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | a14b138b8fa96b41e831e7e1f2137624ed60da4c [diff] | |
parent | ca24f0f89bf1b26e914974dffa9a4f3aca34114e [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 464f60e489 -s ours am: ca24f0f89b -s ours Change-Id: I4d3b05f90c357c4a58ff6a861fbafd2783809a12