tree 312c4b76f2794d85e02773e4442423ae764f0796
parent 5be64bc46c23b614d5452ca398a6bb7a512f1887
parent 6c801474048dffe3be4ed44f06667daa3aae03a9
author Michael Wright <michaelwr@google.com> 1410481419 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410481419 +0000

Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev