tree 36a710ed570050092a1d5d4a4f56971b2eb91361
parent 4f830fb955cfee1973edc37b32e0218e59b60fdb
parent ec151c8dac7dbfbacf46238d4fb53ee68c95aeb7
author Ben Cheng <bccheng@google.com> 1361489200 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1361489200 +0000

Merge "Add missing ioctls used by NFC."