tree dd7f0ef99b897cf9a949badfe39d719c8711e150
parent 955c5ebece6885b55ac8b67c82dd881da4543b4c
parent 461188865bdeea0770cbf7c3f8fde0ac0079d08f
author Tianjie Xu <xunchang@google.com> 1491887945 +0000
committer android-build-merger <android-build-merger@google.com> 1491887945 +0000

Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33
am: 461188865b

Change-Id: I07ff3c134ebca9738a7f7d725ec1c39941047944