tree fc5dd1006ae013fc2471dbd4d3b685e26e5342e4
parent 9531848772f8428d89d72cfbb145e61a2ec6a74d
author Jeff Brown <jeffbrown@google.com> 1398904779 -0700
committer Qiwen Zhao <zhao@google.com> 1401894093 -0700

Fix AOSP build (DO NOT MERGE)

Change-Id: I55ff499773066ad8bcbf9dc136df72905a759416