tree 450a3224b00abd3cbfcbc5a46524527e1c4e248b
parent c7095947cbae1f55ef04a2357957b323e8b1ee64
parent 3eb82eca45013e2a78158b8a2f616dba0db958ac
author Andrew Hsieh <andrewhsieh@google.com> 1405099975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405099975 +0000

am 3eb82eca: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"

* commit '3eb82eca45013e2a78158b8a2f616dba0db958ac':