diff options
| author | Zach Jang <zachjang@google.com> | 2015-09-16 02:06:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 02:06:31 +0000 |
| commit | 716c6269674474867dc4720f86f739c639c83400 (patch) | |
| tree | fc66900111f3cb4bb6bfdff9f86734e92fe3c8e4 /core | |
| parent | 971ff47c75889a2fc4ac710fbe62ba819feeaba6 (diff) | |
| parent | 63348ae4572cd9394e79fe343d2fca2b38498d1c (diff) | |
| download | frameworks_base-716c6269674474867dc4720f86f739c639c83400.zip frameworks_base-716c6269674474867dc4720f86f739c639c83400.tar.gz frameworks_base-716c6269674474867dc4720f86f739c639c83400.tar.bz2 | |
am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '63348ae4572cd9394e79fe343d2fca2b38498d1c':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions