commit | f7c18ab52f75516ff41534b080b7aab6ebf80ded | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 21:54:05 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:54:05 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 38ef30bc8138d91fb6f9bbe68b997a259ce0ad09 [diff] | |
parent | 698db8cba902b87fc60b55e25408bb0796cb3de5 [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: 698db8cba9 -s ours Change-Id: I84db558369ab5a4d1f0142b8c5101830f8bec472