tree 6bca64546a6a78d3a1e28f9b0423f75dd6eabbf3
parent 9889229133470c89acfb0083f8d5c62c29ea1d4e
parent eca0043b869cb10792e2f3e79d4714bde2945bac
author Andrew Hsieh <andrewhsieh@google.com> 1399654744 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399654744 +0000

am eca0043b: Merge "Disable canonical prefixes of system headers"

* commit 'eca0043b869cb10792e2f3e79d4714bde2945bac':
  Disable canonical prefixes of system headers