tree 11073f3109b475f81b937513a02248bae8c3fcd2
parent b9267c692084b862587af018a44b1fbe2f824d89
parent 3359ffe4ddd083dc76034ac0284b1c216fa7a633
author Robert Ly <robertly@google.com> 1366407265 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366407265 -0700

am 3359ffe4: am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '3359ffe4ddd083dc76034ac0284b1c216fa7a633':
  sac template fixes