| commit | 696ced2f60e2899046f5f2c0c498b0f09a9bd026 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 17 18:45:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:45:53 2016 +0000 |
| tree | b995e9ac42c74d9b214daf61a80259cfdd1477c4 | |
| parent | 1185907e169e8866aeab606587267031e4a0c618 [diff] | |
| parent | 36db1abd44b151db4231dcca68609229bc6562a7 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 8b833b1032 -s ours am: 430ad95985 -s ours am: 36db1abd44 -s ours Change-Id: I99f8dfc4a771aa7c35cdff02e5db64c529163820