tree b46e74d324566a344433c619807766a2b9a8f8d4
parent 6cdbe88d0bad6723e50d91585a1f3328e5b77368
parent cd197b2461281ff1d123b987dbd1c2a5b5236cd2
author Robert Ly <robertly@google.com> 1366406957 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366406957 -0700

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

* commit 'cd197b2461281ff1d123b987dbd1c2a5b5236cd2':
  sac template fixes