OSDN Git Service

am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:00:19 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:00:19 +0000 (21:00 +0000)
commit2100476ace68858bc7b7356b33aa525e38795592
treef082969243d710a0670c8a8e1f6df455345a040c
parent9c7e3064469e51a10503cfdf3d0215a62a3b6c8d
parent31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff
am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]