git.osdn.net Git - android-x86/build.git/log

Adam Seaton [Wed, 21 Sep 2016 18:33:04 +0000 (18:33 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8 am: 25019ad31d am: 3ffb2d23c2 am: a983e8e796 am: e8e35c0327 am: 5673cc319b am: 5fd0f92405 am: ceda55a70c am: b1c348827f
am: 514aa651e8

Change-Id: I0d500037f2bfbddfd415bccdda6d72757cf1aebc

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:32:05 +0000 (18:32 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272 am: c184e47cc5 am: 595661f7cb -s ours am: 9655ec5d13 am: e63569c787 am: a97cf974db am: 0ea40f86fe am: 7bdb62e453 am: f48e1e6cb3
am: 1cfca4d3e3

Change-Id: I72374aea3766e30c3f56d9ea2698c56aac397410

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:32:05 +0000 (18:32 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8 am: 25019ad31d am: 3ffb2d23c2 am: a983e8e796 am: e8e35c0327 am: 5673cc319b am: 5fd0f92405 am: ceda55a70c
am: b1c348827f

Change-Id: Ia8343fb817b7cd07399c41dd702bc83c042e0336

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:28:15 +0000 (18:28 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272 am: c184e47cc5 am: 595661f7cb -s ours am: 9655ec5d13 am: e63569c787 am: a97cf974db am: 0ea40f86fe am: 7bdb62e453
am: f48e1e6cb3

Change-Id: I5842754fd4ae0fe88e86935510b101b92d65547f

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:27:04 +0000 (18:27 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8 am: 25019ad31d am: 3ffb2d23c2 am: a983e8e796 am: e8e35c0327 am: 5673cc319b am: 5fd0f92405
am: ceda55a70c

Change-Id: I2fdef44649c093e248976cb1a99bf08dcec4bf90

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:24:04 +0000 (18:24 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272 am: c184e47cc5 am: 595661f7cb -s ours am: 9655ec5d13 am: e63569c787 am: a97cf974db am: 0ea40f86fe
am: 7bdb62e453

Change-Id: Ibdff0bc717c5da544cf1303c366d9c0187b95f30

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:24:04 +0000 (18:24 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8 am: 25019ad31d am: 3ffb2d23c2 am: a983e8e796 am: e8e35c0327 am: 5673cc319b
am: 5fd0f92405

Change-Id: I673419ace743bdffeb04f671f25a0d8f43594925

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:22:04 +0000 (18:22 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272 am: c184e47cc5 am: 595661f7cb -s ours am: 9655ec5d13 am: e63569c787 am: a97cf974db
am: 0ea40f86fe

Change-Id: I85ff5b04c174b94b4be19f5ba6b3f1ae7c525932

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:22:03 +0000 (18:22 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8 am: 25019ad31d am: 3ffb2d23c2 am: a983e8e796 am: e8e35c0327
am: 5673cc319b

Change-Id: I3c89353174d4c1033e1d8e4935217c888ee0a859

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:19:32 +0000 (18:19 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272 am: c184e47cc5 am: 595661f7cb -s ours am: 9655ec5d13 am: e63569c787
am: a97cf974db

Change-Id: Ia7d56ec19a0c1a9222eaaaae653bd5b9d3554ca7

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:19:32 +0000 (18:19 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8 am: 25019ad31d am: 3ffb2d23c2 am: a983e8e796
am: e8e35c0327

Change-Id: I62c5f469c38faf8565656ac6bf436e20454220dc

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:17:02 +0000 (18:17 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272 am: c184e47cc5 am: 595661f7cb -s ours am: 9655ec5d13
am: e63569c787

Change-Id: If7985374a54fe95592303ee6a81f55c0be9f1b11

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:17:02 +0000 (18:17 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8 am: 25019ad31d am: 3ffb2d23c2
am: a983e8e796

Change-Id: Iad93276510ea4f7742b91e9ca5bfeb7967f53294

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:14:48 +0000 (18:14 +0000)]

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:14:47 +0000 (18:14 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272 am: c184e47cc5 am: 595661f7cb -s ours
am: 9655ec5d13

Change-Id: I10b3ed85f30b7080e4f98b12597962fb593eec2e

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:12:02 +0000 (18:12 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8
am: 25019ad31d

Change-Id: I547d3e7830f4815f0483c236192bd099bef5cc18

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:12:00 +0000 (18:12 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272 am: c184e47cc5
am: 595661f7cb -s ours

Change-Id: Idf6bdb2bc18328522a49974cc52db13b92fc54ea

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:09:31 +0000 (18:09 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68
am: e13d8888a8

Change-Id: I996544a25a9f2c8749039885ce28dfe25c86008f

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:07:00 +0000 (18:07 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b am: d7ae210272
am: c184e47cc5

Change-Id: I262c282ff61013c546b70ce4b026ab8f1f074488

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:07:00 +0000 (18:07 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2
am: 57370e1f68

Change-Id: I38ac268882f035cb3ede21264dc09cb7636b2e6d

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:04:29 +0000 (18:04 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e am: dafa9bc77b
am: d7ae210272

Change-Id: I03667caf5a56aad45375984eafd56520f1c4e881

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:04:29 +0000 (18:04 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1
am: 0f9242c4d2

Change-Id: Ib0f308deca6d9cb6f25a8c0b2ad710676a936f49

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:02:15 +0000 (18:02 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72 am: 4fd819741e
am: dafa9bc77b

Change-Id: I84eb63c40130faa756e3de022de1a2c4467a6b85

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 18:01:58 +0000 (18:01 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1
am: fcc6e603c1

Change-Id: I0f514c2c0eaaac94140b8cdc8407478abc606c35

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:59:49 +0000 (17:59 +0000)]

Merge changes I1489eaf6,I8ee8f978 into nyc-dev am: 575add3bcf am: 7706e91d8f
am: a871b53ff3

Change-Id: I7378a18b0dfa4bfd09e3c0c7729e468f0340402a

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:59:41 +0000 (17:59 +0000)]

Updating security string to 2016-11-05 on nyc-dev am: 002132648d am: a6071948d8
am: a947d89f1d

Change-Id: I58cc080f9cbba79d25e280e81e92dbcda66932eb

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c am: bf8a1cef72
am: 4fd819741e

Change-Id: I309c174e2924614dd3197f33eff36063e9acc21a

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev
am: e5ecc61cf1

Change-Id: I6cabebaf6f5e39faf4bf0417eb7e88479d96947a

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]

Updating Security String to 2016-11-01 on nyc-dev am: 2a00b24144 am: 7d01908b3b
am: 8bd50bc352

Change-Id: I8249d2ab2419f53e3ef6e3fdb1c339eaed599f2c

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:57:17 +0000 (17:57 +0000)]

Merge changes I1489eaf6,I8ee8f978 into nyc-dev am: 575add3bcf
am: 7706e91d8f

Change-Id: I046a6fd53782e965e39a5a43ab0ea151794a1aeb

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:57:11 +0000 (17:57 +0000)]

Updating security string to 2016-11-05 on nyc-dev am: 002132648d
am: a6071948d8

Change-Id: Ibc68e2151af405be2dbc289001120cf58581ca85

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:56:59 +0000 (17:56 +0000)]

Update Security String to 2016-11-01 b/31618336 am: 2a03720e6c
am: bf8a1cef72

Change-Id: I9f4709ddb9a9aec34efa4134d9cf652d8de81177

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:56:57 +0000 (17:56 +0000)]

Updating Security String to 2016-11-01 on nyc-dev am: 2a00b24144
am: 7d01908b3b

Change-Id: Id8ef2a01e23440ced1cfd8f91f78dabee4f7ad7b

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:55:13 +0000 (17:55 +0000)]

Merge changes I1489eaf6,I8ee8f978 into nyc-dev
am: 575add3bcf

Change-Id: Ife706192b6acf1bf2d76b5c0f866ae7d417027d7

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:55:12 +0000 (17:55 +0000)]

Updating security string to 2016-11-05 on nyc-dev
am: 002132648d

Change-Id: I35cd90ba6f03e44b7a0197c557c5a348eb013620

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:54:28 +0000 (17:54 +0000)]

Update Security String to 2016-11-01 b/31618336
am: 2a03720e6c

Change-Id: I0991ac69c8effc6d263c051567b6111fd0416e65

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:51:41 +0000 (17:51 +0000)]

Updating Security String to 2016-11-01 on nyc-dev
am: 2a00b24144

Change-Id: Iaec891cdaecc040a815e89c3e33623b21e12100b

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:50:21 +0000 (17:50 +0000)]

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev

commit | commitdiff | tree

Adam Seaton [Wed, 21 Sep 2016 17:47:06 +0000 (17:47 +0000)]

Merge changes I1489eaf6,I8ee8f978 into nyc-dev

* changes:
Updating security string to 2016-11-05 on nyc-dev
Updating Security String to 2016-11-01 on nyc-dev

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 23:01:43 +0000 (23:01 +0000)]

Updating Security String to 2016-11-05 on mnc-dev b/31618336 am: dcfd738833 am: fac5535f75 am: 405437474b am: 4afc7d56eb -s ours am: 1ddbc7984a am: 7f144ed805
am: 96b6c93f1e

Change-Id: Id3a4742f4934864d8c1eeb2a8a5943c5d1363ef1

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:58:44 +0000 (22:58 +0000)]

Updating Security String to 2016-11-05 on mnc-dev b/31618336 am: dcfd738833 am: fac5535f75 am: 405437474b am: 4afc7d56eb -s ours am: 1ddbc7984a
am: 7f144ed805

Change-Id: I27ca0a0f9b2a5f7ecc3e09701f12121cfc1a937a

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:56:57 +0000 (22:56 +0000)]

Updating Security String to 2016-11-05 on mnc-dev b/31618336 am: dcfd738833 am: fac5535f75 am: 405437474b am: 4afc7d56eb -s ours
am: 1ddbc7984a

Change-Id: Ib6d5bb3497d951a69f42df5d9660a8ff1b5258d1

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:56:14 +0000 (22:56 +0000)]

Updating Security String to 2016-11-01 on mnc-dev b/31618336 am: 62b28398ba am: f3b89d8392 am: 9ccd48f7d1 am: 8720071b96 -s ours am: d5e90e9fa3 am: 9f95ef9fc9
am: 535efb4464

Change-Id: I7e3488e8996d7f82fd0d542127f8e990e8f17353

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:53:43 +0000 (22:53 +0000)]

Updating Security String to 2016-11-01 on mnc-dev b/31618336 am: 62b28398ba am: f3b89d8392 am: 9ccd48f7d1 am: 8720071b96 -s ours am: d5e90e9fa3
am: 9f95ef9fc9

Change-Id: I067df69555121a39c44c1a0cca1d253f148aa0bc

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:53:42 +0000 (22:53 +0000)]

Updating Security String to 2016-11-05 on mnc-dev b/31618336 am: dcfd738833 am: fac5535f75 am: 405437474b
am: 4afc7d56eb -s ours

Change-Id: I254e7b694e8be596854e15cdd56dc3f26794b3a0

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:51:12 +0000 (22:51 +0000)]

Updating Security String to 2016-11-01 on mnc-dev b/31618336 am: 62b28398ba am: f3b89d8392 am: 9ccd48f7d1 am: 8720071b96 -s ours
am: d5e90e9fa3

Change-Id: I117a415131b8471eeac4c80a7a500f0f89d84fdf

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:48:41 +0000 (15:48 -0700)]

Updating security string to 2016-11-05 on nyc-dev

b/31618336

Change-Id: I1489eaf64c59dc0f175eb9220a900c68e262b3dd

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:48:40 +0000 (22:48 +0000)]

Updating Security String to 2016-11-01 on mnc-dev b/31618336 am: 62b28398ba am: f3b89d8392 am: 9ccd48f7d1
am: 8720071b96 -s ours

Change-Id: If082fc1b10dcbe9cb83320d086a2f0c336171f0e

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:47:16 +0000 (15:47 -0700)]

Updating Security String to 2016-11-01 on nyc-dev

b/31618336

Change-Id: I8ee8f978fbbf30efb1abca85cf374fc440a1baf7

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:38:43 +0000 (22:38 +0000)]

