tree 6768ffb6d0c5fb4d0141e5a31b35ddf3f93b6d89
parent 399a8fe2c40842a262f0d510513cfaf4e663e6a4
parent 582d23462e38c52092dffe02610ea86a6dca4789
author Will Drewry <wad@google.com> 1495133577 +0000
committer android-build-merger <android-build-merger@google.com> 1495133577 +0000

Merge "libese-hw: tweak pn80t reset" am: 0d9ac3ef58
am: 582d23462e

Change-Id: I4da5d33468aad76b2925be1d21cd4c37b94d4f83