ref: 1a376c407ab128d0e9dd0d438d54ffba04ce5062
parent: 3897b48aba4cbea65c340d92c67b0a0d84d3f99c
parent: d6e80deb32a3578dc333e2f1d2594a969777dcad
author: Johann <johannkoenig@google.com>
date: Fri Jun 22 08:56:01 EDT 2012
Merge "Clean Android build defaults"