tree d4768a6af64a9b9f337e8a0f381bb8f00e902a50
parent 731a279e0562effe26ad60ea608c645677197ea3
parent a0716b1e82e9798d08ce78b9dedf5deef30dbb32
author TreeHugger Robot <treehugger-gerrit@google.com> 1475801093 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1475801094 +0000

Merge "Fix crash from recycling scrapped item."