tree 6c0aaca9c81e1db23b7cc546c08635b3b1967147
parent dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3
parent 2fc4970c2631ec5593c4566a72d4524014b49a29
author Alan Newberger <alann@google.com> 1436547318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436547318 +0000

am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit '2fc4970c2631ec5593c4566a72d4524014b49a29':
  Null check when evaluating valid resolution size