| commit | 295fc65d05690b2860197edb7c1f20fbc5d237ce | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Apr 29 11:05:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 29 11:05:03 2016 +0000 |
| tree | 03079a3bb8cda70561218a5470041b6a9bcce78a | |
| parent | 66a09c2e36fa33839d814fb1443f540864a589b0 [diff] | |
| parent | 4083c95dcc3c7188a3fb23497dc6bf340efde9eb [diff] |
Merge "Merge "Fix incorrect merge resolution" into lollipop-mr1-cts-dev am: e4e7fc501f" into marshmallow-cts-dev am: 4083c95dcc * commit '4083c95dcc3c7188a3fb23497dc6bf340efde9eb': Fix incorrect merge resolution Change-Id: Id4787b817ad24b3915b31d6cc4b4b0b46553dd1f