From: Mangesh Ghiware <mghiware@google.com>
Date: Wed, 14 Aug 2013 17:37:41 +0000 (-0700)
Subject: am 2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos... 
X-Git-Tag: android-x86-7.1-r1~172^2~224
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c370716;p=android-x86%2Fpackages-apps-Gallery2.git

am 2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

* commit '2d16b22570ae4ad9c2dc4c3230cc9894eb5bf1a2':
  Add a trampoline activity to launch new Camera
---

9c370716eabed079c471b90f3c4e4383854156da