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