tree b5ddddb92716d46aa53efa17200ffbb030308112
parent 4c81a4e1eb4079e72fe4842f5db3baaa940488e7
parent 081cca3731f99b1031bbb580f529b21a09a0581f
author Sunny Goyal <sunnygoyal@google.com> 1465333775 +0000
committer android-build-merger <android-build-merger@google.com> 1465333775 +0000

Merge "Fixing FileLogs tests" into ub-launcher3-calgary
am: 081cca3731

* commit '081cca3731f99b1031bbb580f529b21a09a0581f':
  Fixing FileLogs tests

Change-Id: I764ed735789f6c3b3d67b6b29a69772b80435800