OSDN Git Service

Merge "Fix NPE in TaskSnapshotController" into oc-dev
authorJorim Jaggi <jjaggi@google.com>
Wed, 12 Apr 2017 17:16:44 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 17:16:44 +0000 (17:16 +0000)
am: 6846676b9b

Change-Id: Id27ee1c5147bbceddf36c3159d6fbf654ab965f7


Trivial merge