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

95306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
3383c01569 am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit '9d167eaa7d43f7fb4a0dd77f0cbd8f09b566df4c':
  docs: another string change for developer console bug: 8033647
 2013-02-27 10:16:36 -08:00
Scott Main
8da34d9786 am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit '9d167eaa7d43f7fb4a0dd77f0cbd8f09b566df4c':
  docs: another string change for developer console bug: 8033647
 2013-02-27 18:16:32 +00:00
Scott Main
9d167eaa7d docs: another string change for developer console 
bug: 8033647

Change-Id: Ia6b476e22f2e370eeefd0556e2c9d0b4295482a9
 2013-02-27 10:08:27 -08:00
Ian Rogers
75dcb3338d am 545464df: Merge "Deprecate and document memory allocation counting." 
* commit '545464df282273209a837569f05e9990173f4d56':
  Deprecate and document memory allocation counting.
 2013-02-27 08:50:56 -08:00
Ian Rogers
545464df28 Merge "Deprecate and document memory allocation counting." 2013-02-27 16:45:39 +00:00
Romain Guy
bf53be46d2 am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 
* commit '09353f747835c23d02df9e18ecdd6a7d1c91310c':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
 2013-02-26 23:05:44 -08:00
Scott Main
06706ba5d6 am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '2d0b481f1078548a6342a852948e504b3e79767a':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-27 06:26:35 +00:00
Jean-Baptiste Queru
84d3036cf9 am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':
 2013-02-27 06:26:33 +00:00
Dirk Dougherty
bde267772d am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '012ef92e0358360a6d5109fddc9e58e16b13c80d':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-27 06:26:23 +00:00
Robert Ly
9d09eee559 am af7b843e: docs: remove games references 
* commit 'af7b843e97d5228bf8cc57aa37acf6c7d58464e8':
  docs: remove games references
 2013-02-27 06:26:20 +00:00
Robert Ly
1878d08046 am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '7cbf2bc6810ca4623d990258823d25e307ebbfd7':
  docs: gms cheddar updates for g+
 2013-02-27 06:26:18 +00:00
Robert Ly
82370a60b2 am 05c8e63c: docs: gms and gcm javadocs 
* commit '05c8e63c760eabfbd1cb19d996038c280472c357':
  docs: gms and gcm javadocs
 2013-02-27 06:26:15 +00:00
Joe Malin
e35ae88b3e am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit '06764394eb9e4ba4e5f87c816827d82c93b5e71c':
  Bug 8261430: Typo in Notifications
 2013-02-27 06:26:12 +00:00
Scott Main
cdc5799734 am d51eebae: docs: add google io registration announcement to home page 
* commit 'd51eebae6d5d798e5af2ec49f77d4b5fcf1678b7':
  docs: add google io registration announcement to home page
 2013-02-27 06:26:09 +00:00
Dirk Dougherty
2caba1f763 am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit 'f15b0908a773850007c0d0b6de54b1dc008abf6f':
  fix javadocs
 2013-02-27 06:26:06 +00:00
Adam Koch
f64fd772f4 am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev 
* commit 'b367fd6a87116933b76e5e9bc162dcfe88306aa6':
  Displaying Bitmaps Efficiently Training - Update sample app zip
 2013-02-27 06:26:03 +00:00
Dirk Dougherty
f02ebca3c2 am 47dae077: Doc change: Update DC image, fix typo. 
* commit '47dae0771cb0db98ff829e19bf505f8628745878':
  Doc change: Update DC image, fix typo.
 2013-02-27 06:26:00 +00:00
Dirk Dougherty
893f0cc179 am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit 'f32cbc3d490845967e28b0995ac88187b197642c':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-27 06:25:51 +00:00
Romain Guy
09353f7478 Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 2013-02-27 06:07:31 +00:00
Scott Main
611bc6d446 am 98411a1c: am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '98411a1cb8c70c39f7cb8f0ee0caaf1f5a7b0ab9':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:41:07 -08:00
Jean-Baptiste Queru
8298c5b8ff am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '94c31c85f67ff10a1ea496ce9ea12809174f72c0':
 2013-02-26 14:37:44 -08:00
Scott Main
98411a1cb8 am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '2c675f0740695721f04fddffa1abcb6b2b04ffe5':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:36:49 -08:00
Scott Main
2c675f0740 am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '22a73ce31b7d58919ef61b281f0290d34fc3f645':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:34:45 -08:00
Jean-Baptiste Queru
94c31c85f6 am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit 'd4ed4363101201ed24795f50064fe76cb754f979':
 2013-02-26 14:33:30 -08:00
