tree 463738b3bd8e9cca0a5cc32695d035078c5d5158
parent b6efefb4bdb05afa4a0c45e78df981706040d99e
parent 96b1b403b6ecf0daa2d7d0a8475e0d087790e457
author Robert Ly <robertly@google.com> 1360620792 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360620792 -0800

am 96b1b403: am 4c01047e: makefile changes for s.a.c

# Via Android Git Automerger (1) and Robert Ly (1)
* commit '96b1b403b6ecf0daa2d7d0a8475e0d087790e457':
  makefile changes for s.a.c