tree da3fe9c746238a8d27fa556443b39701452a3233
parent c47812a94ff92f77ec2074d6c3f7ce2ddf4f61ad
parent 068e7f7d1591ae163777cec8d1404b77d92c2fd6
author Elliott Hughes <enh@google.com> 1454697154 +0000
committer android-build-merger <android-build-merger@google.com> 1454697154 +0000

Merge "Fix libbase\'s logging dependency." am: ead369bdf0
am: 068e7f7d15

* commit '068e7f7d1591ae163777cec8d1404b77d92c2fd6':
  Fix libbase's logging dependency.