OSDN Git Service

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

Change-Id: I5694c5b9816407069c44b00fbc9ce7c2775e6fe2