George Mount
4ba1820b34
Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
...
This reverts commit 01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d, reversing
changes made to b83b5fa641847ee1d533253ba5e1a3e13913b9d9.
This change is valid for mnc-dev and other mnc branches.
2015-07-27 12:39:28 -07:00
George Mount
01fe3f86b1
am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
...
* commit '1c964bece6ce1bbbf9f641d95df3bf2de01f6ab7':
Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
2015-07-27 18:24:40 +00:00
George Mount
1c964bece6
Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
...
This reverts commit c571a9a1d026cbf262cf36a5348f99d1ca0ec835, reversing
changes made to a29cfefe2c157a28b256771b1dce4653d405dcf1.
This should fix the build break for LMP downstream branches.
Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17
2015-07-27 10:39:54 -07:00
George Mount
9c450936aa
am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
...
* commit 'c571a9a1d026cbf262cf36a5348f99d1ca0ec835':
Update data binding for RC1.
2015-07-27 14:49:16 +00:00
George Mount
c571a9a1d0
am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
...
* commit '6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065':
Update data binding for RC1.
2015-07-27 14:35:50 +00:00
George Mount
6397ae6a0a
Merge "Update data binding for RC1." into mnc-preview-docs
2015-07-27 14:24:34 +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
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
George Mount
8b33fd9a00
Update data binding for RC1.
...
Bug 21660467
Bug 22561175
Change-Id: I9f7440000082c48094f3c243e03269b6e3c7756a
2015-07-20 16:50:18 -07: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
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
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
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
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
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
David Friedman
ccb8a9af1c
am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
...
* commit 'b510225e44742d488beb7dcf0248c9ba9b4010c9':
docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-11 02:53:54 +00:00
David Friedman
b510225e44
Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
2015-07-11 02:41:13 +00:00
Eric Gilmore
f13e914d23
am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
...
* commit '8cce398480f4450fa0a1b1e9422112731eddc161':
Adding a link to what is currently our most popular "100 Days" video.
2015-07-10 23:31:32 +00:00
Eric Gilmore
8cce398480
Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
2015-07-10 23:19:43 +00:00
David Friedman
c1541571ff
am 1c231da0: am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
...
* commit '1c231da06c9e9f82c52d36211a865703a5d0cd62':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
2015-07-10 20:11:46 +00:00
