tree b4143f80c177ef3c4b5e9476d233b8c3a041e627
parent eb2097d840ac4e2f8709041cb7c9282697a309af
parent 7151398929e487f7f74b285f3e4c478f95daa7c6
author Yorke Lee <yorkelee@google.com> 1424990224 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424990225 +0000

Merge "Use new PowerManager API to implement voicemail proximity"