Deepanshu Gupta e3950823b6 am 465a9926: am 21dc46b1: am 569dc64c: 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 '465a99260ea1d868e9aa43d08e63cb85892f188e':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

2014-05-13 21:43:52 +00:00

..

.settings

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -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 465a9926: am 21dc46b1: am 569dc64c: 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

2014-05-13 21:43:52 +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

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

Android.mk

Fix layout rendering for RTL locales [DO NOT MERGE]

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