| commit | c226abe6b6951ce6beffde731aefc92a6b7ea68e | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Wed Apr 01 01:34:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 01:34:05 2015 +0000 |
| tree | 83a8f35efbd6f9d4951f80dbbba7a61109ff6f1d | |
| parent | d8d89582fd280888104b49991240b64f40b13ad4 [diff] | |
| parent | cab160ba9034c0535ebe4bb0ce83cc2d831bb41f [diff] |
am cab160ba: am 99f836b7: resolved conflicts for merge of a36ed7c1 to lmp-mr1-dev * commit 'cab160ba9034c0535ebe4bb0ce83cc2d831bb41f': Camera: fix recording test for legacy mode