Skip to content
Commit ea5d0216 authored by Heidi von Markham's avatar Heidi von Markham Committed by Android Git Automerger
Browse files

am 25af46b0: Merge branch \'mnc-dev\' of... 

am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev

* commit '25af46b0':
  Camera2: add missing HFR implementation
parents 3b474e52 25af46b0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment