tree a3cb21606e0b4a628709418f41aee04e17857129
parent bfec2a01896959ba2bc9a995238eb31644ea8dc6
parent 343a89c2cd2bf4458eb24662010693ac590657b1
author Robert Ly <robertly@google.com> 1360694271 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1360694271 +0000

Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev