| commit | 09b4c6f433d847531ef729de712346c747348a96 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 04:38:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 04:38:47 2016 +0000 |
| tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
| parent | 2ecd2c541a63a53615b83010b1700f7f52ccce50 [diff] | |
| parent | 66299ffce0532be5ede58628405c470b28d044b8 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 0b82b53b82 -s ours am: 66299ffce0 -s ours Change-Id: I889924b2d9eb24e0ce160cfae0d5dff99e51c60d