tree 5afde96efee10d8083aae675c16c846601ee1646
parent e9a611324f218435e0a6604700fb7495f9ac661a
parent 34e4be660f0f2474408c7d72d0ee971cbd8622af
author Daniel Xie <dxie@google.com> 1445979950 +0000
committer android-build-merger <android-build-merger@google.com> 1445979950 +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

* commit '34e4be660f0f2474408c7d72d0ee971cbd8622af':
  DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase