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

125603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
d1ba4c13d0 am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:25:38 +00:00
kmccormick
ae3bd63bc5 am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'a1572ffc6b8df1f0da637fdb93b949322fcb3637':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:08:13 +00:00
kmccormick
a1572ffc6b Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 2014-10-01 17:02:26 +00:00
Ricardo Cervera
e906b38b7e am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '781c988a767eabf9b1b03b4a74f21e3b687902b6':
  docs: ADT beginner text fix
 2014-10-01 03:08:30 +00:00
Ricardo Cervera
781c988a76 am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'ae7b5dc49381e76c82cda928cc37a6a8b529da25':
  docs: ADT beginner text fix
 2014-10-01 02:57:29 +00:00
Ricardo Cervera
ae7b5dc493 Merge "docs: ADT beginner text fix" into klp-modular-docs 2014-10-01 02:07:15 +00:00
Ricardo Cervera
571e918345 docs: ADT beginner text fix 
Change-Id: I03cc08d5a4f12137a573c23d1ee07e048225c8f5
 2014-09-30 15:07:16 -07:00
kmccormick
76ab6c6290 Doc update: Update preprod (staging) instructions. 
Fix for:

b/17525318

Change-Id: Id93bd3e6e1fd5f203733121e3148cec8b24ab374
 2014-09-30 12:24:40 -07:00
Scott Rowe
6287a65cca am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '294d534787e139119d30eb7a5b4dd1532312018e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-30 00:39:49 +00:00
Ricardo Cervera
6ea34ddfde am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '9f48394158bce2984a19fe504b7a7f1f673866f3':
  docs: Fixed path for build output.
 2014-09-30 00:39:39 +00:00
Justin Koh
92ffd6b5fe am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-09-30 00:39:16 +00:00
Scott Rowe
294d534787 am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '9d20628b4beb38470d4f7d10193ac5a7cc558d41':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-29 22:53:15 +00:00
Scott Rowe
9d20628b4b docs: b/16044763 Update IAB docs to give notice of v2 turndown 
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
 2014-09-29 15:11:46 -07:00
Ricardo Cervera
9f48394158 am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '808440cd5e1052f21b937cdcb60acecefd57f23c':
  docs: Fixed path for build output.
 2014-09-29 20:43:55 +00:00
Justin Koh
28d01e677c Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 2014-09-29 18:24:04 +00:00
Ricardo Cervera
808440cd5e Merge "docs: Fixed path for build output." into klp-modular-docs 2014-09-29 14:56:30 +00:00
Dirk Dougherty
cdc494512e am 5913f406: am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit '5913f40618494a361b4cc0c79aebdd2f0a9170da':
  Doc change: Add new index page for games stories.
 2014-09-27 05:20:38 +00:00
Dirk Dougherty
5913f40618 am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit '6373718b883dd945c17987ac64925c0fdc30674d':
  Doc change: Add new index page for games stories.
 2014-09-27 05:14:05 +00:00
Dirk Dougherty
6373718b88 Merge "Doc change: Add new index page for games stories." into klp-modular-docs 2014-09-27 03:16:53 +00:00
Dirk Dougherty
eb81afbe29 Doc change: Add new index page for games stories. 
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
 2014-09-26 17:43:14 -07:00
Dirk Dougherty
dea43111e1 am 8d03b0b9: am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit '8d03b0b987172e70d0bd6522fadc7505a3ff2b1d':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:27:26 +00:00
Dirk Dougherty
8d03b0b987 am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit 'afbe165aecb00b74f8228314cc60b28af089e8e3':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:22:41 +00:00
Justin Koh
267874622e DO NOT MERGE Disable vibration from notificationmanagerservice when on watch 
This is a hack for this version: in a future framework version, there is an API
to do this.

Bug: 17646502
Change-Id: I7b46c0894c5a21189eb82efa04f2ce50ef1f927c
 2014-09-26 22:23:33 +00:00
