LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,432 Commits 2 Branches 0 Tags
526ec3d500c04d5c61b51ea73317c16849592cf1
Commit Graph

12432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
1949b4cad7 am 8bf01cd3: am 4268df44: am 61cf8608: am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '8bf01cd3510cf86661b3ce83b009d458556b0a98':
 2013-06-17 10:06:11 -07:00
Robert Ly
a3567759f7 am c89b3f1d: am 9fc688f4: am 6e58370c: am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit 'c89b3f1ded67ab4fae5633142fdac7ab681ccdca':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
 2013-06-17 10:06:10 -07:00
Robert Ly
8bf01cd351 am 4268df44: am 61cf8608: am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '4268df44c2134d145f35a350d1b4bf1a0ee7ac81':
 2013-06-17 10:03:57 -07:00
Robert Ly
c89b3f1ded am 9fc688f4: am 6e58370c: am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '9fc688f47ace1f6fc3ca8f4cef340dd6a1cd967b':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
 2013-06-17 10:03:54 -07:00
Robert Ly
4268df44c2 am 61cf8608: am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '61cf860801f1106d71124c69deebfb53ec25ac69':
 2013-06-17 10:00:10 -07:00
Robert Ly
9fc688f47a am 6e58370c: am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '6e58370c0198221979eef9879b5fb8e22a0f1b1b':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
 2013-06-17 10:00:09 -07:00
Robert Ly
61cf860801 am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '58a0f1bc860e6603970c5178294a7dd1709e9dad':
 2013-06-17 09:57:56 -07:00
Robert Ly
6e58370c01 am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '4d3ff06ef1fea7a18d04a013ec0e077ccf89394e':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
 2013-06-17 09:57:55 -07:00
Robert Ly
58a0f1bc86 am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit 'af5f663ae05c86e52e0ff6cbe028748992118643':
 2013-06-17 09:56:02 -07:00
Robert Ly
4d3ff06ef1 am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
 2013-06-17 09:55:14 -07:00
Robert Ly
af5f663ae0 am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
 2013-06-17 09:54:43 -07:00
Robert Ly
5632947990 am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build" 
* commit '6bd35b5bd685355b673a36ed96b77ddd13a0bff4':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
 2013-06-17 09:52:40 -07:00
Robert Ly
6bd35b5bd6 Revert "make target for gms and gcm javadocs and to automate entire docs build" 
This reverts commit 2deefec495.

Change-Id: I60be16d5233568a8ffcf6ec09952261b854275a8
 2013-06-17 16:10:59 +00:00
The Android Open Source Project
224d282e1d am 3fe981e2: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '3fe981e26a7e128ac1fbf7b422f60a6027764391':
  Remove mediarouter v7 support library from SDK.
 2013-06-16 07:45:36 -07:00
The Android Open Source Project
3fe981e26a Reconcile with jb-mr2-release - do not merge 
Change-Id: Icce5a029a8cfb3444ece5f8c489f75619ed67a77
 2013-06-16 07:43:44 -07:00
Jeff Brown
b2ce8ab56e Remove mediarouter v7 support library from SDK. 
Bug: 9425325
Change-Id: I9459fa005c4801cac0c2e28c5afb414620241ad9
 2013-06-15 12:20:32 -07:00
Jeff Brown
bf07360258 am d908a88a: am 408c1846: Remove mediarouter v7 support library from SDK. 
* commit 'd908a88a80d35fc1198d33c688eab023ba7bd55d':
  Remove mediarouter v7 support library from SDK.
 2013-06-14 16:43:23 -07:00
Jeff Brown
d908a88a80 am 408c1846: Remove mediarouter v7 support library from SDK. 
* commit '408c1846145bf99a821fe1fafc48ddbb5a2a6ad5':
  Remove mediarouter v7 support library from SDK.
 2013-06-14 16:42:10 -07:00
Jeff Brown
408c184614 Remove mediarouter v7 support library from SDK. 
Bug: 9425325
Change-Id: I9459fa005c4801cac0c2e28c5afb414620241ad9
 2013-06-14 15:47:52 -07:00
Robert Ly
8c67980877 am b7b07275: am 1630db41: am 3d1ead8f: am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit 'b7b07275806c0c73fcc717218ae72d6a6406675f':
 2013-06-13 15:45:19 -07:00
Robert Ly
a4963bf978 am 72a09286: am c3034939: am ecd39491: am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '72a09286dfdf83fe1559410c1a5e5be502e283a6':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:45:18 -07:00
Robert Ly
b7b0727580 am 1630db41: am 3d1ead8f: am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '1630db410d8c130521c752ee5408934861795b62':
 2013-06-13 15:43:54 -07:00
Robert Ly
72a09286df am c3034939: am ecd39491: am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit 'c3034939315336e91d295cc2dc02e669fef45296':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:43:53 -07:00
Robert Ly
1630db410d am 3d1ead8f: am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '3d1ead8f391d560b8721355a4909af2567fa67b4':
 2013-06-13 15:42:27 -07:00
Robert Ly
c303493931 am ecd39491: am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit 'ecd39491d7314b9d8e5de1b11ce100371c2c5409':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:42:25 -07:00
Robert Ly
3d1ead8f39 am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '2336733e7c8dc773b619e648b30b18f91fa6e952':
 2013-06-13 15:40:33 -07:00
