| commit | ed3fac06d002a88e135c66fd2c65c7f4bac49045 | [log] [tgz] |
|---|---|---|
| author | Ben Cheng <bccheng@google.com> | Tue Feb 19 11:22:11 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 19 11:22:11 2013 -0800 |
| tree | 12631f820b7cfb19d2ecabf74bc22e17ef2207f4 | |
| parent | 2c9edb3d9ec4516551dc99ad570bb6b2283ede44 [diff] | |
| parent | 03531523c1ae48efd5b75458ff004fb2ce04959d [diff] |
am 03531523: (-s ours) am c1838a2e: (-s ours) am 081768d3: (-s ours) Merge "DO NOT MERGE: Add missing ioctl wrappers for Nexus 10." * commit '03531523c1ae48efd5b75458ff004fb2ce04959d': DO NOT MERGE: Add missing ioctl wrappers for Nexus 10.