OSDN Git Service

Merge "Fix NPE in ActivityThread" into oc-mr1-dev
authorClara Bayarri <clarabayarri@google.com>
Wed, 4 Oct 2017 12:51:59 +0000 (12:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Oct 2017 12:51:59 +0000 (12:51 +0000)
commit889c0c0f1279acff3dca2621fd6000f2e3e5e39f
tree3e79a82369fb8a2bb68a9c772d7fe5241ff25710
parent99ae0aed0dc54705bbbc9710cd0f312cd7655fa7
parent348b13f597ce8604d46992486e9ea7d5bc3cc5ff
Merge "Fix NPE in ActivityThread" into oc-mr1-dev
am: 348b13f597

Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c