| commit | 2caed04dbd17863472b79db48f728db5d533ffd4 | [log] [tgz] |
|---|---|---|
| author | Yohei Yukawa <yukawa@google.com> | Tue Jan 16 21:28:02 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 16 21:28:02 2018 +0000 |
| tree | 4dd5a740d098b26800c36a8da239cf1975d78559 | |
| parent | 6379be39c06b6c4ec9d5ac52dda42853815f3310 [diff] | |
| parent | d3fea172434d1c79f19b8a09ec8c7771cdf0c673 [diff] |
Merge "resolve merge conflicts of fa2e5aafdfeff8200139b94f380d21cfbb45c5cb to nougat-cts-dev" into nougat-cts-dev am: d3fea17243 Change-Id: Icd90229426365bd43b916e533a9afa4055f4363c