Commit graph

23567 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Ian Pedowitz
0150dae615 am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
* commit '073f74d90853b39de32308fa3eeab9aa8998bd69':
  Increasing x86 emulator system partition size
2015-08-11 19:18:13 +00:00
Ian Pedowitz
073f74d908 Merge "Increasing x86 emulator system partition size" into mnc-dev 2015-08-11 19:12:28 +00:00
Ian Pedowitz
c396ce6240 am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
* commit 'c79c7d152f6c481992748f6fe4bb3cc82233ae4d':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
2015-08-11 17:47:14 +00:00
Ian Pedowitz
c79c7d152f am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
* commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
2015-08-11 17:41:08 +00:00
Ian Pedowitz
a18c5028d7 Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
2015-08-11 10:02:15 -07:00
Ian Pedowitz
817a2d2baa am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
* commit 'e2312db19ae06eef0c4d8fd2da668b345ad3070d':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
2015-08-11 16:24:01 +00:00
Ian Pedowitz
e2312db19a am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
* commit '38ffb0cf899d94cb72409519bd25dc94048dd719':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
2015-08-11 16:17:29 +00:00
Ian Pedowitz
38ffb0cf89 Bump PLATFORM_PREVIEW_SDK_VERSION to 4
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
2015-08-11 07:50:04 -07:00
Ian Pedowitz
5394e8bd12 Increasing x86 emulator system partition size
Seems sdk_google_phone_x86 is building larger than 750MB

Bug: 23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
2015-08-11 03:39:34 +00:00
Omari Stephens
a76428792f Add the ability to display annotations in the generated docs
(cherry-picked from commit 87c44d8a11)
Bug: 8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-10 17:48:08 -07:00
Furquan Shaikh
f8a714ba6f am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev
* commit '9f5c487ef586d20c273cafba6ce663287ef6a37a':
  releasetools: Fix parameters for vboot_signer
2015-08-10 19:34:16 +00:00
Furquan Shaikh
9f5c487ef5 Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev 2015-08-10 19:27:36 +00:00
Furquan Shaikh
852b8de43f releasetools: Fix parameters for vboot_signer
With the change in vboot_signer (CL:744257), an additional parameter
is required to vboot_signer script. This change adds the required
parameter to releasetools as well.

BUG=23076037

Change-Id: Ice5329578b3a9bc459e278a9d404a1981b35ca88
Signed-off-by: Furquan Shaikh <furquan@google.com>
2015-08-10 11:43:45 -07:00
Furquan Shaikh
c4904316ad am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
* commit 'ffe86de5d04ad7a71c2d48478d85b39db5c441eb':
  vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:31:32 +00:00
Furquan Shaikh
ffe86de5d0 Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev 2015-08-09 08:38:07 +00:00