Dirk Dougherty 9a6672beb1 resolved conflices for merge of 93ccd1a2 to master ...

Change-Id: Ic77367cb9c90027e036a461697295fd604b50014

2014-05-14 14:50:13 -07:00

..

accessibility.jd

…

actionbar.jd

…

app-structure.jd

…

buttons.jd

…

compatibility.jd

…

confirming-acknowledging.jd

…

fullscreen.jd

…

gestures.jd

…

help.jd

…

index.jd

…

multi-pane-layouts.jd

resolved conflices for merge of 93ccd1a2 to master

2014-05-14 14:50:13 -07:00

navigation-drawer.jd

…

navigation.jd

…

new.jd

…

notifications.jd

…

pure-android.jd

…

selection.jd

…

settings.jd

…

swipe-views.jd

…

widgets.jd

…