tree 12f98d2821f4d046b3dd8d38171cd743f70ca0c0
parent e9b36f1a9a280877cb130452c50af6a51360a203
parent 121f209d3ea770109c9ebe0b6f8a965f91d5a2ef
author Dan Albert <danalbert@google.com> 1400527683 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400527683 +0000

am 121f209d: am e1efe23f: Merge "Fix unbundled branches"

* commit '121f209d3ea770109c9ebe0b6f8a965f91d5a2ef':
  Fix unbundled branches