Updating Security String to 2016-11-05 on mnc-dev b/31618336 am: dcfd738833 am: fac5535f75
am: 405437474b

Change-Id: Iefac549d3a988284b88653120c7469e278e95cd4

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:38:39 +0000 (22:38 +0000)]

Updating Security String to 2016-11-01 on mnc-dev b/31618336 am: 62b28398ba am: f3b89d8392
am: 9ccd48f7d1

Change-Id: I79e6fa0c2a6b026487bc1be8c51194ddd013f717

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:36:19 +0000 (22:36 +0000)]

Updating Security String to 2016-11-05 on mnc-dev b/31618336 am: dcfd738833
am: fac5535f75

Change-Id: I8204ecf14fc6605265b46c28916eca6ede9858ae

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:36:09 +0000 (22:36 +0000)]

Updating Security String to 2016-11-01 on mnc-dev b/31618336 am: 62b28398ba
am: f3b89d8392

Change-Id: Ic3ad8fe00b74ab5b0ec7dc255366569e286565d8

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:33:15 +0000 (22:33 +0000)]

Updating Security String to 2016-11-05 on mnc-dev b/31618336
am: dcfd738833

Change-Id: I773c8e574286057cb8f33413c027276023fb32da

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 22:33:08 +0000 (22:33 +0000)]

