OSDN Git Service

am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:28:18 +0000 (21:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:28:18 +0000 (21:28 +0000)
commit569dc64cd6b0bb7bdfec97967b192d2a706e3f81
tree82d61b4a2688ffeea6c81c6622e7600930af75eb
parent9a3e6ec73c2188eb5bf1406b974dfc34e55722ad
parent69ab594625e274ed4ca6d4a1dc7f8fb19d44f020
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 '69ab594625e274ed4ca6d4a1dc7f8fb19d44f020':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]