OSDN Git Service

Merge commit '12562abcd47de4aee3b0469cb04bf771c2072113' into manual_merge_12562abcd47d
authorNancy Zheng <nzheng@google.com>
Mon, 23 Jan 2017 22:04:19 +0000 (14:04 -0800)
committerNancy Zheng <nzheng@google.com>
Mon, 23 Jan 2017 22:06:38 +0000 (14:06 -0800)
commit6111e23d3057aba6a470b0269a806a98e5bc544f
treea8094cae8530cedb5bdd3a020789f249db3fb50c
parent2536cc6872ecdc43d7e9b07a02fbc844e5f124bb
parent12562abcd47de4aee3b0469cb04bf771c2072113
Merge commit '12562abcd47de4aee3b0469cb04bf771c2072113' into manual_merge_12562abcd47d

Test: manually tested upstream

Change-Id: I8ca2eebcb468f73bf609ed09dc141a2bf40b8697
core/java/android/app/KeyguardManager.java