tree 6d07edaa5ea48f2f8d17389de8378ca88eef94b2
parent 2bd34772340174e844bd4ff1f3e2096d5a7e2cf8
parent 687ec9b5e143aa92de008efcaa7b5750eeab87ef
author Elliott Hughes <enh@google.com> 1388783805 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388783805 +0000

am 687ec9b5: am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."

* commit '687ec9b5e143aa92de008efcaa7b5750eeab87ef':
  Fix a sporadic build breakage.