| commit | 68d29e2215eefe6dbf59b16ca49dfafd9a9e83c7 | [log] [tgz] |
|---|---|---|
| author | Heidi von Markham <hvm@google.com> | Sat Jun 06 00:30:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 06 00:30:20 2015 +0000 |
| tree | 571060cf5e77ffa3bc409d275502e5657fa10a8d | |
| parent | a08a143ea4b02d410455a9440d038db644c5f72d [diff] | |
| parent | 92e89dc85e2b9c649c221f97efcdee7cdfc4f76b [diff] |
am 92e89dc8: am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev * commit '92e89dc85e2b9c649c221f97efcdee7cdfc4f76b': Camera2: add missing HFR implementation