Updating Security String to 2016-11-01 on mnc-dev b/31618336
am: 62b28398ba

Change-Id: I97cbe642d516b08d52c08b4e93ee4090493b1b96

commit | commitdiff | tree

Dan Willemsen [Tue, 20 Sep 2016 18:25:08 +0000 (18:25 +0000)]

Clean up vendor image handling - DO NOT MERGE am: baacc3a7e8
am: 5183cdc3ac

Change-Id: I4023510ce2ab7bd51d2f2f7e2a1ffb311c26d17d

commit | commitdiff | tree

Dan Willemsen [Tue, 20 Sep 2016 18:21:43 +0000 (18:21 +0000)]

Clean up vendor image handling - DO NOT MERGE
am: baacc3a7e8

Change-Id: I6201601cca33fdde4b982fab7cb8bba8d4c6eaf5

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 17:06:50 +0000 (10:06 -0700)]

Updating Security String to 2016-11-05 on mnc-dev
b/31618336

Change-Id: I3c9459553fdc89cacdf74d5e5801871b7192bc51

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 17:03:47 +0000 (10:03 -0700)]

Updating Security String to 2016-11-01 on mnc-dev
b/31618336

Change-Id: I18b3a0d690ab238fcd3cafa65b873ce7432c9c25

commit | commitdiff | tree

