tree 3e79a82369fb8a2bb68a9c772d7fe5241ff25710
parent 99ae0aed0dc54705bbbc9710cd0f312cd7655fa7
parent 348b13f597ce8604d46992486e9ea7d5bc3cc5ff
author Clara Bayarri <clarabayarri@google.com> 1507121519 +0000
committer android-build-merger <android-build-merger@google.com> 1507121519 +0000

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

Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c