tree 212c2d3fe96b74d229244cafeab3defab5260eaf
parent ef025b0604d9e3209ef07347f2b66cfb0d405b60
parent 99c0cb2140f75e04c89b0e497a2a91d7300ee042
author Daniel Xie <dxie@google.com> 1445979431 +0000
committer android-build-merger <android-build-merger@google.com> 1445979431 +0000

Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871  -s ours
am: 99c0cb2140

* commit '99c0cb2140f75e04c89b0e497a2a91d7300ee042':
  DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase