| commit | c688aa62d03b4c13835924a4b6dc63f370938c06 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 03 06:34:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 06:34:41 2015 +0000 |
| tree | 0fafff7ecf689caeb7f4a943e4db80a49ea44cf5 | |
| parent | ef6c0b98d5713f58f6a2014d1e82ed4bc4057519 [diff] | |
| parent | efef98553a6be641b41a28c8e3d8aabb983d0c44 [diff] |
am efef9855: am 4053a34a: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev automerge: 6c78c8e * commit 'efef98553a6be641b41a28c8e3d8aabb983d0c44': Fix for CTS fail android.hardware.cts.SensorTest#testSensorOperations