| commit | 275625342769eba3e2b461e249aec83165e4e7f1 | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Sat Oct 12 00:38:05 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Oct 12 00:38:06 2013 +0000 |
| tree | 6e5adb17cef7e2377e80eb116f5eb82d5abbb678 | |
| parent | 87d093d6145524b1c8f5c052dfe40c18b52e5235 [diff] | |
| parent | 98b2a282a212b74d756c169a445e8d3f6089fb66 [diff] |
Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad