| commit | cd48191d8055cf8ed9d41f2a31e8c8766432db8d | [log] [tgz] |
|---|---|---|
| author | dcashman <dcashman@google.com> | Wed Mar 23 15:36:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 23 15:36:33 2016 +0000 |
| tree | 7e65be6bcf82d82c7c8f14ee28d562b9180e2072 | |
| parent | 59a410d5b50abd05e13649d2ca819a111267eba5 [diff] | |
| parent | ae899526a88993fe9966955695f05a63b52ad414 [diff] |
resolve merge conflicts of 8eacf24 to nyc-dev-plus-aosp am: fa355b8 * commit 'fa355b828986009123c5c47f50162610f38fdafb': Set mmap_rnd_bits to maximum value.