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

Change-Id: Ic77367cb9c90027e036a461697295fd604b50014

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

..

actionbar

am 1ac6519b: am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs

2014-04-04 17:46:28 +00:00

activity-lifecycle

fix markup errors in action bar styling,

2013-08-22 18:44:44 -07:00

data-storage

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

firstapp

docs: Added notes to use the last SDK version to the Build your First App class.

2014-04-01 10:46:16 -07:00

fragments

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

intents

resolved conflices for merge of 93ccd1a2 to master

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

network-ops

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

supporting-devices

resolved conflices for merge of 93ccd1a2 to master

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