| commit | 1fac74d664b99b1457fdce5e49a29cb1d8f07816 | [log] [tgz] |
|---|---|---|
| author | tinazh <tinazh@google.com> | Fri Mar 17 17:16:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 17 17:16:44 2017 +0000 |
| tree | ae21a92dc6009ab6a5a323422cabf2d85cbaac8c | |
| parent | 847ce801d7f0f5cd59db15bed9fec99e4578aa58 [diff] | |
| parent | daf2242727e0dd41a8a9347b97c0f8cca4f7ec17 [diff] |
Merge "resolve merge conflicts of 86bafd55fa to nougat-cts-dev" into nougat-cts-dev am: daf2242727 Change-Id: I0f65920a3ca313da3249ce1d41374508e19b68ab