commit | 4c4262fd7dcb550382fc131a239e52bf47fa8606 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Thu Aug 27 20:13:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:13:14 2015 +0000 |
tree | acd3e38539512eb037d74a6af7719b655d80b613 | |
parent | 47b0605525d1f2eaf0be70c1c8e2cbb33f9fe8fd [diff] | |
parent | a9bee8a42e634d5a8efcfe3334110f5fed443da2 [diff] |
am a9bee8a4: am d14e1f2f: (-s ours) am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev * commit 'a9bee8a42e634d5a8efcfe3334110f5fed443da2':