tree 1f5dc5587e8c96880f2cbac3686a941f77914291
parent 98d20f82ca8979b30c81df9639f54ab11e1951f9
parent b4373ac9f53e3a6edee915715101d535e1a851a1
author Aravind Akella <aakella@google.com> 1415396868 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415396869 +0000

Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev