OSDN Git Service

Merge "Fix a unit test regression." into oc-dev
authorDaniel Nishi <dhnishi@google.com>
Wed, 5 Apr 2017 20:05:55 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 20:05:55 +0000 (20:05 +0000)
am: affc8fa18e

Change-Id: Iaf1f3515a4bd8ace3a86fdf5b30075c4275c7d10


Trivial merge