tree 1053eb7bb45ef21ad3484c021e4c7fd0199550ef
parent f8794065cc084a7e66e993638d990b64b8879169
parent 3e0808d1d5ce43c6f3bd8919315335fbb3f17e4f
author Jorim Jaggi <jjaggi@google.com> 1406549743 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406549743 +0000

am 91755f3f: am 54815675: Preview layouts for phone/camera affordance.

* commit '91755f3fbf96da62ad747526e8c0994c27aa1817':
  Preview layouts for phone/camera affordance.