tree 3d51b7d3a5723fd8747a54079f622c7a5cedb0b1
parent c5561b6cc1cc2c3b5bdf751f8711ea428d07b2bb
parent fae4063a87c3ec5a8a31995e213a0bfe9e550218
author Peter Li <pyli@google.com> 1571088291 -0700
committer android-build-merger <android-build-merger@google.com> 1571088291 -0700

Merge "Fix NPE, Add null check to mActivityManager" into pi-car-dev am: c2953de5a2 am: 4533e05889 am: 13ffe1daec
am: fae4063a87

Change-Id: I7463bc25bd68b763c5df267aad8defe59ecf261d