Dan Willemsen [Fri, 17 Jun 2016 21:07:37 +0000 (14:07 -0700)]

Clean up vendor image handling - DO NOT MERGE

Standardize symlinking /system/vendor -> /vendor for aosp_* devices,
since some /vendor binaries still use /system/vendor/... paths.

Support using a prebuilt vendor image and including it into all the
normal packaging steps.

Bug: 31545062
Bug: 28987532
Change-Id: I27040e8a8d1df0777e16cd1e3c3a9f1b28695e96

commit | commitdiff | tree

Adam Seaton [Tue, 20 Sep 2016 16:34:22 +0000 (09:34 -0700)]

Update Security String to 2016-11-01
b/31618336

Change-Id: Ib31ba11912f144ff34edb66dc693b92f6fc0c24b

commit | commitdiff | tree

bohu [Wed, 14 Sep 2016 23:32:29 +0000 (23:32 +0000)]

Emulator: increase x86_64 system image size to 2G
am: 67d789a9a5

Change-Id: Ic02d13cb6e01383297522a8948f60aaa1572137d

commit | commitdiff | tree

bohu [Wed, 14 Sep 2016 21:36:42 +0000 (14:36 -0700)]

Emulator: increase x86_64 system image size to 2G

Fix the build on nyc-mr1-emu-dev

