tree bacfb68aed54f5b3d23a7c6a644b3510e9c24935
parent 6c591dd3c3c1bf0f9868da7cc13cdc8b87791bc8
parent 889c0c0f1279acff3dca2621fd6000f2e3e5e39f
author Clara Bayarri <clarabayarri@google.com> 1507122052 +0000
committer android-build-merger <android-build-merger@google.com> 1507122052 +0000

Merge "Fix NPE in ActivityThread" into oc-mr1-dev am: 348b13f597
am: 889c0c0f12

Change-Id: I93b731cd4a52828e1c3d00018d4c095ab0e508a3