Deepanshu Gupta ef24a5091b 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]

2014-05-13 21:07:40 +00:00

..

.settings

Make Layoutlib compile on Java 6.

2012-02-02 17:45:45 -08:00

resources/bars

am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

2014-05-13 17:11:20 +00:00

src

am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

2014-05-13 21:07:40 +00:00

tests

am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

2014-05-13 02:20:13 +00:00

.classpath

Fix layout rendering for RTL locales [DO NOT MERGE]

2014-05-02 11:45:37 -07:00

.project

…

Android.mk

Fix layout rendering for RTL locales [DO NOT MERGE]

2014-05-02 11:45:37 -07:00