tree 35d72980b580acd5e5ea00a282cd977f2072d2a2
parent efa03998f48e2d835b3c10c26f26e9fdec0d9c32
parent e95136a83571913a7d8a41488b51cada634663ea
author Andy McFadden <fadden@android.com> 1312296411 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312296411 -0700

am e95136a8: DO NOT MERGE - Avoid re-use of orphaned data

* commit 'e95136a83571913a7d8a41488b51cada634663ea':
  DO NOT MERGE - Avoid re-use of orphaned data