tree 000e4401550983c95f61a6b9acfab57e95ff65ed
parent b30ad7455e80266aacf57c9c18fe569833eca118
parent 5f036fb80bac5da7578cefaecdb62457e0067368
author Robert Ly <robertly@google.com> 1403646477 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403646477 +0000

am 5f036fb8: Merge "docs: ad dnew hero, remove arm" into klp-modular-dev

* commit '5f036fb80bac5da7578cefaecdb62457e0067368':
  docs: ad dnew hero, remove arm