Deepanshu Gupta 905e113f97 am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev ...

* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

2014-06-04 20:48:19 +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 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

2014-06-04 20:48:19 +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