tree 0c17bc4d5b1a55dd42208601b19b28effa20f972
parent 0407e185d7ff7e46f735f9be739096daaf3625d3
parent 08b75cc3b7ccec1b2eb7d78d5bb49049490f3a37
author Andrew Hsieh <andrewhsieh@google.com> 1418065597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418065597 +0000

am 08b75cc3: Merge "misc header changes for r10d"

* commit '08b75cc3b7ccec1b2eb7d78d5bb49049490f3a37':
  misc header changes for r10d