| commit | 7f92fce427043d9904c9e52d21bc548be1d78e3c | [log] [tgz] |
|---|---|---|
| author | Ben Cheng <bccheng@google.com> | Thu Feb 21 14:17:07 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 21 14:17:07 2013 -0800 |
| tree | 1bb80b6dc316c76d3a899dc37ab43c8fc0994ed1 | |
| parent | 17a2ab9f861eef8aea14f988487bace21c0c8e5d [diff] | |
| parent | a0f5038c59ebc7b66eff2ee432569ac3cb74f4ab [diff] |
am a0f5038c: resolved conflicts for merge of 02459827 to stage-aosp-master * commit 'a0f5038c59ebc7b66eff2ee432569ac3cb74f4ab': Add missing ioctls used by NFC.