Robert Ly
ecd39491d7 am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit 'c3e7bbaf00207bf36a2082cece68f7d6c0bf94af':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:40:32 -07:00
Robert Ly
2336733e7c am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '0e7706f3071b1edc4bd0af673c0ac44cbfe0cd71':
 2013-06-13 15:37:06 -07:00
Robert Ly
c3e7bbaf00 am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:36:30 -07:00
Robert Ly
0e7706f307 am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:35:55 -07:00
Robert Ly
128c2f0265 am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build 
* commit '2deefec495526a521f16e4c0d6e19f2969462199':
  make target for gms and gcm javadocs and to automate entire docs build
 2013-06-13 15:34:14 -07:00
Elliott Hughes
c8d1c9576b am 532fc970: am 34a5e96b: am 070228fa: Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks." 
* commit '532fc97091883b5f04fd746f5bfbb8f9ad12fa15':
  Extend the TimePickerDialog test to cover 12- and 24-hour clocks.
 2013-06-13 10:43:47 -07:00
Dianne Hackborn
a561b03d49 Merge "Add API demo for scheme specific intent filters." 2013-06-13 17:41:21 +00:00
Elliott Hughes
532fc97091 am 34a5e96b: am 070228fa: Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks." 
* commit '34a5e96b210af65c61f17052445fc7eb17b43ab9':
  Extend the TimePickerDialog test to cover 12- and 24-hour clocks.
 2013-06-13 10:22:32 -07:00
Elliott Hughes
34a5e96b21 am 070228fa: Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks." 
* commit '070228fa263678b906d845039a314f2ec45f52e0':
  Extend the TimePickerDialog test to cover 12- and 24-hour clocks.
 2013-06-13 10:21:35 -07:00
Elliott Hughes
070228fa26 Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks." 2013-06-13 17:19:31 +00:00
Dianne Hackborn
82c9189430 Add API demo for scheme specific intent filters. 
Change-Id: I9363d5098e97cc035478849755d8b9a77a41e7c0
 2013-06-12 18:08:54 -07:00
The Android Open Source Project
e28766a49c am e14bee15: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'e14bee15e5bb044f38da38ef00d3530a326f07a5':
  Redefine content position in milliseconds instead of seconds.
  Update the SDK API Data.
  Update media router api.
 2013-06-12 18:06:08 -07:00
The Android Open Source Project
e14bee15e5 Reconcile with jb-mr2-release - do not merge 
Change-Id: I61c2e7abaae34978e88c581f67e72bf45d4ebafb
 2013-06-12 18:04:01 -07:00
Jeff Brown
9fe3f5e3b0 Redefine content position in milliseconds instead of seconds. 
Made a note to update some other parts of the sample that need
to be fixed after other recent API changes.

Bug: 9380827
Change-Id: I23ccfa9ab434d4c7661ae379b77fa95e128513eb
 2013-06-12 17:06:27 -07:00
Xavier Ducrohet
ec0f8c20c6 Update the SDK API Data. 
This is necesary for Lint to handle API 18.

Change-Id: Ida60df3f9149fdb9a4835752b1a9c3e6a3d75082
 2013-06-12 14:28:33 -07:00
Jeff Brown
15fcd984ae Update media router api. 
Bug: 9380827
Change-Id: I74b5d5150336be95bd66bab35be8837c9cdf49de
 2013-06-12 14:28:17 -07:00
Xavier Ducrohet
fa1d3cae58 am 136698a4: am 8707c92b: Merge "Update the SDK API Data." into jb-mr2-dev 
* commit '136698a4ff7a46eb5d7857d1e8bd4fc1afcc8463':
  Update the SDK API Data.
 2013-06-12 11:08:42 -07:00
Xavier Ducrohet
136698a4ff am 8707c92b: Merge "Update the SDK API Data." into jb-mr2-dev 
* commit '8707c92ba3194a7d150146d144183b81cdb06fc6':
  Update the SDK API Data.
 2013-06-12 11:06:12 -07:00
Xavier Ducrohet
8707c92ba3 Merge "Update the SDK API Data." into jb-mr2-dev 2013-06-12 18:04:27 +00:00
Xavier Ducrohet
8f1a2bdf5a Update the SDK API Data. 
This is necesary for Lint to handle API 18.

Change-Id: Ida60df3f9149fdb9a4835752b1a9c3e6a3d75082
 2013-06-12 10:09:42 -07:00
The Android Open Source Project
c260d03fd0 am 3ac7f611: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '3ac7f61179a97898ca5235140ad01f196d7eb0ba':
  Fix support version.
 2013-06-12 07:26:00 -07:00
The Android Open Source Project
3ac7f61179 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ic207075a312c24521c5c07441dcef63100990a6b
 2013-06-12 07:23:12 -07:00
Jeff Brown
37c910f092 am ab95e666: am 972588ab: Redefine content position in milliseconds instead of seconds. 
* commit 'ab95e66679685b3316b7b28bf81eaf4756ff675f':
  Redefine content position in milliseconds instead of seconds.
 2013-06-12 00:08:38 -07:00
Jeff Brown
ab95e66679 am 972588ab: Redefine content position in milliseconds instead of seconds. 
* commit '972588aba01b2b58f20a8399ff2ab525d7b517fe':
  Redefine content position in milliseconds instead of seconds.
 2013-06-12 00:05:17 -07:00