| commit | 6235bb6687b1809a0672724b04e59ab776027d91 | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Mon Jan 23 16:07:49 2017 -0800 |
| committer | Aaron Holden <aaronholden@google.com> | Mon Jan 23 16:07:54 2017 -0800 |
| tree | 328f130413ebda68d917177b6c5f472a8524ee90 | |
| parent | 75e6da700fce679bd5369947cf43dfa0963c0e35 [diff] | |
| parent | d52ec60d388f560db1eca69e849dbeeccc5d9025 [diff] |
resolve merge conflicts of d52ec60d38 to nougat-mr1-cts-dev Change-Id: I85d510a4f896a4673030a249b38b7c348ab3c69c