tree 3e3ecc4095cab471420c700a5a6dec85bac525dc
parent f1883646e051c5d387c52563aa47c2246863ba00
parent 7a1d16555d80135e61b90158ff3c1e3f963bd8b8
author Winson Chung <winsonc@google.com> 1300489716 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300489716 -0700

Merge "Fixing crash where we were assuming an old parent hierarchy."