From: Igor Murashkin <iam@google.com>
Date: Tue, 26 Aug 2014 17:47:15 +0000 (+0000)
Subject: am 64d7b3e0: am 666c80b0: Merge "util: Optimal preview size picks smaller-than-displa... 
X-Git-Tag: android-x86-6.0-r3~68^2~27^2~135^2^2~61
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=67852ac33f6caa41aaac35aa1b67023bd4c29d0d;p=android-x86%2Fpackages-apps-Camera2.git

am 64d7b3e0: am 666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier

* commit '64d7b3e0273f715ae3aa40bab29282c984fd9f02':
  util: Optimal preview size picks smaller-than-display size in case of tie
---

67852ac33f6caa41aaac35aa1b67023bd4c29d0d