OSDN Git Service

DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag. am: 8dc3dfc2e7...
authorSharvil Nanavati <sharvil@google.com>
Tue, 10 May 2016 15:37:34 +0000 (15:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 15:37:34 +0000 (15:37 +0000)
am: 1e93a64272  -s ours

* commit '1e93a642725a5411af0bc0bbf95b6712ef05fbed':
  DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.

Change-Id: I4ac25f2d4014d8e14aa5a2872add31f075d2cdde


Trivial merge