diff options
| author | Tao Bao <tbao@google.com> | 2016-08-31 04:13:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-31 04:13:48 +0000 |
| commit | 7fa35fafc9586432d95c7a755f9231eaffa44ad4 (patch) | |
| tree | 3b06bc21456f449343b7525a077a9f678842ec39 /docs/html/sdk/api_diff/13/changes | |
| parent | f79c28f6bc36ab2e32ff13ffe5309de7a07e8f53 (diff) | |
| parent | 4ace6263540c4d856c619431cd610745128b8f8d (diff) | |
Merge "Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 am: c5a17fc39f am: 18f9533910 am: 40d926f4d4 am: 7b0db6bf48" into nyc-mr1-dev-plus-aosp
am: 4ace626354
Change-Id: I17125450764f769fa6eb3f06589f4a282f027ab7
Diffstat (limited to 'docs/html/sdk/api_diff/13/changes')
0 files changed, 0 insertions, 0 deletions