Ricardo Cervera
b9c000e090 docs: Fixed path for build output. 
http://b.android.com/76374

Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
 2014-09-26 13:25:02 -07:00
Kevin Ma
938ff081a6 am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit '18037f14e8ee8eea7247c03a9cb27e2a8878fd05':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 19:43:39 +00:00
Kevin Ma
18037f14e8 Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 2014-09-26 18:52:25 +00:00
Kevin Ma
8174879e09 Revert "Revert "DO NOT MERGE Fix race condition between binder deaths"" 
This reverts commit 04c6d73fd0e4472505275688ef8497bc6697647c.

Bug: 17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
 2014-09-26 18:51:16 +00:00
Dirk Dougherty
afbe165aec Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-26 11:09:12 -07:00
Deepanshu Gupta
f0ebe2fa14 am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'f202365ecca0b6ed637f679c8dd3a36ff850ddfe':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 06:15:55 +00:00
Deepanshu Gupta
f202365ecc am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '8c61344d89ab3b1f02228b3da10c8377c41960ff':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 06:05:03 +00:00
Deepanshu Gupta
2dd837cdaf am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '416b74fe31124d21f14bb5900f4872cdf62f08e0':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:55:34 +00:00
Deepanshu Gupta
8c61344d89 am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '528b58623feee609055a31e58bf5e1ea3658bf40':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:53:47 +00:00
Deepanshu Gupta
528b58623f am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '941a8f03599b91f752c455dceef993887c4b9b20':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:43:38 +00:00
Deepanshu Gupta
416b74fe31 am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ab5971d825d9d59f06b49e1f1e66a24df417124e':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:43:32 +00:00
Deepanshu Gupta
ab5971d825 am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '1489862ecee4f298de6a7b27789dda08ff4aa4cf':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:34:34 +00:00
Deepanshu Gupta
941a8f0359 am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '0c4893ece99418842538db496bb8d53b767b335b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:32:09 +00:00
Deepanshu Gupta
1489862ece am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '48d0fd99f0a25829f191e7f7ed35cf8d0a2b5902':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:24:06 +00:00
Deepanshu Gupta
0c4893ece9 am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '2889942f4ee7762cdbd097cf3ceea16444f8841a':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:20:48 +00:00
Deepanshu Gupta
48d0fd99f0 am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ee41b79c5735bb3399108bb62de1145fffff3904':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:13:09 +00:00
Deepanshu Gupta
2889942f4e am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'bfeeee8e4a9cf4bf32067c2ca5807cd612564a99':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:09:54 +00:00
Deepanshu Gupta
bfeeee8e4a am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ecbe6045911ac7c05a1e999b966577ef7b1bdc18':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:02:22 +00:00
Deepanshu Gupta
ee41b79c57 am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:57:59 +00:00
Deepanshu Gupta
ecbe604591 am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '6950920f19980a2416e156d2337b93e386b3f8be':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:49:31 +00:00
Deepanshu Gupta
7d23e405bd am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'f103317499bdb12cbcac1754899756d22acde986':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:40:53 +00:00
Deepanshu Gupta
6950920f19 am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '1fce990ce9098afe96e75ec1583c771826c50637':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:37:23 +00:00
Deepanshu Gupta
1fce990ce9 am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '04861ed488f5aaa62acbaf903e359ea9edd8e9f9':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:22:39 +00:00
Deepanshu Gupta
a7045a43ca am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'eb31708e7d14db1a54bf0f38452149c7d984517f':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 03:12:42 +00:00
Deepanshu Gupta
eb31708e7d am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '83951615f564521d542da00d3bf60a372787aced':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 03:00:29 +00:00
Deepanshu Gupta
83951615f5 am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '467aea1722f5cd73d0874502447d947bccd13c99':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 02:49:04 +00:00
Deepanshu Gupta
467aea1722 am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'a39b3b25b947d6c1ab49c08fdcd6f5149f037b20':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 02:07:42 +00:00