platform_packages_apps_Nfc, branch kitkat-mr2.1-release

Fix compiler warnings (DO NOT MERGE).

2014-03-19T05:45:21+00:00

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

DO NOT MERGE Fix NPE in RegisteredAidCache

2014-03-14T23:17:39+00:00

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

Import translations. DO NOT MERGE

2014-02-21T07:28:53+00:00

Change-Id: I3b39f521bc29c9ca0208d67c66b6f95679d2ce6c
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

2013-12-12T10:54:38+00:00

Change-Id: I8b06d43cb18a2cb1e8e735b6d78515ccca670006
Auto-generated-cl: translation import

Increase NFC-A guard time to work around B5 issue.

2013-11-06T23:14:00+00:00

Increase NFC-A guard time in reader mode, to make
sure we properly wake up BCM20791B05 devices.

Bug: 10852675
Change-Id: Ia30972d5d7850171bc58068c5d6896025eb6c2c1

Import translations. DO NOT MERGE

2013-10-29T04:53:18+00:00

Change-Id: Ibfd34791605d53500be71f7c09223e198370fbf0
Auto-generated-cl: translation import

HCE: Fix potential crash and handle Android AID.

2013-10-23T19:51:48+00:00

For new "default route" CTS test. Also, fix
a potential crash for starting off-host services
and check that HCE services have declared the
NFC permission.

Bug: 10681671
Change-Id: If86d9820d6eef5a0661be92be67168d5f81ddc64

Import translations. DO NOT MERGE

2013-10-21T20:44:51+00:00

Change-Id: I930a2209b1b7e2fcc03ed448b0abcb127b70b86b
Auto-generated-cl: translation import

Merge "Import translations. DO NOT MERGE" into klp-dev

2013-10-17T15:29:17+00:00

Import translations. DO NOT MERGE

2013-10-17T13:09:35+00:00

Change-Id: I443b01b550cb0e1d98818db042dcb1c8fbd19059
Auto-generated-cl: translation import