Change-Id: Iae5160289c98d045096a9dae9d536df447ca18f7

commit | commitdiff | tree

Alan Viverette [Tue, 13 Sep 2016 02:22:25 +0000 (02:22 +0000)]

Merge "Add transition support library to docs path to fix build" into nyc-mr1-dev
am: 50c3f3e618

Change-Id: I51d674b7a7412131f6b132888fe51cbed86f921e

commit | commitdiff | tree

Alan Viverette [Tue, 13 Sep 2016 02:22:17 +0000 (02:22 +0000)]

Add transition support library to docs path to fix build
am: 9c535433df

Change-Id: I432a666e4a1c8d62ec5bb7414f2b2c90efd79892

commit | commitdiff | tree

TreeHugger Robot [Tue, 13 Sep 2016 02:15:30 +0000 (02:15 +0000)]

Merge "Add transition support library to docs path to fix build" into nyc-mr1-dev

commit | commitdiff | tree

Dan Stoza [Mon, 12 Sep 2016 17:49:53 +0000 (17:49 +0000)]

Merge "Remove DispSync default value/docs" into nyc-mr1-dev
am: ff0fd30f88

Change-Id: Ic068ffb596793653ee4b0091f561489312a3b37c

commit | commitdiff | tree

Dan Stoza [Mon, 12 Sep 2016 17:48:15 +0000 (17:48 +0000)]

Remove DispSync default value/docs
am: ae5e550f81

Change-Id: I0d596a0fed1cf454110ce9e39891be5a6b2c87d2

commit | commitdiff | tree

Dan Stoza [Mon, 12 Sep 2016 17:37:52 +0000 (17:37 +0000)]

Merge "Remove DispSync default value/docs" into nyc-mr1-dev

commit | commitdiff | tree

Scott Main [Sat, 10 Sep 2016 01:37:52 +0000 (01:37 +0000)]

Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d am: be56d3b2b2
am: 01fd07b19d

Change-Id: Ie3703fbba98d9b63b8943a91765f8c3babc2b636

commit | commitdiff | tree

smain@google.com [Sat, 10 Sep 2016 01:37:51 +0000 (01:37 +0000)]

add support for constraint layout's DATA list am: 7055897faa am: 210083ab97
am: 6fee24869b

Change-Id: I422c3feb38337c2426eec264fca0c35a3b99d6ae

commit | commitdiff | tree

Scott Main [Sat, 10 Sep 2016 01:35:21 +0000 (01:35 +0000)]

Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
am: be56d3b2b2

Change-Id: Ie3b6e3504cd6d45e8214e7a688a3f1c5d12100e5

commit | commitdiff | tree

smain@google.com [Sat, 10 Sep 2016 01:35:21 +0000 (01:35 +0000)]

add support for constraint layout's DATA list am: 7055897faa
am: 210083ab97

Change-Id: Ic55ead4d5ceda3c937a62fd1b82c35b6de60af63

commit | commitdiff | tree

Scott Main [Sat, 10 Sep 2016 01:32:55 +0000 (01:32 +0000)]

Merge "add support for constraint layout's DATA list" into nyc-dev
am: 64bd41ff7d

Change-Id: I93e87b680a6bba3d90de2ef4f8f16bc02afb33ab

commit | commitdiff | tree

smain@google.com [Sat, 10 Sep 2016 01:32:24 +0000 (01:32 +0000)]

add support for constraint layout's DATA list
am: 7055897faa

Change-Id: I9781454790423d51385094aaa530d994cccb1016

commit | commitdiff | tree

Scott Main [Sat, 10 Sep 2016 01:28:08 +0000 (01:28 +0000)]

Merge "add support for constraint layout's DATA list" into nyc-dev

commit | commitdiff | tree

smain@google.com [Fri, 9 Sep 2016 22:37:47 +0000 (15:37 -0700)]

add support for constraint layout's DATA list

