commit | a5885bd935ce903e310a530cf729c286c262d9e3 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Oct 13 02:54:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 02:54:54 2015 +0000 |
tree | e8c6a54a491a625ac33bd3eb57a88494377b1883 | |
parent | 897ccd27d5909f1edbaa78225f3d9722ce669592 [diff] | |
parent | bebfeffd28e5e1d558412b2a6881643f49fb779b [diff] |
am bebfeffd: am 9106ad61: am 6aae4fec: Merge "Camera: fix wrong assertion logic" into marshmallow-cts-dev am: b3310a6054 * commit 'bebfeffd28e5e1d558412b2a6881643f49fb779b': Camera: fix wrong assertion logic