tree 063c1bbb661fc20bce7a7f11e6ec25356aa3fc9d
parent 2c1a5346edb6d827b181759558bbd37ff609f37d
parent 16f645542a527c3b39e7e365c379d7a66f47e4ea
author Adam Cohen <adamcohen@google.com> 1398277498 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398277498 +0000

am 16f64554: Merge "Second try removing orphaned items from the database" into ub-now-nova

* commit '16f645542a527c3b39e7e365c379d7a66f47e4ea':
  Second try removing orphaned items from the database