OSDN Git Service

Merge "Do not show any bottom controls in secure camera to prevent launching out...
authorErin Dahlgren <edahlgren@google.com>
Tue, 15 Oct 2013 19:35:10 +0000 (19:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 15 Oct 2013 19:35:10 +0000 (19:35 +0000)
commit177c4b05ed8e9f71afc526e5cad339f245563450
treeb00d7c3f5062eb67795c1e1848bead61c92d4704
parent487200db7f4d73e85ae568221d268b46fad19726
parent3cb2004b2897129c67181316b7c9f62607858618
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
src/com/android/camera/ui/FilmStripView.java