tree dad3e58c0a06acb52b0cfab53a0fbd8d24940cba
parent bda6d9a15a845611e0d68acbf09787da71532287
parent 569dc64cd6b0bb7bdfec97967b192d2a706e3f81
author Deepanshu Gupta <deepanshu@google.com> 1400016787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400016787 +0000

am 569dc64c: am 69ab5946: am fcfb8801: 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 '569dc64cd6b0bb7bdfec97967b192d2a706e3f81':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]