OSDN Git Service

DO NOT MERGE Fix unknown type issue in unit tests am: 9b4aebb1ba -s ours
authorJack He <siyuanh@google.com>
Sat, 16 Sep 2017 06:27:42 +0000 (06:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 06:27:42 +0000 (06:27 +0000)
am: 55e7146aa8  -s ours

Change-Id: If80dde750d1a3e38a41dd9a4d49dfcf7bb71143a


Trivial merge