| commit | b2ecabdbe339b0ac588bf9c9449758a95b76b21f | [log] [tgz] |
|---|---|---|
| author | Bjoern Johansson <bjoernj@google.com> | Tue Feb 21 19:17:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 21 19:17:53 2017 +0000 |
| tree | 27a4ef8ad17e7291079f407f2ecfce5ae7568619 | |
| parent | 11076c3eba97f8d993037040f6110cc3a4b02d4e [diff] | |
| parent | 1760c2406a7733a2636879332daf8f0e31336c6b [diff] |
Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 am: 1760c2406a Change-Id: Ic53b6307d2a74440e26be915cef13ab7716611cb