| commit | 02f0c2056303495d6842e0a41d7e7d7e83028624 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 19 12:27:03 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 19 12:27:03 2018 -0700 |
| tree | 2f06b60b1abdbfef8a6b6bb9823767f6446e3d47 | |
| parent | 44b035185c932fce430331c8d7559716f9a703c0 [diff] | |
| parent | a48b21a802bc7293d7282514cde1952dbace6331 [diff] |
Merge "Frameworks: Let GuardedBy accept multiple locks" am: 940a9e95df am: b32933c3cc am: a48b21a802 Change-Id: I59fd2f34f26a036387e909b6ad9f6c78b6bdc897