| commit | ea5d021615bb14ff94e55a4234c2dffaad2c318f | [log] [tgz] |
|---|---|---|
| author | Heidi von Markham <hvm@google.com> | Sat Jun 06 00:17:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 06 00:17:42 2015 +0000 |
| tree | 9b41571b43ac30a9eb942776bc43482429e4d066 | |
| parent | 3b474e520f8335f4567b3da743599bb447e215fd [diff] | |
| parent | 25af46b07d0dbe0f5800a17c231942e4eea7aa99 [diff] |
am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev * commit '25af46b07d0dbe0f5800a17c231942e4eea7aa99': Camera2: add missing HFR implementation