tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 3cc729fd62aa73ddadb13595e80316522fe48206
author Ed Heyl <edheyl@google.com> 1401918422 -0700
committer Ed Heyl <edheyl@google.com> 1401918824 +0000

Fix the build: Revert "Merge commit '2fa58563c9052ab3df28a13406fde6d7a5fe74e4' into sl4a"

This reverts commit aa5cf456e836c96115cd48e17b2a00cd95d6eaf9, reversing
changes made to ba03f8869e1bcd1a9b0f508d6643b072bf84e006.