Change-Id: Ia301ad235dcfd5a5c2bb13bfa6daa753f9206800

commit | commitdiff | tree

Dan Stoza [Fri, 9 Sep 2016 20:53:52 +0000 (13:53 -0700)]

Remove DispSync default value/docs

Moves DispSync phase offset default values and documentation to
frameworks/native/services/surfaceflinger/Android.mk.

Bug: 30801895
Change-Id: I44a4355b2d112561b94ccfc6e9c3365885c205ad

commit | commitdiff | tree

Alan Viverette [Fri, 9 Sep 2016 20:39:18 +0000 (16:39 -0400)]

Add transition support library to docs path to fix build

Change-Id: I277df6af728aea4aaa5b10605cf2a6a44c2a246f

commit | commitdiff | tree

smain@google.com [Fri, 2 Sep 2016 21:55:20 +0000 (21:55 +0000)]

delete 'templates-sdk-dev', all these files were merged back into 'templates-sdk' with this CL: https://googleplex-android-review.git.corp.google.com/#/c/1394582/ and this depends on the following CL to update all the doc build targets: https://googleplex-android-review.git.corp.google.com/#/c/1406302/ am: 6c8efecbda am: 21c9005ff1
am: 22f2435e98

Change-Id: Id320eadbf32102a1be1b1ec2fa527ee3aa230cfc

commit | commitdiff | tree

smain@google.com [Fri, 2 Sep 2016 21:42:03 +0000 (21:42 +0000)]

delete 'templates-sdk-dev', all these files were merged back into 'templates-sdk' with this CL: https://googleplex-android-review.git.corp.google.com/#/c/1394582/ and this depends on the following CL to update all the doc build targets: https://googleplex-android-review.git.corp.google.com/#/c/1406302/ am: 6c8efecbda
am: 21c9005ff1

Change-Id: Ie20f642bcbadec94524189f74bb06312fb232bdf

commit | commitdiff | tree

smain@google.com [Fri, 2 Sep 2016 21:36:14 +0000 (21:36 +0000)]

delete 'templates-sdk-dev', all these files were merged back into 'templates-sdk' with this CL: https://googleplex-android-review.git.corp.google.com/#/c/1394582/ and this depends on the following CL to update all the doc build targets: https://googleplex-android-review.git.corp.google.com/#/c/1406302/
am: 6c8efecbda

Change-Id: I4692f455ed30f7cbbb10c40b35718c8a8952b27e

commit | commitdiff | tree

smain@google.com [Fri, 2 Sep 2016 18:02:41 +0000 (11:02 -0700)]

delete 'templates-sdk-dev', all these files were merged
back into 'templates-sdk' with this CL:
https://googleplex-android-review.git.corp.google.com/#/c/1394582/
and this depends on the following CL to update all the doc build targets:
https://googleplex-android-review.git.corp.google.com/#/c/1406302/

Change-Id: Id38134e1d35c5235bb66241c50945b55ac9de1dd

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 22:19:24 +0000 (22:19 +0000)]

Merge all of templates-sdk-dev into templates-sdk. I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/ and then renamed it to templates-sdk/. So this is a clean copy. Once this goes through cleanly, I'll delete templates-sdk-dev/ and update all doc targets to use templates-sdk/. am: 4f3a05a2c6 am: 5c7588bd37
am: 26ded8766f

Change-Id: I92814d1ad60bb0417a3b4d1165dd13924b0e7ad2

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 22:16:24 +0000 (22:16 +0000)]

Merge all of templates-sdk-dev into templates-sdk. I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/ and then renamed it to templates-sdk/. So this is a clean copy. Once this goes through cleanly, I'll delete templates-sdk-dev/ and update all doc targets to use templates-sdk/. am: 4f3a05a2c6
am: 5c7588bd37

Change-Id: I0e32bd45e5c12541b7dd65d25a0f09e04ab052bc

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 22:13:34 +0000 (22:13 +0000)]

