| commit | f212e66aa442a3f694740672544e5a0ea2cc332e | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri May 12 08:45:29 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 12 08:45:29 2017 +0000 |
| tree | ec2bb348f640df581c9604dd89d95832f2fce70f | |
| parent | 1a3975d4be5edc68ffd53f59c988c33a2ad72d13 [diff] | |
| parent | c8efd73ae756ba789863034c93ce0e0076e47e0f [diff] |
Merge "CVE 2016-2109 fix am: 56abb3ed72 am: e0becbcb23 am: 5cfdab8c9d am: 61c19b30c3 -s ours am: 05b44fa879 -s ours am: 01ff070dc2 -s ours am: 3257cdbcc1 -s ours am: d732a2a9ad -s ours am: aa047e05e6 -s ours am: 0257462b0f -s ours" into oc-dev-plus-aosp