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

8088 Commits

Author SHA1 Message Date
Rich Slogar
d1baa50d4f am cdfa492e: am b42cd383: am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'cdfa492e2420d97177f32a77e177bb7ba0c5ebb3':
  docs:SDK tools 23.0.5 Release Note
 2014-10-15 02:03:44 +00:00
Nick Kralevich
a26487cb28 am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit '55bb6a7b68595ee83b543eda40d191636de1831e':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-15 02:03:37 +00:00
Sarah Maddox
3505460f73 am 7666f904: am 60c5fbc3: am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '7666f9040957d1e85815a3cce59ec4606c83d86d':
  Fixed a typo in Perf Tips.
 2014-10-14 17:22:54 +00:00
Rich Slogar
a89ac60e25 am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit '858cfad9482817305cc5b846102c3f8e5d12782a':
  docs:SDK tools 23.0.5 Release Note
 2014-10-14 15:55:37 +00:00
Nick Kralevich
0ae82b05be resolved conflicts for merge of a4eb81b6 to lmp-dev 
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
 2014-10-14 08:38:05 -07:00
Sarah Maddox
8601b1b1ca Merge "Fixed a typo in Perf Tips." into lmp-dev 2014-10-13 21:50:30 +00:00
Joe Fernandez
7a04ec8622 am 47d2555b: am 843fe451: am e0b0d9a2: am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 
* commit '47d2555bbb90e3acaf89876eef462f448d6a3a5a':
  docs: Move the L-Developer Preview samples page to the Developer Samples area
 2014-10-13 05:52:41 +00:00
Joe Fernandez
ccd26eec52 am 004ecc9f: am 074c1d93: am 26ebde60: am cd2445a9: docs: Migrate TV Design docs to main DAC-Design area 
* commit '004ecc9f3507f1ed5b954d0588a7a0b537b18ca7':
  docs: Migrate TV Design docs to main DAC-Design area
 2014-10-13 05:52:36 +00:00
Joe Fernandez
7e522af60f Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 2014-10-13 05:37:00 +00:00
Joe Fernandez
cd2445a9aa docs: Migrate TV Design docs to main DAC-Design area 
Change-Id: Ie9ba7e519ccdf46b58010d5ff11b4042134b7a57
 2014-10-12 22:31:41 -07:00
Joe Fernandez
fce89df74b am 8ef4edf3: am 96eecf4f: am d942d4e9: am 15edcda5: docs: migrate Android TV games page to TV training section 
* commit '8ef4edf379e7c425a01b4eb1f62321c6e1534167':
  docs: migrate Android TV games page to TV training section
 2014-10-13 04:59:40 +00:00
Sarah Maddox
3cceb24414 Fixed a typo in Perf Tips. 
Change-Id: I427bd60211d6fa3f2d1f262dc2b9b8e7729d4adc
 2014-10-13 15:51:43 +11:00
Joe Fernandez
15edcda56b docs: migrate Android TV games page to TV training section 
Change-Id: Ic6be9deaac5ad2516dba288c0c3d059e3c7a6118
 2014-10-12 21:38:05 -07:00
Joe Fernandez
b95ded1c45 am 57383710: am 4fd3cd14: am f0acbc15: am e6b9abb3: docs: migrate Android TV content discovery 
* commit '57383710c86a1987d96008fdf39c998b335c443b':
  docs: migrate Android TV content discovery
 2014-10-13 04:12:55 +00:00
Joe Fernandez
c752cc3276 am 1a3ae155: am 25b9e363: am bb8e826c: am f666355b: docs: migrate TV Playback app content 
* commit '1a3ae1556833458a199c1aade7d39d73afd2669c':
  docs: migrate TV Playback app content
 2014-10-13 04:08:34 +00:00
Joe Fernandez
e6b9abb3ad docs: migrate Android TV content discovery 
Change-Id: I35fe1e7f4f60409a0f7c5cd5bfc8ccfede4d6c20
 2014-10-12 20:45:47 -07:00
Joe Fernandez
f666355b2d docs: migrate TV Playback app content 
Change-Id: I851dac6423cba3b76c85e1ac5b6c03a98272d868
 2014-10-12 19:06:55 -07:00
Joe Fernandez
174a5d0dc1 am f04d65f7: am 62d8c4b0: am fd74a901: am d86a2f5b: docs: Android TV App Dev Basic Training 
* commit 'f04d65f7081cf96ca30dc0af0dc391e85ad8d544':
  docs: Android TV App Dev Basic Training
 2014-10-13 00:53:19 +00:00
Joe Fernandez
d86a2f5b34 docs: Android TV App Dev Basic Training 
Change-Id: Iede448652efba25c3d0b6c26d49ea6548008515e
 2014-10-12 17:29:44 -07:00
Joe Fernandez
e26c4d2f90 docs: Move the L-Developer Preview samples page to the Developer Samples area 
Change-Id: I307acca1dd3105768ed5c72995b1c7e67bea0612
 2014-10-12 11:33:04 -07:00
Rich Slogar
858cfad948 am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'a3287768e267f71fbce5d3341b6db8f3a9e04230':
  docs:SDK tools 23.0.5 Release Note
 2014-10-10 21:23:51 +00:00
Rich Slogar
a3287768e2 Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 2014-10-10 21:19:08 +00:00
Eric Gilmore
a4eb81b67c am e77fe607: Docs: adding closing bracket to un-break javadoc tokens. 
* commit 'e77fe607609e5a6ea59e11164e21744623cf07a5':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-10 20:49:54 +00:00
Rich Slogar
309b1b384c docs:SDK tools 23.0.5 Release Note 
Change-Id: Ib26f100247d3b8b6f0447251a35fa427393c9938
 2014-10-10 11:19:59 -07:00
