OSDN Git Service

am 3007cc30: am d1c6dca6: am bbd723ce: am 144c4ff0: am 4cb113ed: Merge "Fix a NPE...
authorSvetoslav Ganov <svetoslavganov@google.com>
Tue, 1 Sep 2015 16:07:41 +0000 (16:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Sep 2015 16:07:41 +0000 (16:07 +0000)
commit5abd431a87c2c4499dbc91312194d534c3ffb518
treee0065b1bd93ca2c0fae10f1f26df5dc6a3feb281
parent5a0b7e980074cd2412dfda3cb581600b9edcfbb3
parent3007cc30f224f560081091159c6f706b2ed0e4bc
am 3007cc30: am d1c6dca6: am bbd723ce: am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev

* commit '3007cc30f224f560081091159c6f706b2ed0e4bc':
  Fix a NPE when shutting down instrumentation
services/core/java/com/android/server/am/ActivityManagerService.java