tree a96213489851a8cbe52e8a22b4450b67ade435dc
parent 2ef42b3d254537caafdb263361b7fcc6f79699d2
parent c1acf7994a975903320ec8146c62118b651debc4
author Romain Guy <romainguy@google.com> 1377141372 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377141372 -0700

am c1acf799: am 243a026b: Merge "Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089" into klp-dev

* commit 'c1acf7994a975903320ec8146c62118b651debc4':
  Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089