| commit | b32933c3cc99083562d51d5c6d932ff102252959 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 19 11:38:07 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 19 11:38:07 2018 -0700 |
| tree | ff0ffd9a138f79e724d67b1e79206ad557c04534 | |
| parent | ec99ee195c8640a1d4be554d58b40dbc0f51f509 [diff] | |
| parent | 940a9e95dff8b67f3a690602c186ba86d8460410 [diff] |
Merge "Frameworks: Let GuardedBy accept multiple locks" am: 940a9e95df Change-Id: Ic74f0c274873d4573bb2ae9a38e91d43df79280d