| commit | 8345efb46bb99fff62b1e5b844a248419817daf5 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 18:45:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:45:55 2016 +0000 |
| tree | b995e9ac42c74d9b214daf61a80259cfdd1477c4 | |
| parent | 696ced2f60e2899046f5f2c0c498b0f09a9bd026 [diff] | |
| parent | d9e0f6317625041fc5de0daabfa33f6192fce743 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: b197cd85a6 -s ours am: 7556f0bc2c -s ours am: d9e0f63176 -s ours Change-Id: I22b4d6966409c7b05777c7339793ced90674bfce