tree 7f52ca86e641b8b9c69349a6d1c26c62137853d6
parent 680b2f3cb61e29a46d0d6bdf89394dd96e82f201
parent 6b5255722e7497fc7c854cf1ae9e51322bc7ceae
author Dan Willemsen <dwillemsen@google.com> 1464824865 +0000
committer android-build-merger <android-build-merger@google.com> 1464824865 +0000

Merge "Fix liblog logtags" am: 59e6afc617
am: 6b5255722e

* commit '6b5255722e7497fc7c854cf1ae9e51322bc7ceae':
  Fix liblog logtags

Change-Id: I6225d8fd338b9ffc5b4406d5dbb92e2816bcaaad