tree d3b733e0198d85cd9342177db5e245b978e53a64
parent fcf2b54ded937e6bffc37d5a896e3c9fd00e71a5
parent b593a814519e977fffd43eda1ba2be4d4efe1fd1
author Nick Vaccaro <nvaccaro@google.com> 1433378922 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433378965 +0000

Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into mnc-dev