diff options
| author | Zach Jang <zachjang@google.com> | 2015-09-16 01:56:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 01:56:52 +0000 |
| commit | 1b06455e44395489dcd027a170e68eabf2ebe1da (patch) | |
| tree | bd0e0497b56d32447b5fb69d499893460874332d /core | |
| parent | 1c88f605629a5f1647a8af1fdcfe0fb6e3eea847 (diff) | |
| parent | 00db0826561b23a54db28ed5203fd7eff79c16c7 (diff) | |
| download | frameworks_base-1b06455e44395489dcd027a170e68eabf2ebe1da.zip frameworks_base-1b06455e44395489dcd027a170e68eabf2ebe1da.tar.gz frameworks_base-1b06455e44395489dcd027a170e68eabf2ebe1da.tar.bz2 | |
am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions