| commit | 0a0cfbd2bef78f26231d9fb53546e7682f9bf4bd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Oct 04 13:06:03 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 04 13:06:03 2018 +0000 |
| tree | a7471a69720d2735930d6b6e18e8efe656dd7204 | |
| parent | ecc03e9e4f0f65bebc81db3dc08db4ec08807858 [diff] | |
| parent | 91175d92d184944d6da4a12663fff9783374c4a3 [diff] |
Merge changes from topic "uid_war" * changes: Camera service: Extend UID check timeout to 300ms. Handle race between UID state and activty resume