tree e3fc441d605b80c3f81b34254d4b41319dcfe217
parent 250772047623b4a5099dd95a6a530e1ed2dbbcfb
parent 3a8037d6b825f37273791cb30cb78dbd61d030a6
author Daniel Xie <dxie@google.com> 1445979710 +0000
committer android-build-merger <android-build-merger@google.com> 1445979710 +0000

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

* commit '3a8037d6b825f37273791cb30cb78dbd61d030a6':
  DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase