OSDN Git Service

Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 23 Sep 2016 15:43:06 +0000 (15:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 15:43:06 +0000 (15:43 +0000)
am: 18fb24c5d3

Change-Id: Ic61398ebf0f4b453c2e859f49b373810934218bd


Trivial merge