| commit | 4f830fb955cfee1973edc37b32e0218e59b60fdb | [log] [tgz] |
|---|---|---|
| author | Ben Cheng <bccheng@google.com> | Thu Feb 21 15:19:29 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 21 15:19:29 2013 -0800 |
| tree | c397b04afceb6984539512734c028520e25d3aa1 | |
| parent | 520cb890129bb5b60fee38590b107e953158b7ed [diff] | |
| parent | 7f92fce427043d9904c9e52d21bc548be1d78e3c [diff] |
am 7f92fce4: (-s ours) am a0f5038c: resolved conflicts for merge of 02459827 to stage-aosp-master * commit '7f92fce427043d9904c9e52d21bc548be1d78e3c': Add missing ioctls used by NFC.