tree 3a4316c507195e1c7fc437d6fa22147d3a6f0467
parent 69050202ab926539f7b1d3f7efd9f688d5fbf8d3
parent 26c6e92b6bb096e7f4a863f8dba2c64bdb5c34b0
author Chiao Cheng <chiaocheng@google.com> 1379207424 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379207424 +0000

Merge "Wake up screen when phone call ends." into klp-dev