tree f0ec9a09c02ca435066be79f3a8ff2839e2de544
parent 91f5dc8fce9c37239216a01d78d771ef7592baa2
parent f7d1f627b0b1139f82f16baee482476cc10ccde4
author Marco Nelissen <marcone@google.com> 1444146878 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444146878 +0000

am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4':
  Don't crash when there's no conceal frame