Commit Graph

265876 Commits

Author SHA1 Message Date
Svetoslav Ganov
42e2bfc4c3 Merge "Add historical logging to settings provider" into nyc-mr1-dev am: 060f882035
am: e862b1840f

Change-Id: Iadcd508d6d6cd4c1b533585599fff711f356d94c
2016-08-04 01:43:21 +00:00
Svetoslav Ganov
6ad9366b74 Add historical logging to settings provider am: a340bfd7a1
am: ba92753043

Change-Id: Ic365c69b2bb76dff17dd6c8b932f017c27c53d4f
2016-08-04 01:43:18 +00:00
Android Build Merger (Role)
865cef09c4 Merge "docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: ad27cac28c" into nyc-mr1-dev-plus-aosp 2016-08-04 01:36:40 +00:00
Kevin Hufnagle
66e051ce8d docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f
am: ad27cac28c

Change-Id: Ic47cb1582c321790c1f133b6891edf108e0ff7f9
2016-08-04 01:36:19 +00:00
Android Build Merger (Role)
0d6bde82a5 Merge "Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85 am: 6ad22ca614 am: 7eb5e15459" into nyc-mr1-dev-plus-aosp 2016-08-04 01:35:20 +00:00
Android Build Merger (Role)
dfa97d4711 Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am: 337279df50 am: 55b6d40215" into nyc-mr1-dev-plus-aosp 2016-08-04 01:35:11 +00:00
Android Build Merger (Role)
b40d6877c0 Merge changes from topic 'am-c108b2f6ac234d638df065776c23ed18' into nyc-mr1-dev-plus-aosp
* changes:
  Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28 am: 0af74fa732 am: f87e25cabe
  docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772 am: 299098b825
  docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f am: ebd455b077 am: 292d4ff1ce
2016-08-04 01:34:57 +00:00
Joe Fernandez
8009d034b7 Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85 am: 6ad22ca614
am: 7eb5e15459

Change-Id: I4bd5d4fc914f63acfcfd294c6fab4b5a85b9839e
2016-08-04 01:33:56 +00:00
Joe Fernandez
cc9afc861b cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am: 337279df50
am: 55b6d40215

Change-Id: I7a1b0fc5f19962e77754f07d86585ce37dffff76
2016-08-04 01:33:54 +00:00
Kevin Hufnagle
d2b02dd32b Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28 am: 0af74fa732
am: f87e25cabe

Change-Id: If66d312784fba90abf29992d90e3e186a8a824ab
2016-08-04 01:33:52 +00:00
Kevin Hufnagle
b6fdd3ac1e docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772
am: 299098b825

Change-Id: I54a7bda745f3dde7f9bc4dc305bdaf6028feb4d5
2016-08-04 01:33:24 +00:00
Kevin Hufnagle
758b462d53 docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f am: ebd455b077
am: 292d4ff1ce

Change-Id: I31a501ad62aa18a1323d260f6965ac0fbe1d9069
2016-08-04 01:32:56 +00:00
Svetoslav Ganov
e862b1840f Merge "Add historical logging to settings provider" into nyc-mr1-dev
am: 060f882035

Change-Id: I8e7734958e2915d157804296fb1d947b45f77926
2016-08-04 01:32:45 +00:00
Svetoslav Ganov
ba92753043 Add historical logging to settings provider
am: a340bfd7a1

Change-Id: Ifc8b6fb4c109e570f2698c27e3c1dba74da300ef
2016-08-04 01:32:43 +00:00
Joe Fernandez
f74dc4be62 resolve merge conflicts of b29a938c to nyc-dev am: 473738d6d3 am: 11d8a4c49e
am: 46304d90f2

Change-Id: I5086c40905a92a1b006ae8e9194974d4ed5deda8
2016-08-04 01:32:25 +00:00
Kevin Hufnagle
ad27cac28c docs: Updated wording of callout describing device opt-out options. am: b48909ed52
am: bdbe6fd94f

Change-Id: I0a74e4b1b26a5456e9df547333ddd2e4cf51de20
2016-08-04 01:14:36 +00:00
Joe Fernandez
7eb5e15459 Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85
am: 6ad22ca614

Change-Id: I0325827620ff0e37e65d1ea0c97adeec875de678
2016-08-04 01:05:50 +00:00
Joe Fernandez
55b6d40215 cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462
am: 337279df50

Change-Id: I4652d7267c8796e709dfc82dd9417a8aa704128f
2016-08-04 01:05:47 +00:00
Joe Fernandez
f87e25cabe Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28
am: 0af74fa732

