tree 45bacea367bd5185bc713d5420c9c7f8e24dde60
parent 3bd7aaf8716b43e72841ff7dc8a8b3c064b87f72
parent 41bdd91780add31a4ecc34888b06bf414465387a
author Tianjie Xu <xunchang@google.com> 1491888276 +0000
committer android-build-merger <android-build-merger@google.com> 1491888276 +0000

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

Change-Id: I04cbfbe5268bb0decaa3c84d815914ac4dcfa80f