tree 5d90ecf4d0ba1a72b040a376f227df1ba9278889
parent ec5683a4c79c3df6bec9329e59999bbc1e4a636a
parent f8dc6489f4c31e3d6902c9bdc72990f718519b7a
author Brian Carlstrom <bdc@google.com> 1376588785 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376588785 -0700

am f8dc6489: am 7571e8b7: Add flock(2)ing on dex-cache files to prevent races

* commit 'f8dc6489f4c31e3d6902c9bdc72990f718519b7a':
  Add flock(2)ing on dex-cache files to prevent races