am a2590d59: am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev automerge: a91c5ca
am a2590d59: am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev automerge: a91c5ca

* commit 'a2590d595fbf688e7bcff5014c1d442ca4243e79':
  Fix memory corruption in test

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base