tree 6a69d63850caddd398ba679ade9f8cc1b5ddfe69
parent 1d593bc60007e9824382b2c669b2a34563a5c0e2
parent bb20d6e392f817879f80956c29fa24b68d4eeab3
author Jeff Sharkey <jsharkey@google.com> 1441986806 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441986806 +0000

Merge "Increase timeout when mounting adopted storage." into mnc-dev