tree af5304102e730193c739a385f645b832d82ac736
parent 4a6c35b485700278df0a0729a103aa4f6f1a255a
parent a6ea1d34552401d8f991bbab6e51b6937da7e35c
author TreeHugger Robot <treehugger-gerrit@google.com> 1489189328 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1489189329 +0000

Merge changes from topic 'b36093860'

* changes:
  QCamera2: fix the wrong casting
  QCamera2: Fix definition of OIS modes