OSDN Git Service

Merge "interface for nfc handover supplicant commands"
authorAndres Morales <anmorales@google.com>
Wed, 25 Jun 2014 22:23:22 +0000 (22:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Jun 2014 17:34:05 +0000 (17:34 +0000)
commitd96e4948daf687f3f631ba8d93c89026fd3ce272
treec10c482755a6b793dc826c1fbbedaf757f8fd109
parent533226a318d74f9ee20a5ec80cd0c7c06dc91467
parent9740e468bc895cbc08c71aecc35fc56c3faafa06
Merge "interface for nfc handover supplicant commands"
core/res/AndroidManifest.xml
core/res/res/values/strings.xml
services/core/java/com/android/server/am/ActivityManagerService.java