Prerepa Viswanadham d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev ...

* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge

2015-05-05 01:06:38 +00:00

..

res

Import translations. DO NOT MERGE

2015-04-27 05:51:42 -07:00

scripts

…

src/com/android/keyguard

Update emergency call button label when language changes

2015-05-04 23:46:56 +00:00

test

Allow dismissing Keyguard from TrustAgentService

2015-04-17 01:12:30 +00:00

Android.mk

Change carrier text to 'airplane mode' when on

2015-04-01 11:49:54 -04:00

AndroidManifest.xml

Add fingerprint settings support to the framework

2015-02-27 12:03:32 -08:00

NOTICE

…

proguard.flags

…