| commit | 3af5fc41d51ff3d8b306a035fd75468129c178d4 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Jul 28 18:22:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 28 18:22:37 2016 +0000 |
| tree | 53b459f946f3274da7811cb210104d427d6226e8 | |
| parent | be76d38cbfbe2971f4cae180c2fa345129b51d9c [diff] | |
| parent | 85c4a4b8c9eabfe16e4e49f9b4aa78c1bf4be023 [diff] |
Merge \"Use try lock to fix class resolution race\" am: 85c4a4b8c9 Change-Id: Ie267436199e2bd504b8635f62f368bd84bda1897