Chris Banes 4b201a5731 resolved conflicts for merge of cbc1ac33 to master ...

Change-Id: I107320a07a1646f2ddc3a288b13ae58c538d96e6

2015-02-18 11:32:48 +00:00

..

accessibility

…

activity-testing

…

animation

…

app-indexing

docs: Fixes for App Indexing training class

2014-12-04 12:49:45 -08:00

articles

am ea4c21ea: am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d

2015-01-22 00:03:31 +00:00

auto

docs: Added explicit filepath for Android Media Browser and Android Messaging simulators.

2015-01-05 15:01:27 -08:00

backward-compatible-ui

…

basics

resolved conflicts for merge of cbc1ac33 to master

2015-02-18 11:32:48 +00:00

beam-files

…

camera

…

cloudsave

…

cloudsync

…

connect-devices-wirelessly

…

contacts-provider

…

custom-views

…

design-navigation

…

displaying-bitmaps

…

efficient-downloads

am 4bb4d66c: am 02afa734: am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs

2014-09-11 03:29:33 +00:00

enterprise

docs: New "app compatibility with managed profiles" doc

2014-12-19 13:31:34 -08:00

game-controllers

docs: Fixed typos in Game Controller training code snippets.

2015-01-16 11:36:18 -08:00

gestures

…

graphics/opengl

docs: Fix various issues with incorrect code samples.

2015-02-10 09:39:44 -08:00

id-auth

…

implementing-navigation

…

improving-layouts

…

in-app-billing

Docs: Adding Android Studio instructions for adding IAB service.

2014-10-27 23:24:39 +00:00

keyboard-input

…

load-data-background

…

location

docs: Adds new geocoding sample to Location API training.

2015-01-26 11:06:55 -08:00

managing-audio

…

material

docs: remove + annotations in version references

2015-01-22 17:48:43 -08:00

monetization

…

monitoring-device-state

…

multiple-apks

…

multiple-threads

…

multiscreen

docs: site mipmap folder updates

2015-02-17 12:34:35 -08:00

notepad

…

notify-user

add helpouts widget to wave 3 pages

2014-12-10 10:21:36 -08:00

printing

…

run-background-service

…

scheduling

…

search

docs: Fix typo in search class

2014-10-21 09:19:20 -07:00

secure-file-sharing

…

sharing

…

sync-adapters

Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation

2014-11-24 18:38:00 +00:00

system-ui

…

transitions

docs: Transitions training class.

2015-01-27 11:35:20 -08:00

tv

Merge "docs: Card View for Android TV training" into lmp-docs

2015-01-30 01:30:44 +00:00

volley

Remove references to apache-http from various documents.

2014-12-12 14:55:18 +00:00

wearables

Adding videos for 5.0 changes and watch face development.

2015-02-10 10:29:36 -08: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

…

building-wearables.jd

docs: Add browseable Wearable Support Lib Javadoc

2015-01-16 11:18:10 -08:00

distribute.jd

…

index.jd

Adding Android Fundamentals video.

2015-01-09 13:22:59 -08:00

testing.jd

…

training_toc.cs

docs: Card View for Android TV training

2015-01-29 10:50:25 -08:00