tree f743879f8d921f434e35c5bf285e8ad91d4f0f5e
parent b078b02455560e476afe01a5421494abb6585580
parent 880d1d1cbe042e15ee295f476629f0d44dc73f53
author Chien-Yu Chen <cychen@google.com> 1442952105 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442952105 +0000

am 880d1d1c: am 18ea82b0: am 3b885659: am 6307e355: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev

* commit '880d1d1cbe042e15ee295f476629f0d44dc73f53':