tree 2bbf47089729273124b016ec6071ebf5423a7b68
parent 0e42ac339961d223638891cc8d8afcea7290c62c
parent 751953859c82652c501952e8bb11d0bace99ca41
author Peng Xu <pengxu@google.com> 1503699701 +0000
committer android-build-merger <android-build-merger@google.com> 1503699701 +0000

Merge "Sensor VTS testBatchingOperation flakiness fix" into oc-dev
am: 751953859c

Change-Id: I8800d11d6b137488674f3159941135bce374d3a6