From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Tue, 29 Nov 2016 17:42:28 +0000 (+0000)
Subject: Merge changes I2198f8b5,I245c859e
X-Git-Tag: android-x86-8.1-r1~68^2~13^2^2~49^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c3fbd8b936;p=android-x86%2Fsystem-extras.git

Merge changes I2198f8b5,I245c859e

* changes:
  time test reclassification as gTest
  system/extras: Replace cutils/log.h with android/log.h or log/log.h
---

c3fbd8b936f1efa582be456df9b5d953b9e101fc