tree 1857e7b54ab5f18a88734007870f50be4a157651
parent f23bdf7843782671f1f15439e4b74cbe56031f8c
parent 17a52ff0682b82d99c82b5920619f6de19879a28
author Robert Ly <robertly@google.com> 1366406743 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366406743 -0700

am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '17a52ff0682b82d99c82b5920619f6de19879a28':
  sac template fixes