Hall Liu fe9877d877 Merge "Disable app pinning when emergency call button pressed" into nyc-dev ...

am: 8b655e0f57

* commit '8b655e0f57b071756e7d6a3547eeabe35885bcc9':
  Disable app pinning when emergency call button pressed

Change-Id: I37575e58b60e2da8422732e9bb0359b0b6ff01a8

2016-05-31 17:35:12 +00:00

..

res

Import translations. DO NOT MERGE

2016-05-21 18:40:26 -07:00

scripts

…

src/com/android/keyguard

Disable app pinning when emergency call button pressed

2016-05-27 13:46:27 -07:00

test

…

Android.mk

…

AndroidManifest.xml

Refactoring FBE APIs based on council feedback.

2016-03-17 14:49:08 -06:00

NOTICE

…

proguard.flags

…