OSDN Git Service

Merge "Fix NPE in ActivityThread" into oc-mr1-dev am: 348b13f597
authorClara Bayarri <clarabayarri@google.com>
Wed, 4 Oct 2017 13:00:52 +0000 (13:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Oct 2017 13:00:52 +0000 (13:00 +0000)
commit29e6f56950a4b5e7506666e304f530fae146a0e4
treebacfb68aed54f5b3d23a7c6a644b3510e9c24935
parent6c591dd3c3c1bf0f9868da7cc13cdc8b87791bc8
parent889c0c0f1279acff3dca2621fd6000f2e3e5e39f
Merge "Fix NPE in ActivityThread" into oc-mr1-dev am: 348b13f597
am: 889c0c0f12

Change-Id: I93b731cd4a52828e1c3d00018d4c095ab0e508a3
core/java/android/app/ActivityThread.java