OSDN Git Service

am 6b45aace: (-s ours) am 8b6721ca: Merge "Camera2: Update FAST mode for EE and NR...
authorChien-Yu Chen <cychen@google.com>
Thu, 27 Aug 2015 12:20:54 +0000 (12:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 12:20:54 +0000 (12:20 +0000)
* commit '6b45aace870adab6c5d5156a1d1befd727a20e1a':


Trivial merge