tree 525b93e7489f8322900a816cda04bda0c15f45cc
parent 0a6317e75a0e7e1f9c1a425c5bdc1fb75a335dd5
parent 8db5a8596f48db54eb16f523024e4ddefbc65304
author Jason Monk <jmonk@google.com> 1395433209 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395433209 +0000

am 8db5a859: am 4dfbe829: Merge "Fix missing stack trace on checkItemInfoLocked call" into ub-now-mister-ugly

* commit '8db5a8596f48db54eb16f523024e4ddefbc65304':
  Fix missing stack trace on checkItemInfoLocked call