OSDN Git Service

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

Change-Id: I5da7220aa9f5ff0db999c00881577b160e6b17ba


Trivial merge