Jean-Baptiste Queru
d4ed436310 am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '909960ad924687dfa3946cd6a077701968649af0':
 2013-02-26 14:31:23 -08:00
Scott Main
22a73ce31b am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '2d0b481f1078548a6342a852948e504b3e79767a':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:30:55 -08:00
Scott Main
2d0b481f10 docs: followup to I32f25b692872ed7827e611890c563498993b2480 
Change-Id: I7942e243e77cbe9ea9a7cd542b4255f9ca273a4d
 2013-02-26 14:27:20 -08:00
Jean-Baptiste Queru
909960ad92 am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':
 2013-02-26 14:27:06 -08:00
Jean-Baptiste Queru
ed9cc555ee Reconcile with jb-mr1-release - do not merge 2013-02-26 14:03:20 -08:00
Ian Rogers
fe067a4cc5 Deprecate and document memory allocation counting. 
Bug: 8241521
Change-Id: I174c4024600c5b78e74030ecc99e784a98295f09
 2013-02-26 13:30:08 -08:00
Dirk Dougherty
0db6a9e9a6 am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'a18ff6f1ae45c4553e7d2e0c65a5b347bbb370e4':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:47:54 -08:00
Dirk Dougherty
a18ff6f1ae am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'f809e96fef4df25899c267e1cac648e08ba31a72':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:44:56 -08:00
Dirk Dougherty
f809e96fef am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '1a15b24bdd6a42b1c0c36e06c58d408af6eb276b':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:42:45 -08:00
Dirk Dougherty
1a15b24bdd am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '012ef92e0358360a6d5109fddc9e58e16b13c80d':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:40:24 -08:00
Dirk Dougherty
012ef92e03 Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 2013-02-26 18:36:11 +00:00
Elliott Hughes
c22657f8b1 am 3f5778c8: Merge "Fix incorrect FloatMath documentation." 
* commit '3f5778c858b90b554d7614603346b642d1a7bc6d':
  Fix incorrect FloatMath documentation.
 2013-02-26 10:02:45 -08:00
Kenny Root
f7497c9e55 am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 
* commit '755205ade42d6458c68bf1ee6852db0b23ecc4f5':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
 2013-02-26 10:02:43 -08:00
Scott Main
1649f818e2 docs: add MTK usb driver info 
Change-Id: I847877e65207d065883e7ab74be65b6333ca205d
 2013-02-26 09:45:13 -08:00
Elliott Hughes
3f5778c858 Merge "Fix incorrect FloatMath documentation." 2013-02-26 17:37:58 +00:00
Kenny Root
755205ade4 Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 2013-02-26 17:35:13 +00:00
Elliott Hughes
f732a2f83f Fix incorrect FloatMath documentation. 
Change-Id: I30bbe500e634b73f3456ccc797106ad261fd0ce7
 2013-02-26 09:28:17 -08:00
Martin Olsson
64d0b3f918 Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help" 
Change-Id: I8f869c9d2243ae8ff414399b7d6835c7ca74d500
Signed-off-by: Martin Olsson <martin@minimum.se>
 2013-02-26 17:54:39 +01:00
Robert Ly
a1ee7539ff am c6793135: am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit 'c679313559e90f0c35f15e1b5070c277ada981d3':
  docs: remove games references
 2013-02-26 08:07:45 -08:00
Robert Ly
c679313559 am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit '1d13e85031eff239e035afb1ff474502caf01104':
  docs: remove games references
 2013-02-26 08:04:45 -08:00
Robert Ly
1d13e85031 am 928f6382: am af7b843e: docs: remove games references 
* commit '928f6382eb4ac0b6ea3f5141ba297412e26d8fe6':
  docs: remove games references
 2013-02-26 08:02:43 -08:00
Robert Ly
928f6382eb am af7b843e: docs: remove games references 
* commit 'af7b843e97d5228bf8cc57aa37acf6c7d58464e8':
  docs: remove games references
 2013-02-26 08:00:38 -08:00
Robert Ly
af7b843e97 docs: remove games references 
Change-Id: I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 07:49:56 -08:00
Robert Ly
c1da3af593 am 9e49d2af: am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '9e49d2af7289ff7f7c96568f6c41cb22295e4613':
  docs: gms cheddar updates for g+
 2013-02-25 22:09:25 -08:00
Robert Ly
9e49d2af72 am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '045bede816c6578379911567f68046393f70247c':
  docs: gms cheddar updates for g+
 2013-02-25 22:08:19 -08:00
Robert Ly
045bede816 am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '4240da1a888edca033ca10b6995ea9c7df5c7e5b':
  docs: gms cheddar updates for g+
 2013-02-25 22:07:03 -08:00