tree 087ba0fb77d31a3842adc769a2ce977ee11714ec
parent 188b94c27f67ede1b7d60d5715bd25b61ace39a0
parent 424edca1cf432b9e906e00840cf9b7068f35dc8e
author Shuzhen Wang <shuzhenwang@google.com> 1498092226 +0000
committer android-build-merger <android-build-merger@google.com> 1498092226 +0000

Merge "QCamera2: Add more traces for reprocessing" into oc-dr1-dev
am: 424edca1cf

Change-Id: Iee40e070c6fc20cc1d8e8df6d1d0e0e60b26941b