Ian Pedowitz
301d87850e
Revert "Setting PLATFORM_VERSION(_CODENAME)? to O for master"
...
This reverts commit 1a737095c1
.
Bug: 28713307
Bug: 28767393
Change-Id: I355e7e6b9c785f7ca92d13eea7730449cfe80653
2016-05-18 22:06:51 +00:00
Ian Pedowitz
1a737095c1
Setting PLATFORM_VERSION(_CODENAME)? to O for master
...
Change-Id: Ie1385085be01bb8cae6f088e886d680b86e50993
2016-05-12 12:29:22 -07:00
Ian Pedowitz
fff3aa9ed7
Merge "Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
am: 4df6466c0d" into nyc-mr1-dev-plus-aosp
...
am: fdbd499e24
* commit 'fdbd499e24af27f62200c8218a01cd83a5e215b8':
Change-Id: I82b180c7b873734b76a6a8f7a6692fea369518bb
2016-05-12 19:06:32 +00:00
Ian Pedowitz
86a10607b1
Merge "Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
am: 4df6466c0d" into nyc-mr1-dev-plus-aosp
...
am: d9f273fdb9
* commit 'd9f273fdb92d83a603d0de1c0b0bf60042ca6b76':
Change-Id: I3908703c270ba27e2c558c93a3277424aac890df
2016-05-12 19:06:32 +00:00
Ian Pedowitz
56953dfecc
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
am: 5363df9efa
...
am: 6447479103
* commit '6447479103d732f084b7e8f050580e317dcd5040':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: I9e666bda47dec2066588d6d7b974655f65dc5f6e
2016-05-12 19:06:31 +00:00
Android Build Merger (Role)
fdbd499e24
Merge "Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
am: 4df6466c0d" into nyc-mr1-dev-plus-aosp
2016-05-12 19:04:52 +00:00
Ian Pedowitz
d760d1c58a
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
...
am: 4df6466c0d
* commit '4df6466c0df4ce5caa3de49171c376da408e4044':
Change-Id: If6bdb07248a7fcce218d3c3cb2a122001e345a0c
2016-05-12 19:04:43 +00:00
Android Build Merger (Role)
d9f273fdb9
Merge "Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
am: 4df6466c0d" into nyc-mr1-dev-plus-aosp
2016-05-12 19:04:07 +00:00
Ian Pedowitz
2a8102abc7
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
...
am: 4df6466c0d
* commit '4df6466c0df4ce5caa3de49171c376da408e4044':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: I7e0631ed3194dd9889df1752c6de259af5516583
2016-05-12 19:03:54 +00:00
Ian Pedowitz
6447479103
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
...
am: 5363df9efa
* commit '5363df9efa02e3fa593ca5ef545335f44c63458b':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: Ief6b412b41ba0f7d81bcb6dc389178b58ff7252a
2016-05-12 19:03:53 +00:00
Ian Pedowitz
4df6466c0d
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
...
am: 77df46efec
* commit '77df46efec7996325cbdb17b67bcecbbe88bfa6b':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: I463332a4a8e3113749de2a0179c086f45a07c7a3
2016-05-12 19:01:17 +00:00
Ian Pedowitz
5363df9efa
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
...
am: 77df46efec
* commit '77df46efec7996325cbdb17b67bcecbbe88bfa6b':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: I8a7d147837e098b05afd1c098883c53a0dcbce5c
2016-05-12 19:01:17 +00:00
Ian Pedowitz
77df46efec
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
2016-05-12 18:58:17 +00:00
Alex Klyubin
ec76808f1e
Merge "Offer an ApkSignerEngine implementation." am: 6975f03fd8
am: 2c7da1d5c7
am: 7b9641d153
...
am: b1296964a4
* commit 'b1296964a42ab22930da925eb95ba36375b502ec':
Offer an ApkSignerEngine implementation.
Change-Id: I414f7ce6c8e94b51e4fc11c2d182c22b106c249e
2016-05-12 18:53:40 +00:00
Alex Klyubin
b1296964a4
Merge "Offer an ApkSignerEngine implementation." am: 6975f03fd8
am: 2c7da1d5c7
...
am: 7b9641d153
* commit '7b9641d1538ff127ad0e65669101f2c52f232cb1':
Offer an ApkSignerEngine implementation.
Change-Id: I91b6d42e294cf5f2413a5769ec17e31538bff685
2016-05-12 18:51:09 +00:00
Alex Klyubin
7b9641d153
Merge "Offer an ApkSignerEngine implementation." am: 6975f03fd8
...
am: 2c7da1d5c7
* commit '2c7da1d5c7b5c41736b8f0d63530344ce5f691e7':
Offer an ApkSignerEngine implementation.
Change-Id: I6e8f9205476ae95bf65f3a6c3d0c0653a8546ffe
2016-05-12 18:48:30 +00:00
Alex Klyubin
2c7da1d5c7
Merge "Offer an ApkSignerEngine implementation."
...
am: 6975f03fd8
* commit '6975f03fd8b65c294a08ebc40be7da871e9e74d7':
Offer an ApkSignerEngine implementation.
Change-Id: I7ab04e1e9699219bb5204c2b656b47583a399e31
2016-05-12 18:45:58 +00:00
Alex Klyubin
6975f03fd8
Merge "Offer an ApkSignerEngine implementation."
2016-05-12 18:43:08 +00:00
Amanda Kassay
a630d437e1
Merge "Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
am: 494e80cabc
am: b6a7250084
am: 3b135b25d5" into nyc-mr1-dev-plus-aosp
...
am: 5b654b6889
* commit '5b654b6889cbdfbc95fdaf6bf332b340a2cb1f73':
Change-Id: I36ac9d350a32ca6ded1dde761b4b0f487a94d358
2016-05-12 18:40:45 +00:00
Amanda Kassay
c4d0a10585
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
am: 494e80cabc
am: b6a7250084
am: 6c85942f06
...
am: 0c05657f25
* commit '0c05657f2523dd6dcad8603a4191541b6b1d0d87':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I1074750ae1d5d0bdd8536ba758e9975e6a8b1d05
2016-05-12 18:40:44 +00:00
Android Build Merger (Role)
5b654b6889
Merge "Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
am: 494e80cabc
am: b6a7250084
am: 3b135b25d5" into nyc-mr1-dev-plus-aosp
2016-05-12 18:38:19 +00:00
Amanda Kassay
0c05657f25
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
am: 494e80cabc
am: b6a7250084
...
am: 6c85942f06
* commit '6c85942f06c2028865b6902220482a9b4c0eb36e':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I5ef4ce4b0de35918d8604d3d4d321a27ceaea042
2016-05-12 18:38:07 +00:00
Amanda Kassay
4eba2b82ad
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
am: 494e80cabc
am: b6a7250084
...
am: 3b135b25d5
* commit '3b135b25d5975ad2473c71daeb0570ebd24bf83a':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I90dca0cdbc75301f886a8cae260650aeccdc0d92
2016-05-12 18:38:07 +00:00
Amanda Kassay
6c85942f06
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
am: 494e80cabc
...
am: b6a7250084
* commit 'b6a7250084c5616bd0f16e50bf6aba402a552d87':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I0e869cba22ea840ae5a6366c2731136a694ad433
2016-05-12 18:35:34 +00:00
Amanda Kassay
3b135b25d5
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
am: 494e80cabc
...
am: b6a7250084
* commit 'b6a7250084c5616bd0f16e50bf6aba402a552d87':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I0cb3a9d072c4239e07869ef3d6e1086eb25b55d4
2016-05-12 18:35:34 +00:00
Amanda Kassay
b6a7250084
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
...
am: 494e80cabc
* commit '494e80cabcec97f4052ca15bd1eb8968e7910c35':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I332c0b7c12686e868fe24404aecc8966cdcf6f5d
2016-05-12 18:32:29 +00:00
Amanda Kassay
494e80cabc
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
...
am: 7387b5861b
* commit '7387b5861b61d22a0c2edffb10611284a6d8fa0b':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I40bb1b50cc1d49dd3113e8511b8fa744acdf27b5
2016-05-12 18:29:57 +00:00
Amanda Kassay
7387b5861b
Removing commented out deprecated download links in sdkpage.cs
...
am: eefc7d441c
* commit 'eefc7d441c2c3b235fdae71853921dffff6da755':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I95145f9fb614fc875fcffbccfa24f176160138f7
2016-05-12 18:27:28 +00:00
Ian Pedowitz
721a6c0465
Merge "Setting PLATFORM_VERSION(_CODENAME)? to NMR1" into nyc-mr1-dev am: 22a719477d
...
am: 58741e92cf
* commit '58741e92cf0e8173715b70275d63cbb471c91866':
Setting PLATFORM_VERSION(_CODENAME)? to NMR1
Change-Id: I8b738c9a001dcb159dc14e44add5add464d6379b
2016-05-12 18:22:31 +00:00
Ian Pedowitz
58741e92cf
Merge "Setting PLATFORM_VERSION(_CODENAME)? to NMR1" into nyc-mr1-dev
...
am: 22a719477d
* commit '22a719477d62ca07e975894936fad8583e2cae6a':
Setting PLATFORM_VERSION(_CODENAME)? to NMR1
Change-Id: I015fb78d54ff50e8f972f010ef0c340bde412900
2016-05-12 18:18:44 +00:00
Amanda Kassay
eefc7d441c
Removing commented out deprecated download links in sdkpage.cs
...
Change-Id: Iad26e72120b110fa017821be887de0cd07b3889a
2016-05-12 14:17:41 -04:00
Kirill Grouchnikov
983342451b
Merge "Extracting fragments and widgets into their own modules."
2016-05-12 18:13:57 +00:00
TreeHugger Robot
22a719477d
Merge "Setting PLATFORM_VERSION(_CODENAME)? to NMR1" into nyc-mr1-dev
2016-05-12 18:07:02 +00:00
Alex Klyubin
e305f45f00
Offer an ApkSignerEngine implementation.
...
This adds an implementation of ApkSignerEngine to the apksigner-core
library.
Bug: 27461702
Change-Id: I5f977b98555ca507a0dfcd3e92eecb9758aa8370
2016-05-12 10:56:06 -07:00
Ian Pedowitz
8313541c65
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
...
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -07:00
Joe Fernandez
f8d67a84ea
Merge "docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6
am: 5b61e4cb61
am: b5ec3948f9" into nyc-mr1-dev-plus-aosp
...
am: c7e7715369
* commit 'c7e7715369c23ba1b4125ff044e7bb2a5b9b66d3':
Change-Id: I132e456496500fbb6707e5432fc8a2880131263c
2016-05-12 06:42:27 +00:00
Joe Fernandez
95822e1d2e
docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6
am: 5b61e4cb61
am: 55de143a1d
...
am: 0ee5c38e45
* commit '0ee5c38e45daddad1df085daa34cca319d4e6351':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: Iac4ff64c844fee5534447ce6df30dbb56d3ebfeb
2016-05-12 06:42:26 +00:00
Android Build Merger (Role)
c7e7715369
Merge "docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6
am: 5b61e4cb61
am: b5ec3948f9" into nyc-mr1-dev-plus-aosp
2016-05-12 06:40:03 +00:00
Joe Fernandez
0ee5c38e45
docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6
am: 5b61e4cb61
...
am: 55de143a1d
* commit '55de143a1dbcbc7bd0ce27ec15f74a267c6eaa60':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: I321c0e9560cc9e8dee0e10a8f6ff229f79fcc09b
2016-05-12 06:39:50 +00:00
Joe Fernandez
2fcbf4cf21
docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6
am: 5b61e4cb61
...
am: b5ec3948f9
* commit 'b5ec3948f9b01f546abd1272f2f761936c41e499':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: I09dadb45a8d2045a50dd90c86e94ce88ab776624
2016-05-12 06:39:50 +00:00
Joe Fernandez
b5ec3948f9
docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6
...
am: 5b61e4cb61
* commit '5b61e4cb6109bf2435f9231f3c0d0368ab912599':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: Ifac77b8621bebf82a3ea2121878bdce15fce46a1
2016-05-12 06:37:21 +00:00
Joe Fernandez
55de143a1d
docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6
...
am: 5b61e4cb61
* commit '5b61e4cb6109bf2435f9231f3c0d0368ab912599':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: I580b5a416bc1913f4c4f5ce962fb067b04777b06
2016-05-12 06:37:21 +00:00
Joe Fernandez
5b61e4cb61
docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
...
am: 10719438d6
* commit '10719438d6faaa1fea500057e211b2d88faf6d74':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: If17971766425bc5fbba0e9860d611ea043d6b8dd
2016-05-12 06:34:58 +00:00
Joe Fernandez
10719438d6
docs: Wear Preview - TOC and Resource card fixes for DoDS
...
am: 151592490e
* commit '151592490e22253eeb5355bd2861c56c80ecf437':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: I2e8521069969baaa1696adbef2f4cb901b636fb9
2016-05-12 06:32:49 +00:00
Joe Fernandez
151592490e
docs: Wear Preview - TOC and Resource card fixes for DoDS
...
b/28004352
Change-Id: Iff222f71508c21e0b35a3d41c846c062755605cd
2016-05-11 23:07:26 -07:00
Shinichiro Hamaji
ebcda8ecdc
Merge "Correct some dependencies around zip packages" am: b6f2c8fac8
am: eac63ed087
am: b9179f9886
...
am: 822759ae7c
* commit '822759ae7c48dbdb56bbd9f6aacf24f7af7b052f':
Correct some dependencies around zip packages
Change-Id: I4d65515b83e37b1d17d2d31ea4d5a684d64a2c3b
2016-05-12 02:37:00 +00:00
Shinichiro Hamaji
822759ae7c
Merge "Correct some dependencies around zip packages" am: b6f2c8fac8
am: eac63ed087
...
am: b9179f9886
* commit 'b9179f9886db95ab620cc0b7fa1b59d35e563f79':
Correct some dependencies around zip packages
Change-Id: Ie4334a75a8db0acad360f58bcdafad942407afd9
2016-05-12 02:29:23 +00:00
Shinichiro Hamaji
b9179f9886
Merge "Correct some dependencies around zip packages" am: b6f2c8fac8
...
am: eac63ed087
* commit 'eac63ed087e7e84a80ddc6c45d2f21bfae5617b0':
Correct some dependencies around zip packages
Change-Id: I783119bdce2044473c96c680cd035d131604dc94
2016-05-12 02:23:45 +00:00
Shinichiro Hamaji
eac63ed087
Merge "Correct some dependencies around zip packages"
...
am: b6f2c8fac8
* commit 'b6f2c8fac8246ed7e6a1d25bf9cc0e658504813a':
Correct some dependencies around zip packages
Change-Id: I59e2597e955e69a35edbd0fa13bb1eb4d076b456
2016-05-12 02:20:36 +00:00
Shinichiro Hamaji
b6f2c8fac8
Merge "Correct some dependencies around zip packages"
2016-05-12 02:06:42 +00:00