tree c12cedfd721c310ec1d85b931aa008ee3b347fe9
parent a8e7389a869803a14b85061ef6bfb013f1de068c
parent ce888323c994d45668828fd4720617becef7a881
author Stephen Hines <srhines@google.com> 1401491732 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401491732 +0000

am ce888323: am ef4e7891: Merge "Update compiler-rt aosp/master for 3.5 (r209699) rebase."

* commit 'ce888323c994d45668828fd4720617becef7a881':
  Update compiler-rt aosp/master for 3.5 (r209699) rebase.