Change-Id: I8e166e01d329bc6ef325958ae0a09029f8eacd2f
2016-08-04 01:05:44 +00:00
Kevin Hufnagle
299098b825 docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621
am: a007a4d772

Change-Id: I136646a94f44386cc39f3d9d7c6f688116a85db0
2016-08-04 01:05:11 +00:00
Kevin Hufnagle
292d4ff1ce docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f
am: ebd455b077

Change-Id: I4f229345b1f8198048dc1eb9a4da9ca0e8f94cc3
2016-08-04 01:04:02 +00:00
Kevin Hufnagle
bdbe6fd94f docs: Updated wording of callout describing device opt-out options.
am: b48909ed52

Change-Id: I120725cdb7304e037bc72da73d56fbf901bfe9aa
2016-08-04 01:03:32 +00:00
Kevin Hufnagle
46304d90f2 resolve merge conflicts of b29a938c to nyc-dev am: 473738d6d3
am: 11d8a4c49e

Change-Id: I904b0fb058a873289f8ca5d712bd8e2ac7d46cb8
2016-08-04 01:03:27 +00:00
Joe Fernandez
6ad22ca614 Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
am: 51a582fa85

Change-Id: I8be83bf47ae26a6bf9d0f812265c91133be40be3
2016-08-04 00:57:22 +00:00
Joe Fernandez
337279df50 cherry-pick from nyc-dev: docs: Add ARC documentation TOC file
am: 712c053462

Change-Id: I113c2c5b9391488eedf743220f6ef4c5ec283d6c
2016-08-04 00:57:20 +00:00
Kevin Hufnagle
0af74fa732 Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
am: d6f1d8ea28

Change-Id: I222fa49789c2f2baac7ff2296617052c9924a328
2016-08-04 00:57:16 +00:00
Kevin Hufnagle
a007a4d772 docs: Migrated "Android Runtime on Chrome" pages to DAC
am: 684d849621

Change-Id: Ic5e11fdcd44ce86f901cc22954192d79283bca93
2016-08-04 00:57:14 +00:00
Svetoslav Ganov
060f882035 Merge "Add historical logging to settings provider" into nyc-mr1-dev 2016-08-04 00:57:10 +00:00
Kevin Hufnagle
ebd455b077 docs: Added page on DAC describing ARC manifest file considerations.
am: 178caa888f

Change-Id: I68b8395dc90245ac7db6892f86b036d2b88ad96e
2016-08-04 00:56:42 +00:00
Joe Fernandez
11d8a4c49e resolve merge conflicts of b29a938c to nyc-dev
am: 473738d6d3

Change-Id: I49bf89f5ed1696ec85c6b15559a97df2a9bcae04
2016-08-04 00:56:39 +00:00
Kevin Hufnagle
f0f548f923 resolve merge conflicts of b29a938c to nyc-dev am: 473738d6d3
am: 0ab145df22

Change-Id: I8c1fd98a0e6bb321928980e0d6be6a9c8ce67951
2016-08-04 00:49:30 +00:00
Joe Fernandez
0ab145df22 resolve merge conflicts of b29a938c to nyc-dev
am: 473738d6d3

Change-Id: I4691daf7c5fac223afa133f15637c01c72194216
2016-08-04 00:45:09 +00:00
Kevin Hufnagle
b48909ed52 docs: Updated wording of callout describing device opt-out options.
Bug: 30204612
Change-Id: I80b0a6840da6ca7310e626cec66717c3e1372403
2016-08-03 17:38:27 -07:00
Adam Lesinski
2feb69d428 Merge "ResourcesManager: Return null on failure to create Resources" into nyc-mr1-dev am: 1584d5d6e2
am: e26de2d02c

Change-Id: I78854d97b2d53cff5b9ad610faff710bf9df0c6e
2016-08-04 00:28:22 +00:00
Adam Lesinski
cf42572c3c ResourcesManager: Return null on failure to create Resources am: 53fafdfbe7
am: dc477a9e6c

Change-Id: I6eee09bf6911b0e885a833feb864f9bbcb053b84
2016-08-04 00:28:18 +00:00
Adam Lesinski
e26de2d02c Merge "ResourcesManager: Return null on failure to create Resources" into nyc-mr1-dev
am: 1584d5d6e2

Change-Id: I9622a35e22baa4f0204527948e967a2de9ba969b
2016-08-04 00:19:28 +00:00
Adam Lesinski
dc477a9e6c ResourcesManager: Return null on failure to create Resources
am: 53fafdfbe7

