tree 70daddbc08d1df93a4ce1dad5fd73c329a8f427c
parent eef52c49d7fc4cc054c5d408cd2d509b537621d7
parent 3b80e5bc9f356cdab14982563b1edb5654fd8e70
author Andreas Gampe <agampe@google.com> 1473279370 +0000
committer android-build-merger <android-build-merger@google.com> 1473279370 +0000

Merge "Base: Fix logging_test"
am: 3b80e5bc9f

Change-Id: I7c0d1e62e5d99d2d9d87ffd6d0e6f228ccdb3dd1