Merge all of templates-sdk-dev into templates-sdk. I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/ and then renamed it to templates-sdk/. So this is a clean copy. Once this goes through cleanly, I'll delete templates-sdk-dev/ and update all doc targets to use templates-sdk/.
am: 4f3a05a2c6

Change-Id: I11564954529ed7a1cd1098c66b052190f3d3d6f6

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 18:30:02 +0000 (11:30 -0700)]

Merge all of templates-sdk-dev into templates-sdk.
I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/
and then renamed it to templates-sdk/. So this is a clean copy.
Once this goes through cleanly, I'll delete templates-sdk-dev/ and update
all doc targets to use templates-sdk/.

Change-Id: I276695969e02fcf718370564e84b077a9d43725e

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 15:11:54 +0000 (15:11 +0000)]

delete templates-ds (the original attempt to template docs for devsite) delete templates-sdk-refonly (the "dev branch" for the reference only flag) am: 6d00e69c3f am: e4b21d82eb
am: f1d6b8f2a8

Change-Id: I4597218a0cba21b7a1f6ca4eaebccdc459e107b6

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 15:08:54 +0000 (15:08 +0000)]

delete templates-ds (the original attempt to template docs for devsite) delete templates-sdk-refonly (the "dev branch" for the reference only flag) am: 6d00e69c3f
am: e4b21d82eb

Change-Id: Icdd4610ccf5cbd2190e2199d5a8a0d56bbc7fa5e

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 15:05:54 +0000 (15:05 +0000)]

delete templates-ds (the original attempt to template docs for devsite) delete templates-sdk-refonly (the "dev branch" for the reference only flag)
am: 6d00e69c3f

Change-Id: Id709e0c519d6a79e45f6865f7fac200762501091

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 20:55:47 +0000 (20:55 +0000)]

Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/" into nyc-dev am: 1b1c5c5ebc am: 18a8c0ce2c
am: 8f6711e757

Change-Id: Ib318c8ffffeb07ab489eb32d2529efbb9f68a98f

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 20:55:43 +0000 (20:55 +0000)]

delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/ am: 42859fae46 am: 618756ab95
am: 6deecc4c35

Change-Id: Ice5d1c76feda0f189f50ecada155ae97f4fc7e8b

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 20:55:41 +0000 (20:55 +0000)]

Merge "update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite" into nyc-dev am: a7e978b6b6 am: f0fe351430
am: 15a31da970

Change-Id: Ia86c52fdbb3031a776d8b1bdfe4c1c63f5952626

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 20:55:41 +0000 (20:55 +0000)]

update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite am: eeeb9b832a am: 7501218e40
am: 9674a9975a

Change-Id: I0d3c5c49c033845f40b581c439ebbde12212e15f

commit | commitdiff | tree

smain@google.com [Mon, 29 Aug 2016 21:49:18 +0000 (14:49 -0700)]

delete templates-ds (the original attempt to template docs for devsite)
delete templates-sdk-refonly (the "dev branch" for the reference only flag)

Change-Id: I73e2760fcca76b7242be9aefa92006df3a555a03

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 20:52:47 +0000 (20:52 +0000)]

Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/" into nyc-dev am: 1b1c5c5ebc
am: 18a8c0ce2c

Change-Id: Ie9ab4865ccac5122c248d1ec2dacd33b7c6d227a

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 20:52:43 +0000 (20:52 +0000)]

delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/ am: 42859fae46
am: 618756ab95

Change-Id: I1612257f35456b60c30efe8af1c71fdaa664287f

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 20:52:41 +0000 (20:52 +0000)]

Merge "update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite" into nyc-dev am: a7e978b6b6
am: f0fe351430

Change-Id: I82bd9af856ba109d63b5c18f95c3615f225ea0c2

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 20:52:40 +0000 (20:52 +0000)]

update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite am: eeeb9b832a
am: 7501218e40

Change-Id: I72333523c78eaa5889656b43f885fda03ce8fd7d

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 20:47:14 +0000 (20:47 +0000)]

Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/" into nyc-dev
am: 1b1c5c5ebc

Change-Id: I9083864cbb23bd0bff4a94ecbe31afcbd88d5f90