Change-Id: I47c891d2c21c2ba95cc05d4972332ea128b2d444
2016-08-04 00:19:23 +00:00
Jakub Pawlowski
9dd9e1a635 Merge "Remove write type from GATT descriptor writes (1/4)" am: b7eb1d7eaf am: 0aa5797976
am: ed042c00e0

Change-Id: I524d324c44f545989cd10a79143928ad57f8332d
2016-08-04 00:19:14 +00:00
Kevin Hufnagle
473738d6d3 resolve merge conflicts of b29a938c to nyc-dev
Change-Id: I840d069b8ffab03b0a7c1fc73ba7eae485c80abb
2016-08-03 17:18:15 -07:00
Jakub Pawlowski
ed042c00e0 Merge "Remove write type from GATT descriptor writes (1/4)" am: b7eb1d7eaf
am: 0aa5797976

Change-Id: I7131629944d7a2569440ced1e48900ec5ff883d7
2016-08-04 00:12:46 +00:00
TreeHugger Robot
1584d5d6e2 Merge "ResourcesManager: Return null on failure to create Resources" into nyc-mr1-dev 2016-08-04 00:08:21 +00:00
Android Build Merger (Role)
8628bbc5e0 Merge changes from topic 'am-b2b498ad339f46b6b041f9498a05fda7' into nyc-mr1-dev-plus-aosp
* changes:
  Merge "docs: Add ARC documentation TOC file" into nyc-dev am: 7eb9f10fec am: ed500356fa am: d6c7900ef2
  docs: Add ARC documentation TOC file am: a117b34777 am: 60e9bc98f9 am: 66240de870
  Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev am: 4c273d1ffe am: 41ab38815a am: 92d27ae256
  docs: Added page on DAC describing ARC manifest file considerations. am: 97a3d3c3a6 am: 9f9f99427d am: fa27a744f5
  Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev am: 369246377a am: 5433326763 am: fccf24e08d
  docs: Migrated "Android Runtime on Chrome" pages to DAC am: 9cd48bb447 am: f18cb6894a am: 49edadf3ef
2016-08-04 00:07:45 +00:00
Joe Fernandez
eb5a8b7fa4 Merge "docs: Add ARC documentation TOC file" into nyc-dev am: 7eb9f10fec am: ed500356fa
am: d6c7900ef2

Change-Id: Iad434fc0b8c57907928c789484bf5971b5d48d0a
2016-08-04 00:06:05 +00:00
Joe Fernandez
ec7a2df2b5 Merge "docs: Add ARC documentation TOC file" into nyc-dev am: 7eb9f10fec
am: c6a3cd82d2

Change-Id: I2d4c1e10d5f6cf81647de3a81a39569b0285e8e9
2016-08-04 00:05:24 +00:00
Joe Fernandez
9580e49238 docs: Add ARC documentation TOC file am: a117b34777 am: 60e9bc98f9
am: 66240de870

Change-Id: I3d740f9d8b255695ec318d1d825890f9f632e718
2016-08-04 00:04:57 +00:00
Joe Fernandez
b6d5de802b docs: Add ARC documentation TOC file am: a117b34777
am: e6fc34f21b

Change-Id: I7e3a3650a11ea1e3e47ec09dd35cdb40d59ada83
2016-08-04 00:04:44 +00:00
Kevin Hufnagle
8e1c33980c Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev am: 4c273d1ffe am: 41ab38815a
am: 92d27ae256

Change-Id: Id537a8f01250084051a0d4087a4d40767163054c
2016-08-04 00:04:27 +00:00
Joe Fernandez
bce54203f4 Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev am: 4c273d1ffe
am: 447c34dd1d

Change-Id: I43ec83f2eed9efc21d592a699fb8c5446bc8f16d
2016-08-04 00:04:16 +00:00
Kevin Hufnagle
bc1b4d2f09 docs: Added page on DAC describing ARC manifest file considerations. am: 97a3d3c3a6 am: 9f9f99427d
am: fa27a744f5

Change-Id: I03cd0526fe18cb46b8359e1e10cad6f4fde261ae
2016-08-04 00:03:56 +00:00
Kevin Hufnagle
0a5002e73d docs: Added page on DAC describing ARC manifest file considerations. am: 97a3d3c3a6
am: cbffa2b67a

Change-Id: Id5096f7cb8e7b975744c6d9c86d632bfdcf4a3b8
2016-08-04 00:03:47 +00:00