From: Alan Newberger <alann@google.com>
Date: Sat, 30 Aug 2014 02:31:09 +0000 (+0000)
Subject: am e48f098a: am 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other... 
X-Git-Tag: android-x86-6.0-r3~68^2~27^2~136^2~30
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=13970b5d;p=android-x86%2Fpackages-apps-Camera2.git

am e48f098a: am 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier

* commit 'e48f098aebd68f6e13c4faaa1dfc9249fe327423':
  Ensure ZoomView appears on top of other views in L
---

13970b5dba6fb074088b899052cd709940631dbc