commit | fc1d3da510310ce72aee8a68f103ed7096f4e9d4 | [log] [tgz] |
---|---|---|
author | Zhijun He <zhijunhe@google.com> | Tue Oct 14 23:41:32 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 23:41:32 2014 +0000 |
tree | 0b116cebdc7f73a170478c7d0dd2fc21af798d55 | |
parent | fdd9850af2b418582812753d2d4964646a851ec2 [diff] | |
parent | 62c456f02d3f1071d18644fb3a1de354d6e4ee7f [diff] |
am 62c456f0: am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev * commit '62c456f02d3f1071d18644fb3a1de354d6e4ee7f': Camera2Client: avoid two consecutive sets of configure_streams calls