OSDN Git Service

am d14e1f2f: (-s ours) am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CA...
authorEino-Ville Talvala <etalvala@google.com>
Thu, 27 Aug 2015 10:44:02 +0000 (10:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:44:02 +0000 (10:44 +0000)
* commit 'd14e1f2fbdc9c6e85a9581b5a496bd514c2511f9':


Trivial merge