am 9c4f3522: (-s ours) am 86ac443c: Merge "We don\'t have CXX_BARE any more"

* commit '9c4f35229df162e42a34aae94b3eb2e2436c4469':
This commit is contained in:
Ying Wang 2015-08-27 05:04:03 +00:00 committed by Android Git Automerger
commit 5f8b4eb2a8

Diff Content Not Available