OSDN Git Service

Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into...
authorDianne Hackborn <hackbod@google.com>
Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)
commit0ef4ea95f29860fe28841662493bd112d5184a82
treeff4a8b39d55098fae6e4d9a6167298f23f933dfc
parent5184e5ded2aa92dd266dbe5833e3a6fa281f0753
parentfb5840b0e693bc12b0bc5d56db89b719ca7395a4
Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev
am: fb5840b0e6

Change-Id: Ib6855dbaec382426038855ab43d5be6d7dcb8892
api/current.txt
api/system-current.txt
api/test-current.txt
services/core/java/com/android/server/am/ActivityManagerService.java