tree 164db441cae0afe9040f8780ce7e383eafab4188
parent f8335aa51431630c3917f26c2cd1adbbe6b52308
parent 17c058a2ee7bf8b2f2db3bcc9749801fb94e54bd
author Daniel Xie <dxie@google.com> 1445980290 +0000
committer android-build-merger <android-build-merger@google.com> 1445980290 +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 am: 34e4be660f  -s ours
am: 17c058a2ee

* commit '17c058a2ee7bf8b2f2db3bcc9749801fb94e54bd':
  DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase