| commit | 520cb890129bb5b60fee38590b107e953158b7ed | [log] [tgz] |
|---|---|---|
| author | Ben Cheng <bccheng@google.com> | Tue Feb 19 12:28:38 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 19 12:28:38 2013 -0800 |
| tree | c397b04afceb6984539512734c028520e25d3aa1 | |
| parent | a6c7ec2fc2b435584adc98109976f27964d47f48 [diff] | |
| parent | 17a2ab9f861eef8aea14f988487bace21c0c8e5d [diff] |
am 17a2ab9f: (-s ours) am 42812ca7: (-s ours) am 793152e1: (-s ours) Merge "DO NOT MERGE: Add missing ioctl wrappers for Nexus 7." * commit '17a2ab9f861eef8aea14f988487bace21c0c8e5d': DO NOT MERGE: Add missing ioctl wrappers for Nexus 7.