| commit | 1760c2406a7733a2636879332daf8f0e31336c6b | [log] [tgz] |
|---|---|---|
| author | Bjoern Johansson <bjoernj@google.com> | Tue Feb 21 19:13:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 21 19:13:11 2017 +0000 |
| tree | 27a4ef8ad17e7291079f407f2ecfce5ae7568619 | |
| parent | 65085b1fcd864f6ca0722df24a71fb1ba477195f [diff] | |
| parent | 959d02c19b641fbd0ce80bb4cd90714a397b0766 [diff] |
Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 Change-Id: I519a864a1435825f86c9c296c615061e96af2a00