drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
167,459 Commits 1 Branch 0 Tags
Commit Graph

8079 Commits

Author SHA1 Message Date
Quddus Chong
8730092af7 Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 2014-10-07 23:27:02 +00:00
Quddus Chong
6628e602fb Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 2014-10-07 23:26:49 +00:00
Ricardo Cervera
f2017fdd55 am 50c9c6a3: am b5018434: am d047c0e0: am c2b35efb: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 
* commit '50c9c6a3b049dfc11cf5479cf7e737512da3d4e3':
  docs: Training class for the Wearable UI Library
 2014-10-07 22:48:54 +00:00
Rich Slogar
f42e1042a9 am 9e6e4f75: am 1a61bc9c: am 15174523: am d4303161: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 
* commit '9e6e4f75886dc1eb68539615fd344bd95923e470':
  docs:change required ADT version to 23.0.2
 2014-10-07 22:48:49 +00:00
smain@google.com
530c679ff7 am af3f6e9a: am 456a4e2d: am cb8a81a8: am a2561db3: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
* commit 'af3f6e9a7ee4089d2a8c3230d8fc2d56d8f22f6b':
  make sdk download links use HTTPS bug: 8033954
 2014-10-07 22:48:45 +00:00
Ricardo Cervera
c2b35efb58 am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 
* commit '0e61e44ddf8c8abb774020cde90ec44d4ae43bc6':
  docs: Training class for the Wearable UI Library
 2014-10-07 22:23:31 +00:00
Rich Slogar
d4303161b1 am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 
* commit '64460a2b6e0166d4c24b195f850e67265fb485f5':
  docs:change required ADT version to 23.0.2
 2014-10-07 22:23:24 +00:00
smain@google.com
a2561db386 am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
* commit '8267ffccbe58ea348a53a0e6058bf902d6e8932a':
  make sdk download links use HTTPS bug: 8033954
 2014-10-07 22:23:04 +00:00
Rich Slogar
1b0fba6478 docs:64 bit image and skd update 
Change-Id: I53d3d8e8714cb4689ba80766b155fb1b3ea93484
 2014-10-07 11:40:27 -07:00
Ricardo Cervera
a18075e82b am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'bd964cadd4846d5d954eadb7fcd2a61e51814c65':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 18:38:24 +00:00
Ricardo Cervera
bd964cadd4 docs: Removing references to self note on Common Intents page. 
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
 2014-10-07 10:37:19 -07:00
Ricardo Cervera
6d30f57614 am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 04:49:17 +00:00
Ricardo Cervera
3f7b4d8ff3 Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 2014-10-07 04:41:13 +00:00
Ricardo Cervera
cee4ed8a1d docs: Update Common Intents page with Google Now actions 
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
 2014-10-06 19:16:06 -07:00
Andrew Solovay
3fdf51327a am 5ae2730b: am da81acdf: am ed2237ae: am 2dd86d50: Merge "Removed preview license." into lmp-dev 
* commit '5ae2730bce75c32954c718190675f6b49b6f4da5':
  Removed preview license.
 2014-10-06 19:39:36 +00:00
Andrew Solovay
2dd86d50ae Merge "Removed preview license." into lmp-dev 2014-10-06 17:51:53 +00:00
Ricardo Cervera
0e61e44ddf am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 
* commit '2a02b8813bd6bfd3d36cca6e5e3a3ff6a868d881':
  docs: Training class for the Wearable UI Library
 2014-10-04 00:01:21 +00:00
Rich Slogar
64460a2b6e am 83d5c9bf: docs:change required ADT version to 23.0.2 
* commit '83d5c9bfbd75831375009e21989de40368afc04a':
  docs:change required ADT version to 23.0.2
 2014-10-04 00:01:17 +00:00
Ricardo Cervera
3ffe146151 docs: Wear UI Lib training fixes 
Change-Id: I8d4610b68218455b8a00a34a101cee1f0d945633
 2014-10-03 16:43:25 -07:00
Ricardo Cervera
2a02b8813b Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 2014-10-03 23:25:24 +00:00
smain@google.com
8267ffccbe am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
* commit 'cef9aab68ec45340186261d39ded6261ba1c5966':
  make sdk download links use HTTPS bug: 8033954
 2014-10-03 22:13:14 +00:00
Rich Slogar
83d5c9bfbd docs:change required ADT version to 23.0.2 
Change-Id: I6312cd45df94a89f2812aa3c53e2974f6cfbb0ed
 2014-10-03 15:12:17 -07:00
