OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into
authorXin Li <delphij@google.com>
Thu, 13 Oct 2016 20:51:19 +0000 (13:51 -0700)
committerXin Li <delphij@google.com>
Thu, 13 Oct 2016 20:51:42 +0000 (13:51 -0700)
commitee2903686f9566a0563bdb7a263ab58454c2634a
tree81b94d15afa4ed0045559fff49d13ad32d6db6c1
parent2cd4383c316b894bd10191f64c1394df1d2c1b0d
parentdf1b6d2f58a7de3c7d9bfd612cf9aeeea1f25990
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into
marshmallow-dev" into mnc-dev.

Change-Id: I7215eebd4a2cc9a4b6ccf2a3e36ed8edc556d208
packages/Keyguard/src/com/android/keyguard/EmergencyButton.java