tree 9d7d37da48ef3a4cd038eb8ea75af38642d8491d
parent 790d25b76a4631da98bfd7059cd238a4537df597
parent 6657d2248e902289476c4b937f5d6a1585c95ec2
author Elliott Hughes <enh@google.com> 1437242521 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437242521 +0000

am 6657d224: am 069f62de: Merge "Fix N9 boot."

* commit '6657d2248e902289476c4b937f5d6a1585c95ec2':
  Fix N9 boot.