tree 006d9248d77d665be42dbefcfcdf4bbaeaf662d1
parent 3bb44fecbb9643e68a52d19b9c90809c77367b3e
parent 22bdcd2f829dd9226978c9ec4405fd89d4562d73
author Robert Ly <robertly@google.com> 1406149332 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406149332 +0000

am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs

* commit '22bdcd2f829dd9226978c9ec4405fd89d4562d73':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1