Hans Boehm 47a6b76511 resolve merge conflicts of c73e080 to nyc-dev-plus-aosp ...

Change-Id: I9629e28bff28a67a6584c5e67a01ef25428a2194

2016-08-04 20:04:08 -07:00

..

assistant.jd

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

direct-boot.jd

docs: Migrating Direct Boot preview docs into DAC

2016-07-27 12:52:35 -07:00

keystore.jd

Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev

2016-04-20 18:35:57 +00:00

memory.jd

Fix @code escapes

2016-01-15 16:14:57 +00:00

perf-anr.jd

Fix code tags that contain html encoded characters, and fix at links.

2016-07-22 18:29:36 -07:00

perf-jni.jd

docs: remove trailing white space from jd files

2016-07-18 10:42:11 -07:00

perf-tips.jd

docs: remove out-of-date performance info

2016-06-23 10:59:33 -07:00

scoped-directory-access.jd

docs: Migrating Scoped Dir Access preview docs into DAC

2016-07-27 13:04:52 -07:00

security-config.jd

docs: Migrated "Network Security Configuration" page on DAC (N OTA).

2016-07-26 11:46:16 -07:00

security-gms-provider.jd

…

security-key-attestation.jd

docs: Migrated "key attestation" page to a new location (for N OTA).

2016-07-25 14:33:37 -07:00

security-ssl.jd

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

security-tips.jd

Merge "docs: Updated link, wording associated with data-sharing IPC." into mnc-mr-docs am: c501688 am: 7bce49c

2016-04-27 03:17:35 +00:00

smp.jd

Update SMP documentation.

2016-08-04 14:21:48 -07:00

user-data-ids.jd

docs: Narnia 2 advertising language update

2016-06-20 09:08:46 -07:00

user-data-overview.jd

docs: remove trailing white space from jd files

2016-07-18 10:42:11 -07:00

user-data-permissions.jd

docs: remove trailing white space from jd files

2016-07-18 10:42:11 -07:00

wear-location-detection.jd

…

wear-permissions.jd

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00