tree ff5a60708d2963de62d54c089209ed314e723bba
parent ccd7a82af892e9b4ba39a77235f3ace12daa8181
parent 1eb941b86b438a141e9ed9ec5f8cdc3812cebeb0
author Android (Google) Code Review <android-gerrit@google.com> 1245369697 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1245369697 -0700

Merge change 4669 into donut

* changes:
  Fixes #1922373. Resolves a case of keys collision in Resources' cache.