OSDN Git Service

am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolve...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:07:40 +0000 (21:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:07:40 +0000 (21:07 +0000)
commitef24a5091b63fb512d4ca9eb34df6394c3842d33
tree9f0656aa265f819db9090e2b2cc79f6891744bee
parent4dff881b997e3e8c871068ae4b237a9e0f4ab2e7
parent900954e3cd135bf43db975961056e7661f26a6c6
am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '900954e3cd135bf43db975961056e7661f26a6c6':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]