tree 1a6d2fae14e0274a58011b83857016c7e4bf0ea2
parent bca4c7fc0de4909c365c08581456ebea8ca8ce61
parent 70eb66a904ee55a20049004c1ba550efc68ed4b8
author Daniel Nishi <dhnishi@google.com> 1482441402 +0000
committer android-build-merger <android-build-merger@google.com> 1482441402 +0000

Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev am: dfe1bc2f34
am: 70eb66a904

Change-Id: I46f86f7c166ebf91723675467847d2ff472164b2