tree f858c08b39fe0a0f9d49e003a4bdd350fac6435e
parent 8b4bcc20b7689788aab64640ebfc1b78fe283dca
parent 905642177dae22046578b5c1f51a9a9c12bfc11f
author Patrick Baumann <patb@google.com> 1573190593 -0800
committer android-build-merger <android-build-merger@google.com> 1573190593 -0800

[automerger skipped] Merge "DO NOT MERGE: Fixes NPE when preparing app data during init" into qt-qpr1-dev am: 22f1bf64db
am: 905642177d -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe66b1d51a5b0e66dff9ddbc53033866c218cd77