tree cf62e52e5cdbb1f2fa3b67205085ac4efca4569d
parent b199e12fe57f7f85791b3aebe5b29443009f3f96
parent 1f90d943832d435263c1cfb90d054adc95aad7ce
author Joel Fernandes <joelaf@google.com> 1548439070 -0800
committer android-build-merger <android-build-merger@google.com> 1548439070 -0800

Merge "JankBench: Add Bitmap Upload to list of runnable tests" am: 9c4b6532b2
am: 1f90d94383

Change-Id: Ic714757588429fb0ef97b6c1967e1768a773e847