tree 6533be6439eed4af02d82a20af3bd7eb0ce69132
parent 7a349d7288ddc3aa93edfcdc81c7347b828819e0
parent cb941157a2282191486f7bbefb961289401f6caa
author TreeHugger Robot <treehugger-gerrit@google.com> 1507120839 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507120839 +0000

Merge "Fix NPE in ActivityThread" into oc-mr1-dev