OSDN Git Service

Merge "Fix unittests broken by 545808a" am: a2b947e0a5 am: fa46cb138d
authorTamas Berghammer <tberghammer@google.com>
Wed, 7 Sep 2016 15:24:08 +0000 (15:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Sep 2016 15:24:08 +0000 (15:24 +0000)
commita42e419786bccd20834449c9e9a89cb60fa2b89e
treed8854198f3cca7131b068dd71c147c82cbe6b016
parentfde473ed671d442052e1a9b4959e90a17a7131c9
parent08300f2eb3a7e8539cddb5f5612ca46126f2661f
Merge "Fix unittests broken by 545808a" am: a2b947e0a5 am: fa46cb138d
am: 08300f2eb3

Change-Id: I434cc6fd8ac63fae7328030c6b9bd5c69848cce9