Chris Banes
0e23c2b7da
am 6331c6ca: am a62f3ee8: am 67b4db0c: am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
...
* commit '6331c6cacc7464d5bcbaa345499064e48e8a64cf':
v22.2.1 support api diff
2015-07-25 16:36:10 +00:00
Chris Banes
c174de0ab3
am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
...
* commit '5442932a4befd66394fb155ae95a2eaadd2001a9':
v22.2.1 support api diff
2015-07-24 22:41:35 +00:00
Chris Banes
5442932a4b
am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
...
* commit '7b099152b6bd5844c30464a7c08dde2e22124491':
v22.2.1 support api diff
2015-07-24 20:19:09 +00:00
Alex Klyubin
aec5a14e6c
am 6d8cf7a7: am bb320299: am 155d41a0: am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
...
* commit '6d8cf7a7a063cfa0c37ea85946c6f1fe105435c5':
Document what algorithms Android Keystore supports.
2015-07-24 04:04:56 +00:00
Fred Chung
386ad3c9ca
am fd7db209: am a201140b: am 9478ddfa: am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
...
* commit 'fd7db2095c9a0247e0d859e1437b6181af45eec7':
Doc change: add note about not exiting on onPause().
2015-07-23 21:49:56 +00:00
Alex Klyubin
304b01c249
Merge "Document what algorithms Android Keystore supports." into mnc-dev
2015-07-23 16:23:59 +00:00
Alex Klyubin
6f023640a3
Document what algorithms Android Keystore supports.
...
This updates the Android platform SDK documentation to list which
algorithms are supported by Android Keystore on which Android
platforms.
The list is similar in design to the one in SSLSocket and SSLEngine.
Bug: 22661043
Change-Id: I08fcf65ca58ead644100b673dceb93c67f34f507
2015-07-22 12:04:39 -07:00
Fred Chung
db71828cb7
am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
...
* commit '2c3b9fb86b9fb26b01fe5af2067f6513bf06acf3':
Doc change: add note about not exiting on onPause().
2015-07-22 17:46:21 +00:00
Chris Banes
7b099152b6
Merge "v22.2.1 support api diff" into mnc-preview-docs
2015-07-22 08:06:05 +00:00
Fred Chung
2c3b9fb86b
am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
...
* commit '3ccbf3bad50c47409de9570c422756f9e3fa518a':
Doc change: add note about not exiting on onPause().
2015-07-21 22:16:55 +00:00
Fred Chung
3ccbf3bad5
Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
2015-07-21 22:06:15 +00:00
Chris Banes
3931386f95
v22.2.1 support api diff
...
Change-Id: Ic6de46e91b188ef1348d0f0dbbc153138f03ba29
2015-07-21 09:54:51 +01:00
Dirk Dougherty
0d0c4b6804
Doc change: add note about not exiting on onPause().
...
Change-Id: Iaa5199133b34431b84622bc13579d41131a14390
2015-07-17 16:48:12 -07:00
Dirk Dougherty
d84f4f7aef
am 26837f1a: am a735d984: am 092445e5: am 9349093c: am 86917496: am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
...
* commit '26837f1af1e9ffca64a5a65156f9c46f1ea47ef1':
Doc change: Update AFW behavior changes for Preview 2.
2015-07-17 04:22:57 +00:00
Dirk Dougherty
9349093cd9
am 86917496: am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
...
* commit '869174967f0efd011b503af5cc3445608667d81d':
Doc change: Update AFW behavior changes for Preview 2.
2015-07-17 03:27:42 +00:00
Dirk Dougherty
869174967f
am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
...
* commit 'a758133566e030275988fb3bf253a432e6803d8f':
Doc change: Update AFW behavior changes for Preview 2.
2015-07-17 03:14:44 +00:00
Dirk Dougherty
a758133566
Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
2015-07-17 02:58:40 +00:00
Dirk Dougherty
e74643d3d1
Doc change: Update AFW behavior changes for Preview 2.
...
Change-Id: I59216bb70448656a7eed38ba8c743b284eaf6300
2015-07-16 15:57:34 -07:00
Robert Schaub
a492883274
am d7335400: am 57cea81f: am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
...
* commit 'd73354007291ad548dbeca0a756e54074aee7828':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 19:56:16 +00:00
Robert Schaub
081649c2b5
am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
...
* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 18:57:39 +00:00
Robert Schaub
f4db2de881
am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
...
* commit '1b29a95789c29174d5e4d526f6449c2c354ef3b3':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 18:40:37 +00:00
Robert Schaub
1b29a95789
Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
2015-07-16 18:21:22 +00:00
Robert Schaub
af0457f411
am 0565d83a: am 33cad477: am 05c874d0: am a73face3: am 8c5f34de: am b53568f2: docs: Added word "video" to tv app quality guidelines.
...
* commit '0565d83a3551285654d0418ab137307e32b87803':
docs: Added word "video" to tv app quality guidelines.
2015-07-16 01:49:22 +00:00
Robert Schaub
a73face3f4
am 8c5f34de: am b53568f2: docs: Added word "video" to tv app quality guidelines.
...
* commit '8c5f34de91fc1fb148bbee9f868d32ff6103a70a':
docs: Added word "video" to tv app quality guidelines.
2015-07-16 00:54:04 +00:00
Robert Schaub
8c5f34de91
am b53568f2: docs: Added word "video" to tv app quality guidelines.
...
* commit 'b53568f27c384523dae58af9f4ad355a6c72d6d7':
docs: Added word "video" to tv app quality guidelines.
2015-07-16 00:43:26 +00:00
Robert Schaub
31186713e9
docs: Added "location" before "gps" in list under "Declaring hardware ..."
...
Bug: 20106795
Change-Id: I13e7be98722ac56a9175b1456fc018ff665b77ab
2015-07-15 17:13:11 -07:00
Robert Schaub
b53568f27c
docs: Added word "video" to tv app quality guidelines.
...
Bug: 21737663
Change-Id: Ia4edcae6f2089f15156a857da295e89265f56d5d
2015-07-15 16:47:48 -07:00
Andrew Solovay
dd019012a3
am edf1f874: am f7810b44: am 90adb81b: am 353886b2: am e67416ec: am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
...
* commit 'edf1f874be46b74dbef225d622f6d244bddd02f3':
docs: Clarified how to find out when a switch is toggled
2015-07-14 21:04:43 +00:00
Andrew Solovay
353886b2dd
am e67416ec: am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
...
* commit 'e67416eccc6092e2fce3619b2244deda36fabd26':
docs: Clarified how to find out when a switch is toggled
2015-07-14 20:22:59 +00:00
Andrew Solovay
e67416eccc
am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
...
* commit '4859a6125bcf967cf97339b19f30d9788b971e02':
docs: Clarified how to find out when a switch is toggled
2015-07-14 20:08:00 +00:00
Andrew Solovay
4859a6125b
Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
2015-07-14 19:59:07 +00:00
Robert Schaub
7cfa3db2cf
am 62a3a5fb: am e681e9ff: am e8bbe9a0: am 9de5dcac: am 70d39c28: am 2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
...
* commit '62a3a5fb44caeab1760d95ee43f088e1c6135b3c':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
2015-07-14 17:17:05 +00:00
Robert Schaub
2459333aed
am b63aa8a9: am 37621e24: am 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
...
* commit 'b63aa8a99754351aa7b35e9cf5d6fb8a4b167731':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
2015-07-14 17:16:26 +00:00
Robert Schaub
4fd4882b07
am c0b73edb: am d0ca9dea: am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
...
* commit 'c0b73edb7bdb808633b7986e7a73e9823454bee1':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
2015-07-14 17:16:20 +00:00
David Friedman
2d85da887e
am c2a0d1ed: am cb533c53: am 63bd0587: am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
...
* commit 'c2a0d1edfb59a9c1dfc0f92aaa7160345ccce2d7':
docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-14 17:16:14 +00:00
Eric Gilmore
324e87429e
am 43838d3f: am 16df17cf: am a29b8fbb: am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
...
* commit '43838d3f0b4473b891123be42fcdecb995543720':
Adding a link to what is currently our most popular "100 Days" video.
2015-07-14 17:16:08 +00:00
Robert Schaub
9de5dcac95
am 70d39c28: am 2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
...
* commit '70d39c2836f3c05a93035439df0082b5c471c010':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
2015-07-14 00:44:21 +00:00
Robert Schaub
70d39c2836
am 2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
...
* commit '2b856100f67da1505eac30e2d989b84a2d68f20a':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
2015-07-14 00:26:21 +00:00
Robert Schaub
fd186d20c5
am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
...
* commit '28006a3b31d1cd3765568ceed211f8bc8de9c50c':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
2015-07-13 23:58:09 +00:00
Robert Schaub
0b403ebd6a
am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
...
* commit '1962b730067d5b9ad9666ee3a7d1e3f90004c7d7':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
2015-07-13 23:58:03 +00:00
David Friedman
91a44578e4
am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
...
* commit '5c3bf5847c98b23a525288ed04f77b2a68ec6870':
docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-13 23:57:52 +00:00
Eric Gilmore
908c50a172
am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
...
* commit 'f13e914d23a47809d978183a8e6b6ab3a5d51098':
Adding a link to what is currently our most popular "100 Days" video.
2015-07-13 23:57:43 +00:00
Robert Schaub
2b856100f6
Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
2015-07-13 23:41:29 +00:00
Robert Schaub
28006a3b31
am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
...
* commit '7182f075fad7865eb8c1ce58d90327addabc7c4b':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
2015-07-13 23:23:48 +00:00
Robert Schaub
1962b73006
am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
...
* commit '3430bec7e0b2f7a0552a66a523e478cd2ecd9043':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
2015-07-13 23:23:43 +00:00
Robert Schaub
2c5d93ae5f
docs: Removed references to lockscreen widgets, added note to Android 5.0
...
changes page
Removed one line from source code sample as well.
Bug: 20826638
Change-Id: I3c27353db0f0092c21962f9beec1bf1da52ee9d5
2015-07-13 16:19:08 -07:00
Robert Schaub
7182f075fa
Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
2015-07-13 23:12:44 +00:00
Robert Schaub
3430bec7e0
Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
2015-07-13 23:06:46 +00:00
David Friedman
5c3bf5847c
am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
...
* commit 'e0f0fabbb1a416d71677fe7d9692530023cd53ec':
docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-11 03:19:07 +00:00
David Friedman
e0f0fabbb1
am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
...
* commit 'ccb8a9af1cf4c392b05ec7654d2a7213c8ef4019':
docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-11 03:06:00 +00:00