tree 5e31b2596d799dceb4ce1fe7a2f6b9c31724b48b
parent fceef5cbe918e4fae2ee3a46e7634d4630531bd1
parent 90c60be02f0b8ade57752b0cba1996ae50c9aa61
author Peng Xu <pengxu@google.com> 1493150238 +0000
committer android-build-merger <android-build-merger@google.com> 1493150238 +0000

Merge "sensors: fix concurrent modification exception" into oc-dev am: 9098a0260f
am: 90c60be02f

Change-Id: I105171194bc9ea807955b0b7251096d905b89c62