| commit | 4053a34a54864b0cc74ba79846fcb212afbbc2a7 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 03 06:12:20 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 03 06:12:20 2015 +0000 |
| tree | 4e16b1c4bcd25eb1cbb1a863f68798f9aa2a2255 | |
| parent | 1d06566c8703b57f22a13cf4e8b1d3cd680975df [diff] | |
| parent | 6c78c8e8e8d704b6ba5832c7361e207657346a14 [diff] |
Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev automerge: 6c78c8e * commit '6c78c8e8e8d704b6ba5832c7361e207657346a14': Fix for CTS fail android.hardware.cts.SensorTest#testSensorOperations