| commit | 42812ca7626df45d11ab08d53b69d4e83c9412de | [log] [tgz] |
|---|---|---|
| author | Ben Cheng <bccheng@google.com> | Tue Feb 19 12:25:04 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 19 12:25:04 2013 -0800 |
| tree | ab6c66050225288f9c4074975010e4828b88fb71 | |
| parent | d4d5c2c2b778f60d67119026b4a5b1d82c4797b6 [diff] | |
| parent | 793152e1ef1307b111c875b4016abc8e61b47f05 [diff] |
am 793152e1: (-s ours) Merge "DO NOT MERGE: Add missing ioctl wrappers for Nexus 7." * commit '793152e1ef1307b111c875b4016abc8e61b47f05': DO NOT MERGE: Add missing ioctl wrappers for Nexus 7.