tree 7b3731ca1f27ef2bb1809bef8aa7154308f40351
parent 76cbcd495e55548aaeb18ce3bd10ad1924e11b07
parent 9ff0eed7e8155fc633498a9ea48f97534b1ffa02
author Adam Lesinski <adamlesinski@google.com> 1470102887 +0000
committer android-build-merger <android-build-merger@google.com> 1470102887 +0000

Merge "AAPT: faketouch feature implied if no touchscreen feature requested." into nyc-mr1-dev
am: 9ff0eed7e8

Change-Id: Iff8206d308755bc63b7d0ab62fe1e5022258f0d4