tree 011319dbd068e9b1633676473d883be58f77e0ca
parent 42ac0372159e3204f20de0ad94e51932aab4a030
parent a95a64ddd6155e90308aa1368e2c8098d86e677f
author Robert Ly <robertly@google.com> 1360694596 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360694596 -0800

am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev

# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit 'a95a64ddd6155e90308aa1368e2c8098d86e677f':
  Revert "makefile changes for s.a.c"