Narayan Kamath 298a5f8ea7 resolved conflicts for merge of 65cb7696 to master ...

Change-Id: Ib15b97dc2f9337861c8e9589d69e6af5328fe219

2014-06-16 10:41:14 +01:00

..

accessibility

…

activity-testing

…

animation

…

app-indexing

…

articles

am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

2014-06-11 19:33:51 +00:00

backward-compatible-ui

…

basics

am c799a830: am 88d1c560: am ea5fa98c: am c659e746: Merge "Doc update: new Volley class" into klp-docs

2014-06-04 12:40:48 +00:00

beam-files

…

camera

…

cloudsave

…

cloudsync

am b06efc72: am aa1ecf5c: html cleanup. delete quickviews

2014-06-14 01:17:43 +00:00

connect-devices-wirelessly

…

contacts-provider

docs: Fixed error in code sample.

2014-06-03 23:38:49 +00:00

custom-views

…

design-navigation

…

displaying-bitmaps

…

efficient-downloads

…

enterprise

…

game-controllers

…

gestures

…

graphics/opengl

…

id-auth

…

implementing-navigation

…

improving-layouts

…

in-app-billing

…

keyboard-input

…

load-data-background

…

location

…

managing-audio

…

monetization

…

monitoring-device-state

…

multiple-apks

…

multiple-threads

…

multiscreen

…

notepad

…

notify-user

…

printing

…

run-background-service

…

scheduling

…

search

…

secure-file-sharing

…

sharing

…

sync-adapters

…

system-ui

…

volley

Doc update: new Volley class

2014-05-29 16:38:34 -07:00

advanced.jd

…

best-background.jd

…

best-performance.jd

…

best-security.jd

…

best-ui.jd

…

best-user-input.jd

…

best-ux.jd

…

building-connectivity.jd

…

building-content-sharing.jd

…

building-graphics.jd

…

building-multimedia.jd

…

building-userinfo.jd

…

distribute.jd

…

index.jd

…

testing.jd

…

training_toc.cs

Doc update: new Volley class

2014-05-29 16:38:34 -07:00