tree 49452ecb9b696e561adf8819222fe08f46b2f8a7
parent f470bf3f3788062f77a0614ec693583fd85716c6
parent c0432b0d313d4a96854e27ab9d26a2d76473da60
author Marco Nelissen <marcone@google.com> 1444151281 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444151281 +0000

am c0432b0d: am e7f020fa: am cb71c4f2: am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

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