tree e26f331386b883a7034de4fc89f89eb2b39bb122
parent e4012c4ac536525ed851837caba6e215856310cd
parent 6846676b9bb44e3eae284aa45d932085e6881caa
author Jorim Jaggi <jjaggi@google.com> 1492017404 +0000
committer android-build-merger <android-build-merger@google.com> 1492017404 +0000

Merge "Fix NPE in TaskSnapshotController" into oc-dev
am: 6846676b9b

Change-Id: Id27ee1c5147bbceddf36c3159d6fbf654ab965f7