tree fb6fa6bb618278a0c2a9d78a31f49ef1dfb98fed
parent 42fb1783a67a46bd00f946002b6bbc7116d9bc78
parent a166bea18ffd304163bddec4701904d91541f527
author Elliott Hughes <enh@google.com> 1388783686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388783686 +0000

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

* commit 'a166bea18ffd304163bddec4701904d91541f527':
  Fix a sporadic build breakage.