| commit | a48b21a802bc7293d7282514cde1952dbace6331 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 19 12:09:16 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 19 12:09:16 2018 -0700 |
| tree | ff0ffd9a138f79e724d67b1e79206ad557c04534 | |
| parent | a234b4579c78ec41ffd83fd590aeaf7bba237a86 [diff] | |
| parent | b32933c3cc99083562d51d5c6d932ff102252959 [diff] |
Merge "Frameworks: Let GuardedBy accept multiple locks" am: 940a9e95df am: b32933c3cc Change-Id: I41d775008409d4b0d4cedf15084721131eea86fd