Deepanshu Gupta 022d8a9f44 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev ...

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

2014-06-04 20:30:05 +00:00

..

.settings

…

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 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:30:05 +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