tree d2a2f757c84965a0d919151442b713f7f2d6a73f
parent 6fd1703eb96669bb5c985c9de8d08107e800824c
parent 18b1525ac7666933befd6085461391ad1087b19a
author Deepanshu Gupta <deepanshu@google.com> 1400015883 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400015883 +0000

am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '18b1525ac7666933befd6085461391ad1087b19a':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]