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