| commit | e824c7e005e26a4eb4be159155c2bbd94c84cf10 | [log] [tgz] |
|---|---|---|
| author | Fan Zhang <zhfan@google.com> | Thu Dec 13 04:03:28 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 13 04:03:28 2018 +0000 |
| tree | 50b0b6e5b361e57d157b2fec5ec602a7c1df23dc | |
| parent | 5f10245da92dfad61ac183722ef70e6aeddd1b2b [diff] | |
| parent | ad12b76a984474c4b285e3064f535dfb9397f6e5 [diff] |
Merge changes I6e73bcf9,I257ba108 * changes: Add a timeout waiting for contextual card loader. Set setting back to default when turning off dev option