| commit | dd1c462b7b56ee16d0df7effba4217ff8d60a30f | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 05 02:27:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 02:27:18 2015 +0000 |
| tree | f807464b088a507801c3372c6f1881a8f95cffae | |
| parent | 75ffc557a6acd53d262e852cfea0a7ce52680551 [diff] | |
| parent | 47d0e04e5909f9558db64a27de97d41a4ee76498 [diff] |
am 47d0e04e: am dd9d8583: am 4dd7fbee: am c688aa62: am efef9855: am 4053a34a: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev automerge: 6c78c8e * commit '47d0e04e5909f9558db64a27de97d41a4ee76498': Fix for CTS fail android.hardware.cts.SensorTest#testSensorOperations