tree 2113da14185fc49579425f07e8e315ba9df917c1
parent 4101ba7bbc2989d95d0361c341a268b54e6eac23
parent d320cbf5ba1b4490700f2ff89af29f28a2e326e3
author Elliott Hughes <enh@google.com> 1453253924 +0000
committer android-build-merger <android-build-merger@google.com> 1453253924 +0000

Merge "bootstat: Fix the base includes to be AOSP-friendly."
am: d320cbf5ba

* commit 'd320cbf5ba1b4490700f2ff89af29f28a2e326e3':
  bootstat: Fix the base includes to be AOSP-friendly.