Commit Graph

11054 Commits

Author SHA1 Message Date
Joe Fernandez
aeb4764635 am 64ae045e: am b189e87b: am e135f5b7: am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit '64ae045ed974406b4d1c7bb5b251f2c354966dea':
  Doc change: Update preview pages for dp3.
2015-08-14 03:28:59 +00:00
Joe Fernandez
64ae045ed9 am b189e87b: am e135f5b7: am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit 'b189e87b5cafa3f9a81ac85fa556b198358dba0d':
  Doc change: Update preview pages for dp3.
2015-08-14 03:18:54 +00:00
Joe Fernandez
37dd5240ad Merge "Doc change: Update preview pages for dp3." into mnc-dev 2015-08-14 01:10:56 +00:00
Joe Fernandez
910ddce7cd am 723e189e: am 5169535f: am a1bed325: am e41c18d6: am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
* commit '723e189e4853f5a6af8db5e5693ee99e4805d2db':
  docs: Update uses-sdk-element page with API 23 (M) listing
2015-08-13 21:07:14 +00:00
Joe Fernandez
723e189e48 am 5169535f: am a1bed325: am e41c18d6: am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
* commit '5169535ff70284e9c92043023b6c4f4e918b2aa1':
  docs: Update uses-sdk-element page with API 23 (M) listing
2015-08-13 19:27:41 +00:00
Joe Fernandez
901f807143 docs: Update uses-sdk-element page with API 23 (M) listing
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
2015-08-13 11:45:23 -07:00
Dirk Dougherty
2906bd5cb3 Doc change: Update preview pages for dp3.
Change-Id: If4a3beab28cc2114cf01a2d6202dc072768960fc
2015-08-13 10:54:50 -07:00
George Mount
5e59f002a8 am cd056631: am 24d83c14: am 7739273b: am fa93fbba: am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
* commit 'cd05663186dc232511b98691e454d2f3ef61d0e6':
  Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
2015-07-27 21:03:10 +00:00
George Mount
cd05663186 am 24d83c14: am 7739273b: am fa93fbba: am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
* commit '24d83c1434bd315411c46fb80603ae931000cc82':
  Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
2015-07-27 20:49:02 +00:00
George Mount
38b74bc9ce am d0162e73: am efbfd2ad: am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
* commit 'd0162e730950f92933265bcbc90f5c38105b66ab':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
2015-07-27 19:52:16 +00:00
George Mount
4ba1820b34 Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
This reverts commit 01fe3f86b1, reversing
changes made to b83b5fa641.

This change is valid for mnc-dev and other mnc branches.
2015-07-27 12:39:28 -07:00
George Mount
d0162e7309 am efbfd2ad: am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
* commit 'efbfd2ad8bf5f251b938c0f9d91d38a66c333939':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
2015-07-27 19:31:59 +00: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 c571a9a1d0, reversing
changes made to a29cfefe2c.

This should fix the build break for LMP downstream branches.

Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17
2015-07-27 10:39:54 -07:00
George Mount
853a5c7b64 am 0ec20e2c: am ec25318a: am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '0ec20e2cabbb369119c08ac4b7f51018cc69e2ed':
  Update data binding for RC1.
2015-07-27 15:54:25 +00:00
George Mount
0ec20e2cab am ec25318a: am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit 'ec25318a128f890ae6149c9d59a59779c81e5b2c':
  Update data binding for RC1.
2015-07-27 15:42:07 +00: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
f151854176 am 0e23c2b7: am 6331c6ca: am a62f3ee8: am 67b4db0c: am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '0e23c2b7da91549546de2c8d14f5f49cd0312781':
  v22.2.1 support api diff
2015-07-25 16:47:32 +00:00
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
7ed74ce040 am aec5a14e: am 6d8cf7a7: am bb320299: am 155d41a0: am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
* commit 'aec5a14e6cc0464b157a5b098d056ed17c39a579':
  Document what algorithms Android Keystore supports.
2015-07-24 05:14:28 +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
8e3b55aa68 am 386ad3c9: 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 '386ad3c9ca122018707107dad3d70dcfd6b56d35':
  Doc change: add note about not exiting on onPause().
2015-07-23 22:07:49 +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
David Friedman
e04daec1bf Merge "docs/html/ndk: update sample link to point to github" 2015-07-21 18:35:12 +00:00
Chris Banes
3931386f95 v22.2.1 support api diff
Change-Id: Ic6de46e91b188ef1348d0f0dbbc153138f03ba29
2015-07-21 09:54:51 +01:00
Johan Euphrosine
f9b5419e79 docs/html/ndk: update sample link to point to github 2015-07-21 15:12:41 +09: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
3a6b452ef1 am d84f4f7a: 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 'd84f4f7aef8d57847de50e8133472555349705b6':
  Doc change: Update AFW behavior changes for Preview 2.
2015-07-17 04:37:35 +00: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
Chris Craik
71106423ea Merge "That is not yellow" 2015-07-16 22:52:49 +00:00
Chris Craik
5d8b2df6e1 That is not yellow
Change-Id: I1db4e8c96b128fb84a8ba0b28df34be19608c48a
2015-07-16 13:44:26 -07:00
Robert Schaub
d7fa9f5d5a am a4928832: 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 'a49288327401c0a8b35dbe46157b0ac28d6d72c3':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 20:11:41 +00: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