| commit | 7da57c00398e3371253461973d90cd0115bf5cbe | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Apr 29 11:07:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 29 11:07:30 2016 +0000 |
| tree | d5aee10993f6db0e3ae60ff60c96cf4ab87d5fa9 | |
| parent | aff442b5581b14ffef3b7534954858474846a93d [diff] | |
| parent | 295fc65d05690b2860197edb7c1f20fbc5d237ce [diff] |
Merge "Merge "Fix incorrect merge resolution" into lollipop-mr1-cts-dev am: e4e7fc501f" into marshmallow-cts-dev am: 4083c95dcc am: 295fc65d05 * commit '295fc65d05690b2860197edb7c1f20fbc5d237ce': Fix incorrect merge resolution Change-Id: I2d4afccabe6e3950f35c623d53896c8b095309be