Rich Slogar
d8417f1216
am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
...
* commit '906c4f2719f73263a2c004e110172f41f5fbd67a':
docs: studio 1.2 download link fix
2015-05-02 01:22:07 +00:00
Rich Slogar
0820394f7e
resolved conflicts for merge of edf44562 to mnc-dev
...
Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
2015-04-30 14:20:12 -07:00
Rich Slogar
906c4f2719
am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
...
* commit 'f7ef3edba44209e858c3f11648f3450e6d6f364d':
docs: studio 1.2 download link fix
2015-04-30 18:31:50 +00:00
Rich Slogar
f7ef3edba4
am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
...
* commit '3e70c6b49ff993aef9fd554ade3444e3d3afa032':
docs: studio 1.2 download link fix
2015-04-30 17:59:46 +00:00
Rich Slogar
3e70c6b49f
Merge "docs: studio 1.2 download link fix" into lmp-docs
2015-04-30 17:46:18 +00:00
Rich Slogar
c395bd2417
docs: studio 1.2 download link fix
...
Change-Id: Ib0234749f64427fbada795a49d2b52d5a67dbd3b
2015-04-30 10:25:56 -07:00
Rich Slogar
c3563bf7e0
am 6891f035: am 572ecb6e: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
...
* commit '6891f0359ba56c8132bb0b69595e40d7eab46a14':
docs: studio 1.2 downloads
2015-04-30 03:48:38 +00:00
Rich Slogar
88410eeb68
am cd63231f: am 47bd51e6: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
...
* commit 'cd63231f9015c8da0e1f57809f171e25d7cdd75a':
docs: plugin 1.2.0 revision updates
2015-04-30 03:48:31 +00:00
Rich Slogar
2894c5d4de
am 58b0fc56: am d8293d83: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
...
* commit '58b0fc56ef447cb78665e9324245a0af08977b14':
docs: studio 1.2 revision updates
2015-04-30 03:48:26 +00:00
Rich Slogar
edf44562b5
am b4430aa3: am 2a3aa2d3: docs: studio 1.2 updates
...
* commit 'b4430aa33fa0a0a7631850d2da7112319a9ca4c7':
docs: studio 1.2 updates
2015-04-30 03:28:43 +00:00
Rich Slogar
6891f0359b
am 572ecb6e: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
...
* commit '572ecb6e5e5a5ffbf2e10ef4702e9d75f097c5fe':
docs: studio 1.2 downloads
2015-04-30 03:28:39 +00:00
Rich Slogar
cd63231f90
am 47bd51e6: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
...
* commit '47bd51e63c3b3c59c354af86f400fd00a4afecae':
docs: plugin 1.2.0 revision updates
2015-04-30 03:28:30 +00:00
Rich Slogar
58b0fc56ef
am d8293d83: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
...
* commit 'd8293d837e50a8aaf8b365ee08f96e9d5ce26625':
docs: studio 1.2 revision updates
2015-04-30 03:28:26 +00:00
Andrew Solovay
4fbdbbe8f1
am c15736b9: am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
...
* commit 'c15736b95d61033f03b1446371315bfa46252aaf':
docs: Minor formatting cleanup.
2015-04-30 03:14:13 +00:00
Rich Slogar
b4430aa33f
am 2a3aa2d3: docs: studio 1.2 updates
...
* commit '2a3aa2d343820be9e05101a25b955d525e9bfa54':
docs: studio 1.2 updates
2015-04-30 03:03:15 +00:00
Andrew Solovay
c15736b95d
am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
...
* commit 'c2e2c7d5f5b8bf699d7177a4dc7694719323fd87':
docs: Minor formatting cleanup.
2015-04-30 02:58:08 +00:00
Rich Slogar
572ecb6e5e
am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
...
* commit '999b08b74c29937b49c4106a784117eed6168045':
docs: studio 1.2 downloads
2015-04-30 02:57:52 +00:00
Rich Slogar
47bd51e63c
am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
...
* commit '07aca646e43ea27329c079d8ff6549127e4fcc25':
docs: plugin 1.2.0 revision updates
2015-04-30 02:57:45 +00:00
Rich Slogar
d8293d837e
am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
...
* commit '5b7546a67b5fef2adab70d95da4879381b9b0e92':
docs: studio 1.2 revision updates
2015-04-30 02:57:38 +00:00
Rich Slogar
2a3aa2d343
docs: studio 1.2 updates
...
Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605
2015-04-29 19:47:25 -07:00
Rich Slogar
999b08b74c
Merge "docs: studio 1.2 downloads" into lmp-docs
2015-04-30 02:40:26 +00:00
Rich Slogar
07aca646e4
Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
2015-04-30 02:39:58 +00:00
Rich Slogar
5b7546a67b
Merge "docs: studio 1.2 revision updates" into lmp-docs
2015-04-30 02:39:27 +00:00
Andrew Solovay
c2e2c7d5f5
Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
2015-04-30 02:27:01 +00:00
Rich Slogar
6170c00f05
docs: studio 1.2 revision updates
...
Change-Id: I3bf392596d418b3bba63bbcc09663f2d3f4d6e2a
2015-04-29 19:03:59 -07:00
Rich Slogar
e4dc509393
docs: studio 1.2 downloads
...
Change-Id: I43c1d1bad9c110e0e87383ce6ff95ee5706e777e
2015-04-29 18:12:49 -07:00
Rich Slogar
e5eceefff9
docs: plugin 1.2.0 revision updates
...
Change-Id: Ic58da005e16c4a51dacff741ac3e5a7856ac3edb
2015-04-29 15:58:27 -07:00
Andrew Solovay
5fb97fe9ba
docs: Minor formatting cleanup.
...
Code sample had an overlong line, which caused a horizontal scroll-
bar in the generated doc.
Change-Id: I55b0318049be9e4ff473bdc739bb8265ca2da248
2015-04-29 14:37:22 -07:00
David Friedman
16bf47e8d6
am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '3d983deace20df9437bc9efebc67550f3904eee3':
Localized Android landing pages Bug: 19124242
2015-04-29 03:51:39 +00:00
David Friedman
3d983deace
am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '21a9fa471bcc57196a19e40ca29dbaa97233244c':
Localized Android landing pages Bug: 19124242
2015-04-29 03:25:15 +00:00
David Friedman
21a9fa471b
am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug: 19124242
2015-04-29 03:01:57 +00:00
David Friedman
75f071df44
Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
2015-04-29 02:49:24 +00:00
Alex Klyubin
0838084a3c
Merge "Align AndroidKeyStore API with user auth API." into mnc-dev
2015-04-29 01:25:32 +00:00
Alex Klyubin
1eda77ae21
Align AndroidKeyStore API with user auth API.
...
This simplifies the AndroidKeyStore API around user authentication: no
more explicit control over which user authenticators are bound to
which keys.
User-authenticated keys with timeout are unlocked by whatever unlocks
the secure lock screen (currently, password/PIN/pattern or
fingerprint). User-authenticated keys that need authentication for
every use are unlocked by fingerprint only.
Bug: 20526234
Bug: 20642549
Change-Id: I1e5e6c988f32657d820797ad5696797477a9ebe9
2015-04-28 17:39:30 -07:00
Luan Nguyen
50ea942255
am 4e7500e1: am c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
...
* commit '4e7500e10cf10eb697bb3e916bf705b9db470c8f':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
2015-04-28 21:09:22 +00:00
Luan Nguyen
4e7500e10c
am c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
...
* commit 'c1609dc0b25c3143ae8d74bc44fb36873b7d289c':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
2015-04-28 20:39:14 +00:00
Luan Nguyen
c1609dc0b2
docs: Update information on delivering message to clarify that
...
MessageAPI is not reliable.
bug: 20088602
Change-Id: I2244598e5a155bc6e477d367287b8683ebdf019f
2015-04-28 11:36:42 -07:00
Joe Fernandez
e658285baf
am 03cbc278: am 0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
...
* commit '03cbc27845d6622c8eb7c033ec18dc535ab5d7e4':
docs: Modify Branding guidelines for Android form factors
2015-04-28 17:02:34 +00:00
Joe Fernandez
03cbc27845
am 0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
...
* commit '0312f37785768d7931e81afe92dbeda11f132d50':
docs: Modify Branding guidelines for Android form factors
2015-04-28 16:46:36 +00:00
Joe Fernandez
0312f37785
Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
2015-04-28 16:21:56 +00:00
Joe Fernandez
f488985dce
am ff31bb4b: am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
...
* commit 'ff31bb4bb7d46766552526f6580a76445a549339':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
2015-04-28 00:36:29 +00:00
Joe Fernandez
d602d23fd8
am 80d19484: am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
...
* commit '80d19484c109c4beb0e36b7ce0418ebe526ad300':
docs: Update Wearable API setup to mention addApiIfAvailable().
2015-04-28 00:36:23 +00:00
Joe Fernandez
ff31bb4bb7
am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
...
* commit '68ef92871f52bad28d5aea168c0d3a4b863d282d':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
2015-04-28 00:24:26 +00:00
Joe Fernandez
80d19484c1
am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
...
* commit '185002bcc9b551828557ab6946fef7fef1c17d74':
docs: Update Wearable API setup to mention addApiIfAvailable().
2015-04-28 00:24:19 +00:00
Joe Fernandez
68ef92871f
Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
2015-04-28 00:03:50 +00:00
Joe Fernandez
185002bcc9
Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
2015-04-28 00:00:09 +00:00
Joe Fernandez
cd32a99dde
docs: Modify Branding guidelines for Android form factors
...
b/19835619
Change-Id: Ic942aa3c262de5922e084b1e007652b151ca2a76
2015-04-27 15:16:41 -07:00
Luan Nguyen
47b7e060d9
docs: Update Wearable API setup to mention addApiIfAvailable().
...
bug: 20486912
Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee
2015-04-27 13:30:40 -07:00
Luan Nguyen
bdeeb5e3bc
docs: Add note about overriding onConnectedNodes() when listening
...
for capability node changes.
bug: 20523695
Change-Id: I7a1b057625f6f39d9ee3a03948f0b187484b1842
2015-04-27 11:27:04 -07:00
Dirk Dougherty
d8269c0cc8
am 2a8ef256: am 495227aa: Doc change: update dff image.
...
* commit '2a8ef2563042e2db93960ace529a2986c289d3dc':
Doc change: update dff image.
2015-04-25 22:05:38 +00:00
