resolved conflices for merge of 93ccd1a2 to master

  to: /guide/components/aidl.html

- from: /guide/publishing/publishing.html

  to: /distribute/googleplay/publish/preparing.html

  to: /distribute/tools/launch-checklist.html

- from: /guide/publishing/...

  to: /tools/publishing/...

page.title=Dashboards

page.metaDescription=page.metaDescription=Charts that give you an overview of device characteristics and platform versions that are active in the Android ecosystem.

page.tags="android, dashboard, platforms, versions"

meta.tags="ecosystem, versions, whatsnew"

@jd:body

<style>

<div class="sidebox">

<h2>Google Play Install Stats</h2>

<p>The Google Play Developer Console also provides <a

href="{@docRoot}distribute/googleplay/about/distribution.html#stats">detailed statistics</a>

href="{@docRoot}distribute/googleplay/developer-console.html#app-stats">detailed statistics</a>

about your users' devices. Those stats may help you prioritize the device profiles for which

you optimize your app.</p>

</div>

page.title=Design

page.viewport_width=970

section.landing=true

meta.tags="beautifulapps, design, ux, patterns, holo, appquality, landing"

header.hide=1

footer.hide=1

@jd:body

page.title=Multi-pane Layouts

page.tags="tablet","navigation","layout","fragment"

page.metaDescription=Android devices come in many different screen sizes and types. Multi-pane layouts help you provide a balanced and aesthetically pleasing layout across the range of Android devices.

page.metaDescription=Design guide with examples of how to flatten navigation and provide improved layout across the range of Android devices.

@jd:body

page.title=Navigation with Back and Up

page.tags=navigation,activity,task,up navigation,back navigation

page.tags="navigation","activity","task","up navigation","back navigation"

page.image=/design/media/navigation_between_siblings_gmail.png

@jd:body

<a class="notice-developers" href="{@docRoot}training/implementing-navigation/index.html">