tree 79c08cf9e646790b2b259e2b704a96a759f28e36
parent 4237c73eae4dab185126ff75f39dcd29812214b6
parent 92d0eb54de94e6a40af8a2c5adc014f1e32475d0
author Jizhou Liao <Jizhou.Liao@nxp.com> 1502400921 +0000
committer android-build-merger <android-build-merger@google.com> 1502400921 +0000

Merge "Add 25ms guard time after sending END_OF_APDU_SESSION" am: 328f34a989 am: 69d613eee9 am: f97b0ec050 am: 5d1a45c272
am: 92d0eb54de

Change-Id: Ie2b6c8440ae9413ec7ca3c253063e58b43d567d1