OSDN Git Service

Merge "Fix NPE in usage stats manager (recent regression)" into oc-dev am: 091050e92a
authorMakoto Onuki <omakoto@google.com>
Fri, 19 May 2017 19:38:20 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:38:20 +0000 (19:38 +0000)
am: 75f7c57aef

Change-Id: I98fd109be4e512aabcb0c8f4b030ed7a89a6a906


Trivial merge