tree a314fc37a151137d7f0e97c744989c9c7545c8f0
parent 564dbb409b81d491eb7fb9d13d29c7fb1d861de3
parent 879234b240d47843a922d7b31ba90d99aea4a0ee
author Eino-Ville Talvala <etalvala@google.com> 1467414502 +0000
committer android-build-merger <android-build-merger@google.com> 1467414502 +0000

Merge \"Camera: API1: Improve ZSL mode activation heuristics\" into nyc-mr1-dev
am: 879234b240

Change-Id: I26efe76186d552ea92f0d98d1f2ae7ddf3e03822