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)
commit60b40a31c8142257b8efc1d3ab39f5458f663eca
tree0d91a27d9190c1c7979fad13903749d6c5db012e
parent3c77ef7f29aa7a87fef833987aa210d5340963f9
parentaffc8fa18e031e9bc2c00d99d7fa440c6b536fd1
Merge "Fix a unit test regression." into oc-dev
am: affc8fa18e

Change-Id: Iaf1f3515a4bd8ace3a86fdf5b30075c4275c7d10