| commit | 9a09d511ce26df0bb81a3fc3b61d68356c790860 | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Thu Oct 03 09:04:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 03 09:04:23 2013 -0700 |
| tree | 3a64f35c7ba42074007758cfda80232cc7458a77 | |
| parent | cd324a25d3c97a7fc4bc22c2ab12408d3d5e2ac2 [diff] | |
| parent | 4c0aede4ea37f8fad98a40ec4d28028f338591bd [diff] |
am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad * commit '4c0aede4ea37f8fad98a40ec4d28028f338591bd': Only show delete action when in secure camera mode.