smain@google.com
cef9aab68e Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 2014-10-03 22:06:44 +00:00
Ricardo Cervera
6ccc9de87f am ba435fc2: am d019b19e: am 677dd506: am 1e2e4307: am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit 'ba435fc241bbe95c1fde122d14060c9451999f60':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:33:52 +00:00
Ricardo Cervera
1e2e4307ff am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit '1242af060bec63ec3a37512ebbbdbe545bd9f0f7':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:11:52 +00:00
Ricardo Cervera
1242af060b am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit '32cfe2bbc71091a1ab282d5c7e4df7db5f6051e6':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:05:41 +00:00
Ricardo Cervera
32cfe2bbc7 am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit 'd37afa37452d5e5dab3704ecab0ab7cebb3da292':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:00:37 +00:00
Ricardo Cervera
d37afa3745 Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 2014-10-03 17:55:36 +00:00
Ricardo Cervera
43c758b4ce docs: Unbuntu troubleshooting link to CamelCase ID 
Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
 2014-10-03 09:44:25 -07:00
Andrew Solovay
4974e7f27c Removed preview license. 
Per JoeFernandez@ 's request, killed the preview license with fire
and scraped its name from the TOC.

You can verify its annihilation on my staged doc:

http://asolovay.mtv.corp.google.com:9191/preview/

So let it be written, so let it be done.

Change-Id: I94682fc50f17665756ca789b63f0c89d3ac3ea76
 2014-10-02 16:53:26 -07:00
Rich Slogar
84d5455efa am 95d87184: am e5578db7: am 9f70e82c: am 66fea477: am 721b3efc: am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updates 
* commit '95d871848df706108826b4fa49a594e445d40df2':
  docs:ADT 23.0.4 doc updates
 2014-10-02 23:38:03 +00:00
Rich Slogar
66fea4771c am 721b3efc: am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updates 
* commit '721b3efc205442e255170d0185ae374b5a5ddc50':
  docs:ADT 23.0.4 doc updates
 2014-10-02 22:57:45 +00:00
Rich Slogar
721b3efc20 am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updates 
* commit '46d8d0cdb349ca0a3f6ef199e1cc1dcba4c2d6eb':
  docs:ADT 23.0.4 doc updates
 2014-10-02 22:52:49 +00:00
Rich Slogar
46d8d0cdb3 am c470faab: docs:ADT 23.0.4 doc updates 
* commit 'c470faab3ee47b5643ee6b0a97c925c8f0f587fa':
  docs:ADT 23.0.4 doc updates
 2014-10-02 22:47:15 +00:00
Rich Slogar
c470faab3e docs:ADT 23.0.4 doc updates 
Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a
 2014-10-02 15:31:04 -07:00
Joe Fernandez
174f4f353c am 02df6c78: am 2a20b569: am 023d6e22: am 7def6026: am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit '02df6c78684efe07a0ed697bab6e9616672e38c1':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 22:24:40 +00:00
Ricardo Cervera
bab2bf78ef docs: Training class for the Wearable UI Library 
Change-Id: I93e9f6fc407f9afa79ce9af43d90719eb526bffa
 2014-10-02 15:02:03 -07:00
Joe Fernandez
7def602685 am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit '285859b13728c5cfb6124c11212978f8f95cd9de':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:50:09 +00:00
Joe Fernandez
285859b137 am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit 'd36dbe09a18fc7226029e841cb2a856fb83c81f2':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:32:15 +00:00
Joe Fernandez
d36dbe09a1 am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit 'e961d0b521bc25caf964258e75fef3d3ea22e4ac':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:14:59 +00:00
Joe Fernandez
e961d0b521 Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 2014-10-02 21:08:27 +00:00
Joe Fernandez
65ba319742 Revert "docs: Update for Android 23.0.4" 
This reverts commit f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.

Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
 2014-10-02 21:07:49 +00:00
Ricardo Cervera
5e5c61f104 am 91a565e9: am 0825c0a7: am 96762e59: am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '91a565e98a800471f1005347640f3e372617a020':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 19:44:22 +00:00
Rich Slogar
731fe793be am d493e5dd: am a3d739d8: am 6778b81f: am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'd493e5ddbae59a939d902ef7229a87aa63c4be7c':
  docs: Update for Android 23.0.4
 2014-10-02 19:44:14 +00:00
Newton Allen
df2b8a1cb9 am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit '58f75627d195082e263f6d6d8e3c46c6d0970e63':
  Fix some documentation typos.
 2014-10-02 19:43:39 +00:00
smain@google.com
7a9ecfb0de am aaf38de4: am 629e2f54: am 94f04cbe: am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit 'aaf38de492a669eb91e04236f0b1004c5c6241af':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 19:42:11 +00:00
Ricardo Cervera
134b62ed14 am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit 'e1e0e05a14ebb87ca1921cf21a98b9fa0067b14e':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:18:30 +00:00
Ricardo Cervera
e1e0e05a14 am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '957f45c328c9cbe9d1fb65dab6d342dc28a85954':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:13:55 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00