From: Teng-Hui Zhu <ztenghui@google.com>
Date: Mon, 1 Oct 2012 18:18:43 +0000 (-0700)
Subject: am 3e9630d6: am 88cc655f: am ceebfddc: am 1cd0fd28: Merge "Trimming: support more... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~742^2~655
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6b1a94c930fc5599ca4f9a09818ea7fb1fa8d36a;p=android-x86%2Fpackages-apps-Camera2.git

am 3e9630d6: am 88cc655f: am ceebfddc: am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches

* commit '3e9630d6e90972cc84bdd366b14ba20bf1cb286d':
  Trimming: support more box by keeping more classes
---

6b1a94c930fc5599ca4f9a09818ea7fb1fa8d36a