| commit | 5822fbf2a5c37b239feb4b8880a53f152c3c6f1f | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Aug 02 02:01:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 02 02:01:41 2016 +0000 |
| tree | c139113783c10d2f9a283f0dff0b353d4339e22e | |
| parent | 12e5b87771d176dd2941db6f01b4034f9ac444a1 [diff] | |
| parent | 8cbd88ba918b91638e3776b6d9e1eb466ddb5136 [diff] |
Merge "AAPT: faketouch feature implied if no touchscreen feature requested." into nyc-mr1-dev am: 9ff0eed7e8 am: 8cbd88ba91 Change-Id: I2e7e7737e3d0d9cd3e7a6717bf7dc20708f4581a