Joe Fernandez
7810a53c57 am 039e217d: am daf00ceb: am 487e15b9: am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '039e217d32e9484c9b83ba68fc337959371d9a0a':
  Revert "Removed preview license."
 2014-10-10 17:14:27 +00:00
Joe Fernandez
5d5f3d1d87 am d240b98f: am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'd240b98f999533904db68cba93ea25c255f0ae53':
  docs: Android TV publishing requirements
 2014-10-10 16:59:26 +00:00
smain@google.com
ea2a8ba464 am efdf63a7: am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit 'efdf63a74e101d4c37b50b6ad18ddbefc4d74c37':
  fix unclickable link due to overlay from offset dev below
 2014-10-10 16:58:55 +00:00
Quddus Chong
45d4e141d4 am 39dd5163: am 00c1c564: am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '39dd5163e7c9695c65d728828778de4648903f62':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-10 04:27:00 +00:00
Joe Fernandez
401418d53b Merge "Revert "Removed preview license."" into lmp-dev 2014-10-09 18:03:21 +00:00
Joe Fernandez
5c07e40436 Revert "Removed preview license." 
New plan: We need this for the Device Preview images provided on the final L-Preview page. 

This reverts commit 4974e7f27cf93842001c10379c0be0b24eb035d7.

Change-Id: I1b5fd6d58c53c6ac14f86c688eaea540d683134a
 2014-10-09 18:02:10 +00:00
Eric Gilmore
e77fe60760 Docs: adding closing bracket to un-break javadoc tokens. 
Bug: 17186958

Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
 2014-10-09 10:17:59 -07:00
Joe Fernandez
e2f757d9f3 am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'a63f81ec897988befad7b286b50f73a42319fd5e':
  docs: Android TV publishing requirements
 2014-10-09 12:07:07 +00:00
Joe Fernandez
a63f81ec89 am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e15773be4837baf15079d5d7e8f8c0c09cef952f':
  docs: Android TV publishing requirements
 2014-10-09 12:01:36 +00:00
Joe Fernandez
e15773be48 Merge "docs: Android TV publishing requirements" into klp-modular-docs 2014-10-09 04:19:20 +00:00
Joe Fernandez
1b361d90d3 docs: Android TV publishing requirements 
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
 2014-10-08 20:56:32 -07:00
smain@google.com
b880707c7f am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '63cd4977fd72de401f347ba159a71fe3d04399b3':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 00:10:06 +00:00
smain@google.com
63cd4977fd am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '770c3c5ed52f354fe04ced31aaa56ba57a028955':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 00:04:57 +00:00
smain@google.com
770c3c5ed5 fix unclickable link due to overlay from offset dev below 
Change-Id: I59bedd0e928d578a3bd030caa4add4cfa96db83f
 2014-10-08 16:54:21 -07:00
Quddus Chong
8f25f390e5 am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '9df3d67bdc7c1fa79d0daab1f2ae5f69a476f8dd':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-08 19:08:31 +00:00
Joe Fernandez
a9c3d7df20 am c57d7b42: am b7af00f2: am e4ce2aa3: am a5119ae7: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
* commit 'c57d7b42e6ec60f427dd2f87ec73778e5b477626':
  docs: Wear UI Lib training fixes
 2014-10-08 18:51:00 +00:00
Rich Slogar
c3bb476b0e am 71b38055: am ec2562fc: am 033c759c: am fdbbed60: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs 
* commit '71b3805533dc08104f96e3e6a518cf4fca788fb5':
  docs:64 bit image and skd update
 2014-10-08 18:50:10 +00:00
Quddus Chong
9df3d67bdc am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '7f567e4a1c561f60c6d31f6709508f5ec5a6ba88':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-08 18:01:05 +00:00
Quddus Chong
7f567e4a1c docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
Change-Id: I710c0eab6913988d8bc70ded344a2d60fa594d92
 2014-10-08 10:51:21 -07:00
Joe Fernandez
a5119ae776 am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
* commit '59c04ece5614ffa20e10964a70c5faeafe565aa3':
  docs: Wear UI Lib training fixes
 2014-10-08 14:50:43 +00:00
Joe Fernandez
59c04ece56 am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
* commit 'bcd1af39fa674dcc46ddb30778304eaf67100a13':
  docs: Wear UI Lib training fixes
 2014-10-08 14:45:59 +00:00
Joe Fernandez
bcd1af39fa Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 2014-10-08 14:37:35 +00:00
Quddus Chong
e3b11867ed am 7ac3ca42: am a09ae911: am a3d59fa1: am ad658a3d: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 
* commit '7ac3ca42b5486582bd71b6ce326ff784f93f6dab':
  docs: Added API highlights for Google Play services 6.1 (Manchego).
 2014-10-08 07:51:44 +00:00
Quddus Chong
7435fc6f61 am 66c8ce7b: am f3f3f281: am 90a54248: am 2b7b4d07: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 
* commit '66c8ce7b301fd4a770a829d66d2c9b0f6a0e8e25':
  Updataed Google Play services Javadocs for v6.1 (Manchego) release.
 2014-10-08 07:51:38 +00:00
Ricardo Cervera
abbbc5940a am ef081faf: am 25221488: am 3edec8ec: am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'ef081faf72931b9c8262bcd8d4c387b615218857':
  docs: Removing references to self note on Common Intents page.
 2014-10-08 07:51:33 +00:00
Ricardo Cervera
dcc6501c73 am 24e579a2: am 614ae244: am d3ffa845: am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '24e579a2d387b2c4307a016982d8ee85b32693a7':
  docs: Update Common Intents page with Google Now actions
 2014-10-08 07:51:29 +00:00