drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_frameworks_base/docs/html/training
History
Trevor Johns 59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev 
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
..
accessibility
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
animation
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
app-indexing
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
app-links
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
appbar
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
articles
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
2016-04-20 18:35:57 +00:00
auto
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
backup
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
backward-compatible-ui
…
basics
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
beam-files
…
camera
Fix @code escapes
2015-12-02 14:24:11 +00:00
cloudsave
…
connect-devices-wirelessly
…
contacts-provider
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
custom-views
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
design-navigation
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
displaying-bitmaps
Fix @code escapes
2015-12-02 14:24:11 +00:00
efficient-downloads
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
enterprise
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
game-controllers
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
gestures
Fix @code escapes
2015-12-02 14:24:11 +00:00
graphics/opengl
…
id-auth
Revert "Permissions: Get rid of GET_ACCOUNTS"
2016-03-15 17:08:27 +00:00
implementing-navigation
Fix @code escapes
2015-12-02 14:24:11 +00:00
improving-layouts
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
in-app-billing
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
keyboard-input
Fix @code escapes
2015-12-02 14:24:11 +00:00
load-data-background
…
location
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
managing-audio
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
maps
…
material
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
monitoring-device-state
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
multiple-apks
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
multiple-threads
…
multiscreen
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
notify-user
…
performance/battery/network
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
permissions
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
printing
…
run-background-service
…
safetynet
…
scheduling
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
search
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
secure-file-sharing
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
sharing
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
sign-in
docs: changed references to Google+ sign-in to Google sign-in
2015-08-21 16:44:26 -07:00
snackbar
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
swipe
…
sync-adapters
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
system-ui
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
testing
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
transitions
…
tv
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
volley
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
wearables
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
_book.yaml
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
advanced.jd
…
best-background.jd
…
best-performance.jd
…
best-permissions-ids.jd
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
best-security.jd
…
best-ui.jd
…
best-user-input.jd
…
best-ux.jd
…
building-connectivity.jd
…
building-content-sharing.jd
…
building-graphics.jd
…
building-location.jd
…
building-multimedia.jd
…
building-userinfo.jd
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
2015-09-08 21:36:54 +00:00
building-wearables.jd
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
distribute.jd
…
index.jd
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00
testing.jd
…
training_toc.cs
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-19 02:03:59 -07:00