tree ff7fd27b8cdecc121e4b80b563f93ba49a4b1c80
parent c97a9f0e644e365e415a938ab36f02c538953ca7
parent a2b947e0a5ff4106e36f8110232131dab1356c25
author Tamas Berghammer <tberghammer@google.com> 1473261548 +0000
committer android-build-merger <android-build-merger@google.com> 1473261548 +0000

Merge "Fix unittests broken by 545808a"
am: a2b947e0a5

Change-Id: If3f9fcf726bfc948c1c5ee66635ceed7144b3cc6