| commit | 81668ff9e073822225f436e1678902329404cf90 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Apr 19 14:50:01 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 19 14:50:01 2016 +0000 |
| tree | c5475bd9915ba19da2f2e1fcaff60053cc1a1534 | |
| parent | 96046084d01f26ad310a3274a4113ec37bd77c45 [diff] | |
| parent | 447122c9bfd3ae7fa1edb668355fce5c313c439f [diff] |
Merge "Merge "Don\'t start defaultcrypto twice" into nyc-dev am: fe5d55a am: ec2cdb8" into nyc-mr1-dev-plus-aosp