Import translations. DO NOT MERGE

Change-Id: I8b06d43cb18a2cb1e8e735b6d78515ccca670006
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I3b39f521bc29c9ca0208d67c66b6f95679d2ce6c
Auto-generated-cl: translation import
DO NOT MERGE Fix NPE in RegisteredAidCache

If the specified AID is not matched to any of mAidCache's keys,
the HashMap returns null and then NullPointerException occurs.

Bug: 13322965
Change-Id: I0d97aab0e47a6c6e7cbdb2426173038f4194c457
Fix compiler warnings (DO NOT MERGE).

packages/apps/Nfc/nci/jni/RoutingManager.cpp: In member function 'bool RoutingManager::addAidRouting(const UINT8*, UINT8, int)':
packages/apps/Nfc/nci/jni/RoutingManager.cpp:123:94: warning: format '%s' expects a matching 'char*' argument [-Wformat=]
         ALOGE ("%s: failed to route AID");
                                                                                              ^
packages/apps/Nfc/nci/jni/RoutingManager.cpp: In member function 'bool RoutingManager::removeAidRouting(const UINT8*, UINT8)':
packages/apps/Nfc/nci/jni/RoutingManager.cpp:139:95: warning: format '%s' expects a matching 'char*' argument [-Wformat=]
         ALOGE ("%s: failed to remove AID");

Bug: 13476133
Change-Id: I6765bc68a7d8c2180cf8dd2f587d302cac314538
nxp: Include support declaration for Mifare tags

Older chipsets requiring the NXP stack are also known to be
compatible with mifare classics, so just push the feature
declaration

Change-Id: I5017cff14ca37b2b7f7b8638de1b58253c0b10e5
Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1
Automatic translation import

Change-Id: I86efa27a8e6296e91fc131c224126445f3af1d6c
Automatic translation import

Change-Id: I9a5237ebb57711c87a129337cadd07bef4e4dc3e
Merge branch 'cm-11.0' into stable/cm-11.0