tree 6cb340c4c1e69e48f950aedad7506ac3bc8f1596
parent 539f693086aa96b1d4c6e5c9c8f8b2c42342059a
parent 29c5266d284fa6321d11685c61c5d5d098349e6b
author Makoto Onuki <omakoto@google.com> 1527115522 -0700
committer android-build-merger <android-build-merger@google.com> 1527115522 -0700

Merge "Avoid NPE in AM.getMyMemoryState()" into pi-dev
am: 29c5266d28

Change-Id: Ia37099ed51b1b9bbf2af5dc9deab74494c5de2da