tree b90eba18ff8dbebd328d1f92860d281b2757f1ac
parent 9fe6d7544e78441b53d06695155f381a31348b30
parent 2627678adae19bf7b674cba46215bbf7c75d4ada
author Dan Albert <danalbert@google.com> 1568748651 -0700
committer android-build-merger <android-build-merger@google.com> 1568748651 -0700

[automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours am: 26b83d7bb1
am: 2627678ada

Change-Id: Icae4b962a39be27bbf20e9367471d167df14e207