OSDN Git Service

am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 20:54:12 +0000 (20:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 20:54:12 +0000 (20:54 +0000)
commit964023c5dcd0334cdcf624eff26d791d9c9617a8
tree58a332dfd82f3aea3936e8cad203b9f2f7a8ceb0
parentc1847b54a391857f0871a15e97fbaae0fef0ff33
parent8bf73eae6c98532c8a597b885b948b9878555441
am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '8bf73eae6c98532c8a597b885b948b9878555441':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java