tree fe754e927b148a9a6bd956c5cbd3219b5f608890
parent 0d9ac3ef589bb0e70dc5f25dc3f6e64f7290124c
parent 20d92b5f120dc6c2340b25b98e1caf636654f7ac
author Treehugger Robot <treehugger-gerrit@google.com> 1495139487 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1495139489 +0000

Merge "third_party/nxp: use /data/vendor/ese not /data/nfc"