tree f991fcaa2c48e46d8470e4846e709c0dc5b44e50
parent 793152e1ef1307b111c875b4016abc8e61b47f05
parent f48cb71993c864a4cedb83fe0d5c3df98c48d426
author Ben Cheng <bccheng@google.com> 1361404385 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1361404385 +0000

Merge "Add missing ioctls used by NFC."