Commit Graph

23745 Commits

Author SHA1 Message Date
Dirk Dougherty 083da20347 doc change: Add hero image for m and css for landing pages.
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
2015-08-13 12:37:34 -07:00
Chris Banes 795c7aad8c am 1fd599cb: am 98c570ab: am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '1fd599cbaeac173245dfb675a28c27bf3fcb2eca':
  Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:50:20 +00:00
Chris Banes 1fd599cbae am 98c570ab: am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '98c570abb2baf6f1b34a2220233257ad903f1de0':
  Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:41:38 +00:00
Chris Banes 98c570abb2 am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
  Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:36:49 +00:00
Chris Banes 743938fb0d Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev 2015-08-13 17:28:32 +00:00
Mike Dodd 689c097eb3 am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '148839b275619d89e3572668dbb54012117ef78b':
  Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:36:17 +00:00
Mike Dodd 148839b275 am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '17b069107654c04f0ec2cc44d54da3a44006c710':
  Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:30:09 +00:00
Mike Dodd 17b0691076 am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
  Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:22:44 +00:00
Mike Dodd 5bf35d0685 Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev 2015-08-13 15:16:38 +00:00
Chris Banes b916a5bcbc Make sure only AppCompat (not it's tests) are in the docs
BUG: 23169683

Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
2015-08-13 10:42:02 +01:00
Dianne Hackborn 59a7652985 am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '6ff3e53faaab66975674e16a1822d926c529bc5d':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 01:09:07 +00:00
Dianne Hackborn 6ff3e53faa am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '897f3ba8b1cc402fca16720be345ba9c587c326b':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 01:02:21 +00:00
Dianne Hackborn 897f3ba8b1 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 00:54:30 +00:00
Dianne Hackborn 25abc5a38e Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Dianne Hackborn e593e5c42a Fix issie #23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Mike Dodd f29b5bd380 Include new AOSP messaging app in base AOSP telephony builds.
b/23110861

Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07:00
Ian Pedowitz 35bdf149e7 am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
* commit '7e8d6f2551e9d008a226af99025960d4b75189ef':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:40:49 +00:00
Ian Pedowitz 7e8d6f2551 am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
* commit '0fd879cd65f1c53c409142ca90744b1d43bdbc08':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:31:50 +00:00
Ian Pedowitz 0fd879cd65 am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:17:30 +00:00
Ian Pedowitz a0372e20a2 Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev 2015-08-12 19:41:54 +00:00
Mike Dodd e4f29f0bb7 am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '00e15cd5554c25ba006b355945db1cc1f00fc3c7':
  Revert "Include new AOSP messaging app in base builds."
2015-08-12 19:14:17 +00:00
Mike Dodd 00e15cd555 am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '09baf014917b2c59e43631e7aa4d9ef0ade80ad8':
  Revert "Include new AOSP messaging app in base builds."
2015-08-12 19:06:07 +00:00
Mike Dodd 09baf01491 am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
  Revert "Include new AOSP messaging app in base builds."
2015-08-12 18:58:59 +00:00
Mike Dodd 745d11ccd0 Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev 2015-08-12 18:53:47 +00:00
Mike Dodd 018500efea Revert "Include new AOSP messaging app in base builds."
This reverts commit a8b0905e16.

Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
2015-08-12 18:48:45 +00:00
Ian Pedowitz 68c62e78ad Removing VisualizationWallpapers as it does not comply with API 23 rules
Bug: 23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
2015-08-12 11:11:55 -07:00
Mike Dodd 71fde725b6 am af172736: am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit 'af17273684fc29af3e63f912d00c7234d2d8476a':
  Include new AOSP messaging app in base builds.
2015-08-12 18:05:59 +00:00
Mike Dodd af17273684 am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit 'd95990e68568fe5df9e4d8981180d22d9f363a0f':
  Include new AOSP messaging app in base builds.
2015-08-12 17:58:01 +00:00
Mike Dodd d95990e685 am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1':
  Include new AOSP messaging app in base builds.
2015-08-12 17:49:48 +00:00
Mike Dodd 02389bf940 Merge "Include new AOSP messaging app in base builds." into mnc-dev 2015-08-12 17:01:24 +00:00
Tao Bao 68668488cb am 40578b6a: am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev
* commit '40578b6acb42e51f93ec3d58b67daa345782e354':
  Add support for clobbered blocks
2015-08-12 07:19:56 +00:00
Tao Bao 40578b6acb am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev
* commit 'a749ea4b47eb3b850225ddc934d4890fc5e77600':
  Add support for clobbered blocks
2015-08-12 07:13:30 +00:00
Tao Bao a749ea4b47 am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev
* commit '11cf92aa37b9f51176a2055b1ff97b6211404103':
  Add support for clobbered blocks
2015-08-12 07:03:42 +00:00
Tao Bao 11cf92aa37 am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev
* commit '1dca55fde512f1758690fb563f1ffc9cec5f7271':
  Add support for clobbered blocks
2015-08-12 06:55:21 +00:00
Tao Bao 1dca55fde5 skip the merge of 67e7c661 to lmp-mr1-ub-dev
The change (007979ee) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.

Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
2015-08-11 23:22:37 -07:00
Tao Bao 67e7c66124 am 007979ee: Add support for clobbered blocks
* commit '007979ee7543a396d97b3e9ada21aca44d503597':
  Add support for clobbered blocks
2015-08-12 05:18:37 +00:00
Tao Bao 007979ee75 Add support for clobbered blocks
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.

Bug: http://b/20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit ff7778166b)
2015-08-11 21:02:45 -07:00
Justin Morey 2d20e3d968 DO NOT MERGE Revert "Add the ability to display annotations in the generated docs"
This is reverted along with ag/745924 due to GmsCore build breakage.

This reverts commit a76428792f.

Change-Id: Ib66777e003cd7ab3ed056777686086e9b5d92698
2015-08-11 18:53:23 -05:00
Ian Pedowitz 87eb4007e1 am b4571028: am c055f9b5: am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
* commit 'b4571028427eed72e090bfa90a816619bca7e6cc':
  Increasing arm(64)? emulator partition sizes to 1.5GB
2015-08-11 22:24:49 +00:00
Ian Pedowitz b457102842 am c055f9b5: am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
* commit 'c055f9b51a67de39a2fd384d3d974b9b8566884e':
  Increasing arm(64)? emulator partition sizes to 1.5GB
2015-08-11 22:06:16 +00:00
Ian Pedowitz c055f9b51a am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
* commit 'e5a631585a7b07c329f9ada04c99ed04b6c16b62':
  Increasing arm(64)? emulator partition sizes to 1.5GB
2015-08-11 21:59:25 +00:00
Ian Pedowitz e5a631585a Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev 2015-08-11 21:54:17 +00:00
Clay Murphy 540abfef5e am 87492b88: am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '87492b889d2d90512c1e7129e3e5d04339d9e0e2':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:19:20 +00:00
Clay Murphy 87492b889d am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '86e510cc313a464870ff82a9cd7f7206ea4aeb63':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:12:33 +00:00
Clay Murphy 86e510cc31 am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '71a33c4d5b010757423980b90681445ca2bb2be0':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:04:24 +00:00
Clay Murphy 71a33c4d5b Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev 2015-08-11 20:55:24 +00:00
Mike Dodd a8b0905e16 Include new AOSP messaging app in base builds.
b/23110861

Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07:00
Ian Pedowitz 4e0d34c7c7 Increasing arm(64)? emulator partition sizes to 1.5GB
Bug: 23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
2015-08-11 12:53:39 -07:00
Ian Pedowitz c7e051e0b1 am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
* commit '112f4c07c7de4bdb28aeb150233b24e7b1463f86':
  Increasing x86 emulator system partition size
2015-08-11 19:33:04 +00:00
Ian Pedowitz 112f4c07c7 am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
* commit '0150dae61563c44dfb12a6d367a4f4f72253fcc4':
  Increasing x86 emulator system partition size
2015-08-11 19:26:21 +00:00