OSDN Git Service

am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:23:47 +0000 (21:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:23:47 +0000 (21:23 +0000)
commit69ab594625e274ed4ca6d4a1dc7f8fb19d44f020
treeb2c0dd8cbc10eef7075cd174a78e612def3257a0
parentcdc40eb0e02e5b7abc05a438f7fd51045ec91862
parentfcfb8801b27fd40ff27c380b8bad9b9a210effca
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 'fcfb8801b27fd40ff27c380b8bad9b9a210effca':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java