| commit | cb6f97e6ab9327c96e4970cbb0eaf10f088752b6 | [log] [tgz] |
|---|---|---|
| author | Spike Sprague <spikuru@google.com> | Wed May 21 21:43:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 21:43:24 2014 +0000 |
| tree | 42d13bbd9cef0c73bd97a458d8b1adae09b16eaa | |
| parent | a47397fbc04c90de4b47f98040d558821b369a01 [diff] | |
| parent | 42c07cc1cca3460c67a4243747074c822e11025f [diff] |
am 42c07cc1: Merge "added Filmstrip viewtype tags for session, secure album placeholder, and camera preview" into ub-camera-everglades * commit '42c07cc1cca3460c67a4243747074c822e11025f': added Filmstrip viewtype tags for session, secure album placeholder, and camera preview