| commit | c618553064a25f33c77ce6987c5b06618b36ce5b | [log] [tgz] |
|---|---|---|
| author | Bjoern Johansson <bjoernj@google.com> | Tue Feb 21 19:24:02 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 21 19:24:02 2017 +0000 |
| tree | 2aa2509d43d10ad21f90f7198a765d0de909c3aa | |
| parent | 067cdc6be2076eefdc018cb2c15fc234f8f15bdf [diff] | |
| parent | b2ecabdbe339b0ac588bf9c9449758a95b76b21f [diff] |
Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 am: 1760c2406a am: b2ecabdbe3 am: 481142bda3 Change-Id: Ifd13589f3f5c9906b8091cd52515d8db658bb873