tree fd3d4d8f5d6ef5a3a0f740712b0b4778d3c8b812
parent ac188ceae2cb36f52abeb464820489fabf783e1b
parent 1b6f50bc73d3aec7fbb3350818b33814bd57d198
author Clay Murphy <claym@google.com> 1428343731 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428343731 +0000

am 1b6f50bc: Merge "Docs: Fixing awake/active confusion and named anchors in headers"

* commit '1b6f50bc73d3aec7fbb3350818b33814bd57d198':
  Docs: Fixing awake/active confusion and named anchors in headers