| commit | 490ef3cda4c45b512730b470f4e26f8f9ceb7754 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Sat Apr 15 01:48:25 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 15 01:48:31 2017 +0000 |
| tree | cc44b7560b547cb98854d4d699dee1cb3acb9a16 | |
| parent | e61d56fb7072d439aee56f0f6c3d7e8c2fdefbae [diff] | |
| parent | 67cca7442bfeffc0bace506a796cfdd39e5d511c [diff] |
Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev