tree 99870177a6eea8ed3a12a4d7527351e4745983f2
parent 1757b107001281779c0c693b156dad235e9dc3bd
parent d085f8ef89c80b5f763779a3f8ad681c022e0fa1
author Peng Xu <pengxu@google.com> 1502139800 +0000
committer android-build-merger <android-build-merger@google.com> 1502139800 +0000

Merge changes from topic 'sensor-cts-8r2' into oc-dev am: fa6b5ba609 am: debdfc5641
am: d085f8ef89

Change-Id: I02c064f0bacb72618836af4aea7eefc43390feb1