OSDN Git Service

Merge "Fix unittests broken by 545808a"
authorTamas Berghammer <tberghammer@google.com>
Wed, 7 Sep 2016 15:19:08 +0000 (15:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Sep 2016 15:19:08 +0000 (15:19 +0000)
commitfa46cb138d25e22d27cc7f383186247f94edd92d
treeff7fd27b8cdecc121e4b80b563f93ba49a4b1c80
parentc97a9f0e644e365e415a938ab36f02c538953ca7
parenta2b947e0a5ff4106e36f8110232131dab1356c25
Merge "Fix unittests broken by 545808a"
am: a2b947e0a5

Change-Id: If3f9fcf726bfc948c1c5ee66635ceed7144b3cc6