tree f111c20704b0bb49921fd1712aa6786241f7dabf
parent 76201e86350b1843f944a2987c97154e5c9d56c8
parent d47dc2eca90c868ab4fe483856e6f98b7254162a
author Vishnu Nair <vishnun@google.com> 1569419782 -0700
committer android-build-merger <android-build-merger@google.com> 1569419782 -0700

[automerger skipped] Fix locking issues with proto dumps am: b57b01e59d am: 52d123c960 am: e0cc72f3ce
am: d47dc2eca9 -s ours
am skip reason: change_id I8bb93e9b9f81faec59585b770eb7ba0fbcd9b51b with SHA1 8406fd785b is in history

Change-Id: Ib230a30f155476008b876a3d4d20827d1a9f4744