| commit | f97ade32426843025260275767a2d6dae17c9fc1 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 04 19:23:50 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 04 19:23:51 2017 +0000 |
| tree | a15a466a8762ef651a339f7aaec8f4bdff5c1340 | |
| parent | 80158939f9ce31676d6520ff97dc3af4a9760a7f [diff] | |
| parent | 0475d911fcc1e6e1b4f49626f59a0a07038590fa [diff] |
Merge "Add timeout to lock in MtpServer configure" into oc-dev