OSDN Git Service

am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame
authorMarco Nelissen <marcone@google.com>
Tue, 6 Oct 2015 15:54:38 +0000 (15:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Oct 2015 15:54:38 +0000 (15:54 +0000)
* commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4':
  Don't crash when there's no conceal frame


Trivial merge