tree 0e139f898a000ac61ca3bd029aaf99158f961448
parent b44eb7edc85ad6e5305a6f582ea28e6988556744
parent a1cad728da6462444bac316844e3cc0b3ddb2db5
author Eino-Ville Talvala <etalvala@google.com> 1467998915 +0000
committer android-build-merger <android-build-merger@google.com> 1467998915 +0000

Merge \"Camera1: JpegProcessor: Do not lock until we have to\" into nyc-mr1-dev
am: a1cad728da

Change-Id: I20fda033f58fdfeeebf983bb7b2f60d7533d8df3