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