tree ff4a8b39d55098fae6e4d9a6167298f23f933dfc
parent 5184e5ded2aa92dd266dbe5833e3a6fa281f0753
parent fb5840b0e693bc12b0bc5d56db89b719ca7395a4
author Dianne Hackborn <hackbod@google.com> 1493419475 +0000
committer android-build-merger <android-build-merger@google.com> 1493419475 +0000

Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev
am: fb5840b0e6

Change-Id: Ib6855dbaec382426038855ab43d5be6d7dcb8892