tree 0c8fc896e8699cd4bdde6f7a0baf9bfd50d74c4c
parent 0a93c43349243de4a938556d810568501f0ba0b8
parent f19da6fd2968dcea84fb143e508d872f377988f1
author Aravind Akella <aakella@google.com> 1401218740 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1401218741 +0000

Merge "Adding wakeup sensors, maxDelay to java SDK."