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