OSDN Git Service
Julia Reynolds [Thu, 12 May 2016 16:43:24 +0000 (12:43 -0400)]
resolve merge conflicts of
407c434 to nyc-mr1-dev
Change-Id: I7d4590dc22902dade7a8f81bb1a8321b526a4925
Julia Reynolds [Thu, 12 May 2016 15:32:37 +0000 (15:32 +0000)]
Merge "Logging for QS settings launch." into nyc-dev
Richard Uhler [Thu, 12 May 2016 15:17:37 +0000 (15:17 +0000)]
Merge "Fix --reset argument to \'cmd package compile\'." into nyc-dev
am:
e4a3e5e8f1
* commit '
e4a3e5e8f13c4290e3e4c5667bedcd66ce699e63':
Fix --reset argument to 'cmd package compile'.
Change-Id: I26533be1c9c2dac22b8ff4a5882abc8ded832255
Richard Uhler [Thu, 12 May 2016 15:13:03 +0000 (15:13 +0000)]
Merge "Fix --reset argument to 'cmd package compile'." into nyc-dev
Alan Viverette [Thu, 12 May 2016 15:02:36 +0000 (15:02 +0000)]
Merge "Remove extra logging in DatePicker" into nyc-dev
am:
c952b035b2
* commit '
c952b035b27c858a8d0c794282146f5dd31020e9':
Remove extra logging in DatePicker
Change-Id: I69aa4f977bc8f3d31872f69f735d96188830043e
Alan Viverette [Thu, 12 May 2016 14:57:57 +0000 (14:57 +0000)]
Merge "Remove extra logging in DatePicker" into nyc-dev
Julia Reynolds [Thu, 12 May 2016 14:33:47 +0000 (10:33 -0400)]
Logging for QS settings launch.
Change-Id: Iff8bbb448454c8a82196d292a285827846b28357
Fixes:
28678032
Chris Wren [Thu, 12 May 2016 13:00:45 +0000 (13:00 +0000)]
Merge "document the return type of getImportance" into nyc-dev
am:
3041d49d88
* commit '
3041d49d888cf0732c8aafb88d1d931b696b1d41':
document the return type of getImportance
Change-Id: I3cf45be03a8e62ca48d25d26b9b234bb9f800146
Chris Wren [Thu, 12 May 2016 12:53:50 +0000 (12:53 +0000)]
Merge "document the return type of getImportance" into nyc-dev
Jaewan Kim [Thu, 12 May 2016 12:35:42 +0000 (12:35 +0000)]
Merge "Fix continous crash in WindowManager in boot" into nyc-dev
am:
927b6be3d9
* commit '
927b6be3d960a42bbc75aacc8dcde792a1d564b4':
Fix continous crash in WindowManager in boot
Change-Id: I6207c320404ff1f0fed5284afe550a9163ea78a7
Jaewan Kim [Thu, 12 May 2016 12:32:00 +0000 (12:32 +0000)]
Merge "Fix continous crash in WindowManager in boot" into nyc-dev
Jaewan Kim [Thu, 12 May 2016 09:55:46 +0000 (18:55 +0900)]
Fix continous crash in WindowManager in boot
Bug:
28728894
Change-Id: I660e2709a674eb4089dbb38173375491a87828db
Calin Juravle [Thu, 12 May 2016 10:00:36 +0000 (10:00 +0000)]
Merge "Do not clear profiles after OTAs" into nyc-dev
am:
4ee1c943ab
* commit '
4ee1c943ab5f7f69355d1413bca981812a804a67':
Do not clear profiles after OTAs
Change-Id: Icf79d5c8eef4006fba3a5eb118d9882b02b36fb7
TreeHugger Robot [Thu, 12 May 2016 09:52:55 +0000 (09:52 +0000)]
Merge "Do not clear profiles after OTAs" into nyc-dev
Joe Fernandez [Thu, 12 May 2016 08:20:11 +0000 (08:20 +0000)]
docs: Wear Preview landing page updates am:
92abdc08bf am:
ca5b9d3224
am:
6c08da22c7
* commit '
6c08da22c706d49d6000b9c884d75c962716dae0':
docs: Wear Preview landing page updates
Change-Id: Ifca7d1cc2eb5bebc8bb7dc0d0d8ce521feaed74f
Joe Fernandez [Thu, 12 May 2016 08:17:56 +0000 (08:17 +0000)]
docs: Wear Preview landing page updates am:
92abdc08bf
am:
ca5b9d3224
* commit '
ca5b9d3224d4ea72bff42f0ebcb07e5b4628d9f2':
docs: Wear Preview landing page updates
Change-Id: Ied89e43ca7cbab27bfd9e5fd281766897a697b17
Joe Fernandez [Thu, 12 May 2016 08:15:27 +0000 (08:15 +0000)]
docs: Wear Preview landing page updates
am:
92abdc08bf
* commit '
92abdc08bf0283cd88ddc63447439cd94030f24a':
docs: Wear Preview landing page updates
Change-Id: I36335936e136ef9e0e53c15160420e15b67018b2
Joe Fernandez [Thu, 12 May 2016 08:00:04 +0000 (01:00 -0700)]
docs: Wear Preview landing page updates
Change-Id: I9fddcf75f9aba7688a5ae90f127d873eadd17892
Joe Fernandez [Thu, 12 May 2016 06:40:21 +0000 (06:40 +0000)]
Merge "docs: Wear Preview fixing infrastructure for DoDS publishing" into mnc-io-docs am:
d3781065ac am:
fc468b1556
am:
8be3fce76c
* commit '
8be3fce76c17c91fddb0036050d117e4a606c96c':
docs: Wear Preview fixing infrastructure for DoDS publishing
Change-Id: I77b1f1bc9c98510e7d9f0bbc240beb046fa411bb
Joe Fernandez [Thu, 12 May 2016 06:37:53 +0000 (06:37 +0000)]
Merge "docs: Wear Preview fixing infrastructure for DoDS publishing" into mnc-io-docs am:
d3781065ac
am:
fc468b1556
* commit '
fc468b1556a0e41e15c525defd8621d8bc3abdbd':
docs: Wear Preview fixing infrastructure for DoDS publishing
Change-Id: I1b6ec6c17f705f1833336840e38e146a08f2cfd4
Joe Fernandez [Thu, 12 May 2016 06:35:00 +0000 (06:35 +0000)]
Merge "docs: Wear Preview fixing infrastructure for DoDS publishing" into mnc-io-docs
am:
d3781065ac
* commit '
d3781065acf40e59c6f4903b4c5362ac0eac2a3e':
docs: Wear Preview fixing infrastructure for DoDS publishing
Change-Id: Icea0dec4066359fa1e568e0b241525613a615cb8
Joe Fernandez [Thu, 12 May 2016 06:26:52 +0000 (06:26 +0000)]
Merge "docs: Wear Preview fixing infrastructure for DoDS publishing" into mnc-io-docs
Joe Fernandez [Thu, 12 May 2016 02:51:49 +0000 (19:51 -0700)]
docs: Wear Preview fixing infrastructure for DoDS publishing
b/
28004352
Change-Id: I4db8f6f21581cf57b8469cee34d62954eb62b998
Dirk Dougherty [Thu, 12 May 2016 02:45:31 +0000 (02:45 +0000)]
Merge "Remove broken video embed." into mnc-mr-docs am:
80a3c76891 am:
1d5d20fba9 am:
0519569eaa
am:
01a89bebeb
* commit '
01a89bebeb6a1c0c8115ebb09fabd14285143dab':
Remove broken video embed.
Change-Id: Ie75aaa180207f4ff1d0d36422cf4c3d2aea842e1
Kevin Hufnagle [Thu, 12 May 2016 02:45:27 +0000 (02:45 +0000)]
docs: Created content describing high-performance audio. am:
44aff87b6d am:
52648a7913 am:
7ac4b0bf54 am:
2359b62819
am:
18267e9b33
* commit '
18267e9b338be6c2989ba1bd1529c51e619b9962':
docs: Created content describing high-performance audio.
Change-Id: I4bf805d7058b43c334b8c79079c00fc2f65dc5e9
David Friedman [Thu, 12 May 2016 02:42:22 +0000 (02:42 +0000)]
Merge "Docs: Removes "Guidelines for Education" card from "Essentials". am:
186284a6a6 am:
2e23d6eb96" into mnc-ub-dev am:
23e4fb8137
am:
0c01d17117
* commit '
0c01d17117f0299727b384ceef931fe1507e901f':
Change-Id: I7c60afa76e5ff4ad545cc4966e38a53c0d9bc553
David Friedman [Thu, 12 May 2016 02:42:19 +0000 (02:42 +0000)]
Docs: Removes "Guidelines for Education" card from "Essentials". am:
186284a6a6 am:
2e23d6eb96 am:
3f6af30cae
am:
c58d6fa488
* commit '
c58d6fa48899cf97b1129fc741870a73610f20bd':
Docs: Removes "Guidelines for Education" card from "Essentials".
Change-Id: I9d90c478cc29c163388826d062519979ce875e97
Dirk Dougherty [Thu, 12 May 2016 02:42:09 +0000 (02:42 +0000)]
Merge "Remove broken video embed." into mnc-mr-docs am:
80a3c76891 am:
1d5d20fba9
am:
0519569eaa
* commit '
0519569eaaeb5dd3dd3edaeb572346a871c9aa3f':
Remove broken video embed.
Change-Id: Ia29d6f0b0eb45161e7089ca6d888c975692cd7de
Kevin Hufnagle [Thu, 12 May 2016 02:42:04 +0000 (02:42 +0000)]
docs: Created content describing high-performance audio. am:
44aff87b6d am:
52648a7913 am:
7ac4b0bf54
am:
2359b62819
* commit '
2359b62819eae0b2daac1a3c99fc888cf8534957':
docs: Created content describing high-performance audio.
Change-Id: Ia0e66e1fef279f21a65128f5211055dd6b1e46f7
Dirk Dougherty [Thu, 12 May 2016 02:28:32 +0000 (02:28 +0000)]
Merge "Remove broken video embed." into mnc-mr-docs am:
80a3c76891
am:
1d5d20fba9
* commit '
1d5d20fba982fcca5c6664b52bbef803126820ae':
Remove broken video embed.
Change-Id: I23f583a4dd1d7f236d1a156683eff9be09f8fa25
David Friedman [Thu, 12 May 2016 02:27:03 +0000 (02:27 +0000)]
Merge "Docs: Removes "Guidelines for Education" card from "Essentials". am:
186284a6a6 am:
2e23d6eb96" into mnc-ub-dev
am:
23e4fb8137
* commit '
23e4fb813764e7df0094f7e620656c1e4d593267':
Change-Id: I9f085c6d81a4624d3d6d6f65c4787fa226e043f7
David Friedman [Thu, 12 May 2016 02:25:17 +0000 (02:25 +0000)]
Docs: Removes "Guidelines for Education" card from "Essentials". am:
186284a6a6 am:
2e23d6eb96
am:
3f6af30cae
* commit '
3f6af30cae649deb8530706984ece5b4f7418743':
Docs: Removes "Guidelines for Education" card from "Essentials".
Change-Id: I358a3648737c00056f59a69c9da6969512daaf79
Dirk Dougherty [Thu, 12 May 2016 02:24:27 +0000 (02:24 +0000)]
Merge "Remove broken video embed." into mnc-mr-docs
am:
80a3c76891
* commit '
80a3c7689155cc78c020a7c7a8cdd04df323e023':
Remove broken video embed.
Change-Id: Id26636c13e3b848d217c77f82661f023735fd426
Kevin Hufnagle [Thu, 12 May 2016 02:22:45 +0000 (02:22 +0000)]
docs: Created content describing high-performance audio. am:
44aff87b6d am:
52648a7913
am:
7ac4b0bf54
* commit '
7ac4b0bf54503ad34921a455c071f01df605ec26':
docs: Created content describing high-performance audio.
Change-Id: I5bae49b50656d07e5d82dad9093050dee9af97f3
Android Build Merger (Role) [Thu, 12 May 2016 02:18:49 +0000 (02:18 +0000)]
Merge "Docs: Removes "Guidelines for Education" card from "Essentials". am:
186284a6a6 am:
2e23d6eb96" into mnc-ub-dev
David Friedman [Thu, 12 May 2016 02:18:30 +0000 (02:18 +0000)]
Docs: Removes "Guidelines for Education" card from "Essentials". am:
186284a6a6
am:
2e23d6eb96
* commit '
2e23d6eb964d48796c828231ded0517b1a661d94':
Docs: Removes "Guidelines for Education" card from "Essentials".
Change-Id: I2afb88fe2117ae39202d4f6127d0b1520a84b0c8
Kevin Hufnagle [Thu, 12 May 2016 02:18:25 +0000 (02:18 +0000)]
docs: Created content describing high-performance audio. am:
44aff87b6d
am:
52648a7913
* commit '
52648a7913f696993aea6bae5abc9b4e6ef0ede3':
docs: Created content describing high-performance audio.
Change-Id: Iba626b552800459f2314eadba2d48a194891248a
David Friedman [Thu, 12 May 2016 02:13:44 +0000 (02:13 +0000)]
Docs: Removes "Guidelines for Education" card from "Essentials". am:
186284a6a6
am:
2e23d6eb96
* commit '
2e23d6eb964d48796c828231ded0517b1a661d94':
Docs: Removes "Guidelines for Education" card from "Essentials".
Change-Id: I54d1eed129ab92c7876847373a67a9ba0dbc7a16
Dirk Dougherty [Thu, 12 May 2016 02:13:35 +0000 (02:13 +0000)]
Merge "Remove broken video embed." into mnc-mr-docs
Kevin Hufnagle [Thu, 12 May 2016 02:12:59 +0000 (02:12 +0000)]
docs: Created content describing high-performance audio.
am:
44aff87b6d
* commit '
44aff87b6decadc91f0725b70cfb7a4d1da67b84':
docs: Created content describing high-performance audio.
Change-Id: Id9d72ce45dff409f88d5a0d6e179eed1001dc829
Donghyun Cho [Thu, 12 May 2016 02:11:07 +0000 (02:11 +0000)]
Merge "CEC: Update system audio mode based on the current status of AVR" into nyc-dev
am:
3cba679778
* commit '
3cba6797783288f5eedf7836b815dbcc49a555b5':
CEC: Update system audio mode based on the current status of AVR
Change-Id: Ie903e3af9c54ece2c8dced2516243b8f866d6514
David Friedman [Thu, 12 May 2016 02:09:55 +0000 (02:09 +0000)]
Docs: Removes "Guidelines for Education" card from "Essentials".
am:
186284a6a6
* commit '
186284a6a6045067f04343fb92691de8e87fc5db':
Docs: Removes "Guidelines for Education" card from "Essentials".
Change-Id: I9c8129c1a99f9d3d88d442a6cc1b6d4e56cb7c19
David Friedman [Wed, 11 May 2016 22:18:55 +0000 (15:18 -0700)]
Docs: Removes "Guidelines for Education" card from "Essentials".
Change-Id: I93e5bca8b56ceb31891f69c692e1f0d05ea722b1
Kevin Hufnagle [Thu, 12 May 2016 02:05:22 +0000 (02:05 +0000)]
Merge "docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am:
5ea88aad9d am:
1ee7930329
am:
29bcedc4b1
* commit '
29bcedc4b173421d4cac996ed60eb8cf571216d5':
docs: Updated Billing API documentation (for Project Nickel).
Change-Id: I433c4ede96d05631c4e1460ea353d2ef13355b0a
Donghyun Cho [Thu, 12 May 2016 02:05:09 +0000 (02:05 +0000)]
Merge "CEC: Update system audio mode based on the current status of AVR" into nyc-dev
Kevin Hufnagle [Thu, 12 May 2016 01:56:40 +0000 (01:56 +0000)]
Merge "docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am:
5ea88aad9d
am:
1ee7930329
* commit '
1ee7930329356b0748ae7b49cc4d89b2874cc98c':
docs: Updated Billing API documentation (for Project Nickel).
Change-Id: I695fb2c4a7f0c80148657df6bd3158ef327a6212
Jorim Jaggi [Thu, 12 May 2016 01:55:13 +0000 (01:55 +0000)]
Merge "Fix smallest width configuration calculation" into nyc-dev
am:
63c09fd6cd
* commit '
63c09fd6cd5db31180c3db119d097fb3c5a0e505':
Fix smallest width configuration calculation
Change-Id: Iaca06abab9336d15fab5b2ec302a7a821e8f0103
Kevin Hufnagle [Wed, 27 Apr 2016 18:57:33 +0000 (11:57 -0700)]
docs: Created content describing high-performance audio.
Added pages to DAC site describing high-performance audio, including
related terminology and considerations.
Bug:
27610459
Change-Id: I30ed4d76329e12d7d8065bc55bebf40011178add
Kevin Hufnagle [Thu, 12 May 2016 01:50:14 +0000 (01:50 +0000)]
Merge "docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs
am:
5ea88aad9d
* commit '
5ea88aad9dcc1ae7e5bc0db0ac390da2b37eb27e':
docs: Updated Billing API documentation (for Project Nickel).
Change-Id: Ia22ba5823527e56346d697241c525656a5b9c86d
Jorim Jaggi [Thu, 12 May 2016 01:50:04 +0000 (01:50 +0000)]
Merge "Fix smallest width configuration calculation" into nyc-dev
Dirk Dougherty [Thu, 12 May 2016 01:43:56 +0000 (18:43 -0700)]
Remove broken video embed.
Change-Id: I74ee6f4c35efb45ab78e3feff7c8e0b0c01f772f
Kevin Hufnagle [Thu, 12 May 2016 01:44:50 +0000 (01:44 +0000)]
Merge "docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs
Jorim Jaggi [Sat, 7 May 2016 00:27:55 +0000 (17:27 -0700)]
Fix smallest width configuration calculation
For calculating the smallest width, we need to iterate through all possible
orientations, snap the task bounds to a valid snap target and then use the
smallest width across all orientations.
In addition to that, when flinging the divider handle to the bottom of the
screen, we need to pass in fullscreen task bounds to avoid that this new
logic applies so the maximizing app only receives one configuration change.
Change-Id: I37aa9a40938517dfaf26770eb41327d76aec7c62
Fixes:
28469673
Selim Cinek [Thu, 12 May 2016 01:32:39 +0000 (01:32 +0000)]
Merge "Fixed a bug where the QS was animating wrong when closing" into nyc-dev
am:
d6ee33e840
* commit '
d6ee33e84069846b0907948f8972978c30b34a3c':
Fixed a bug where the QS was animating wrong when closing
Change-Id: I1c147f4f4ebf693ff218bd2b2fa1a3b890fe7c37
Selim Cinek [Thu, 12 May 2016 01:27:53 +0000 (01:27 +0000)]
Merge "Fixed a bug where the QS was animating wrong when closing" into nyc-dev
Adam Lesinski [Thu, 12 May 2016 01:11:18 +0000 (01:11 +0000)]
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am:
3723194dc8
* commit '
3723194dc831f4734d465602b2e21449d9357c2e':
BluetoothManager: Make requestControllerActivityInfo one call
Change-Id: Iafdc65be9a8045c10ee485685a4222ece087e031
Adam Lesinski [Thu, 12 May 2016 00:59:28 +0000 (00:59 +0000)]
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
Aurimas Liutikas [Thu, 12 May 2016 00:56:09 +0000 (00:56 +0000)]
Merge "Switch the default text selection handles to Material style." into nyc-dev
am:
78e421dbce
* commit '
78e421dbced3181d0f43a174683b3c34cbb88a70':
Switch the default text selection handles to Material style.
Change-Id: I38d07c3871bffe86243088b927156fd4dcd56bc1
Joe Fernandez [Thu, 12 May 2016 00:53:17 +0000 (00:53 +0000)]
docs: DoDS, wearable reference docs am:
2e30b3a11e am:
b60907b1ad am:
185734d46a
am:
8e2f74d62b
* commit '
8e2f74d62b52e72f060394c0a1dcdc8a567bfff6':
docs: DoDS, wearable reference docs
Change-Id: Ie5bc595d242cfd7896f13669fcd2fe3b80b4a91e
TreeHugger Robot [Thu, 12 May 2016 00:53:01 +0000 (00:53 +0000)]
Merge "Switch the default text selection handles to Material style." into nyc-dev
Joe Fernandez [Thu, 12 May 2016 00:50:42 +0000 (00:50 +0000)]
docs: DoDS, wearable reference docs am:
2e30b3a11e am:
b60907b1ad
am:
185734d46a
* commit '
185734d46a8e4085cbbfadc1074ea058e2de72c5':
docs: DoDS, wearable reference docs
Change-Id: I2b4e5e850fed8a03d600a3b24801b8ba62571035
Dianne Hackborn [Thu, 12 May 2016 00:50:34 +0000 (00:50 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev
am:
b3edcd78d2
* commit '
b3edcd78d25372a2a1e7520b63da1d5d38fbe59f':
Fix issue #
28400000: Settings memory UI still showing z-ram...
Change-Id: Iabd4b29208f3a26e78d4773033a7653738dc471d
Adarsh Fernando [Thu, 12 May 2016 00:47:34 +0000 (00:47 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3" into mnc-io-docs am:
ef189e9346 am:
fb54c536f1
am:
8e9cbf96b2
* commit '
8e9cbf96b207a4b199a578a6d6364850ba938941':
Docs: Added new Whitelist feature to Data Saver for DP3
Change-Id: Icd48db5daca08e057cacdf9ed0e572126bea45aa
Joe Fernandez [Thu, 12 May 2016 00:47:33 +0000 (00:47 +0000)]
docs: DoDS, wearable reference docs am:
2e30b3a11e
am:
b60907b1ad
* commit '
b60907b1ad48b9764fba997ed90dbba6c1c80887':
docs: DoDS, wearable reference docs
Change-Id: Iac19c79468aeff12fb32bea27c2698fda8fcc4e1
Joe Fernandez [Thu, 12 May 2016 00:44:02 +0000 (00:44 +0000)]
docs: DoDS, wearable reference docs
am:
2e30b3a11e
* commit '
2e30b3a11edac0e722f1952cefcfa033310e396b':
docs: DoDS, wearable reference docs
Change-Id: I3adf94b9d72710a084e194ef5ace12ac054761ea
Eric Schmidt [Thu, 12 May 2016 00:42:26 +0000 (00:42 +0000)]
Merge "docs: Updates to notifications for DP3" into mnc-io-docs am:
f087f0674e am:
b6fb772c77
am:
3f88f2c527
* commit '
3f88f2c5278d75560cb9c7b2291fedbae5f421ce':
docs: Updates to notifications for DP3
Change-Id: I6f446965c29666f9e38857509c631c0c6008be48
Eric Schmidt [Thu, 12 May 2016 00:42:23 +0000 (00:42 +0000)]
Merge "docs: Added emoji section to api overview." into mnc-io-docs am:
20501e8197 am:
0f0cd92293
am:
5ea13ec840
* commit '
5ea13ec840ca406921d4305d9c60a7d2b9105848':
docs: Added emoji section to api overview.
Change-Id: I3a3769b36700c152f0d39ef991c74137293197f2
Kevin Hufnagle [Thu, 12 May 2016 00:42:19 +0000 (00:42 +0000)]
Merge "cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc." into mnc-io-docs am:
24c2969312 am:
c34dee0c99
am:
29bd2c17f9
* commit '
29bd2c17f9b9fd2453a2aa127f39ffde67d02cbc':
cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
Change-Id: I2ce08e39bb6da0693f4bec118e6e39676658b1cc
Dianne Hackborn [Thu, 12 May 2016 00:40:16 +0000 (00:40 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev
Aurimas Liutikas [Thu, 12 May 2016 00:38:53 +0000 (00:38 +0000)]
Merge "Stop saving ActionMenuItemView state." into nyc-dev
am:
b9bb8e88c6
* commit '
b9bb8e88c66a80ca43e5aabad94348fdaf0fef1d':
Stop saving ActionMenuItemView state.
Change-Id: If218724b1a04381934e7591381e15ad262095a7d
Andrew Solovay [Thu, 12 May 2016 00:38:47 +0000 (00:38 +0000)]
Merge "Merge "docs: Noted minor API changes in release notes" into mnc-io-docs am:
8853f55890 am:
b62d091fb1" into nyc-dev
am:
0e396c0539
* commit '
0e396c053931db4df4b6f00ea8d5a914404d2e09':
docs: Noted minor API changes in release notes
Change-Id: I9bf8a0ab44cec66fc1a2cf03ba8152b328a5c45c
Jim Miller [Thu, 12 May 2016 00:38:38 +0000 (00:38 +0000)]
Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
am:
254d9e4f41
* commit '
254d9e4f410f63ed1ba3f917e207731c5d9d6538':
Fix KeyguardManager.isSecure() to observe work profile
Change-Id: I92f1387372cd02790f10f2940fdeb97ec6ab4a8f
Daniel Yu [Thu, 12 May 2016 00:38:23 +0000 (00:38 +0000)]
Merge "Merge "docs: Updating TV recording API docs for N DP3" into mnc-io-docs am:
957a1ad775 am:
c3fc9e3cb3" into nyc-dev
am:
3bad687e1d
* commit '
3bad687e1ded50502a7dfb385e4cf33bde2c528d':
docs: Updating TV recording API docs for N DP3
Change-Id: I0fa0437088f98c68274dc8eb3c6c5c404130be16
Daniel Yu [Thu, 12 May 2016 00:37:59 +0000 (00:37 +0000)]
Merge "Merge "docs: Updating Scoped Directory Access docs for N DP3" into mnc-io-docs am:
a7c2ef588b am:
47a446bc87" into nyc-dev
am:
4c83d125b2
* commit '
4c83d125b29e304d4435f9323cdb93cdf379d2de':
docs: Updating Scoped Directory Access docs for N DP3
Change-Id: I1589e0972ed2b3f505a7be93406879640a185063
Jae Seo [Thu, 12 May 2016 00:37:35 +0000 (00:37 +0000)]
Merge "TIF: Remove the uniqueness check for track ID from notifyTracksChanged" into nyc-dev
am:
d1fe7ea84f
* commit '
d1fe7ea84fc5abeb495261f69e288851a3f3abd4':
TIF: Remove the uniqueness check for track ID from notifyTracksChanged
Change-Id: I39d53fb179f836de9f74fdfeb3f1c88fe816e05f
Liz Yepsen [Thu, 12 May 2016 00:37:20 +0000 (00:37 +0000)]
Merge "Merge "docs: added "billions" doc in Distribute>Essentials" into mnc-mr-docs am:
3a766f6107 am:
f89b0f11c6 am:
1cf59774b0" into nyc-dev
am:
fb19fc6185
* commit '
fb19fc618520e96809db5fa46f2fab4f165220bb':
docs: added "billions" doc in Distribute>Essentials
Change-Id: I9450430241ce9fb83e754def2192f78bd6431f21
Christopher Tate [Thu, 12 May 2016 00:37:07 +0000 (00:37 +0000)]
Merge "Fix iterator double-advance in ContentObserverController" into nyc-dev
am:
9c2bb6da70
* commit '
9c2bb6da700bc2fd64ccf3be04e4130550b95e92':
Fix iterator double-advance in ContentObserverController
Change-Id: Ib953bcb3e6f4a3313711d78568e682e3eac489de
smain@google.com [Thu, 12 May 2016 00:36:53 +0000 (00:36 +0000)]
Merge "Merge "correct the support library redirects to redirect whole path" into mnc-mr-docs am:
51b3a0a016 am:
60c8527821 am:
890a2af8c1" into nyc-dev
am:
c51ede4d77
* commit '
c51ede4d772068230e325eacbed60d1079d5fcf8':
Change-Id: I33b93d42c84739d15472a2e14798a5a5837e1b1e
smain@google.com [Thu, 12 May 2016 00:36:36 +0000 (00:36 +0000)]
Merge "Merge "correct the support library redirects to redirect whole path" into mnc-mr-docs am:
51b3a0a016 am:
60c8527821 am:
890a2af8c1" into nyc-dev
am:
d991677a7f
* commit '
d991677a7fd97aa3f2ab57f4a7945f96e9ac191a':
correct the support library redirects to redirect whole path
Change-Id: If099ad6c4e4c587eb196d8e377e7f9bd447e5d65
Christopher Tate [Thu, 12 May 2016 00:36:19 +0000 (00:36 +0000)]
Merge "Use Q=100 JPEG instead of PNG for wallpaper display" into nyc-dev
am:
79c8a1fdf7
* commit '
79c8a1fdf73212d4f22a33f2e09455d7bb484c34':
Use Q=100 JPEG instead of PNG for wallpaper display
Change-Id: I784f590b12e8d24f5c2b2b08822b40a044369ebe
Amanda Kassay [Thu, 12 May 2016 00:35:55 +0000 (00:35 +0000)]
Merge "Remove wear design pages redirecting to design/wear am:
9654f2efda am:
1f006b77e9 am:
267b896add" into nyc-dev
am:
64fcd7ccfb
* commit '
64fcd7ccfb7eb84b368fc8d18e9e5de2cb2c3649':
Remove wear design pages redirecting to design/wear
Change-Id: I9975524dd6864d98813d57583ee6099e20f43a85
Andrew Solovay [Thu, 12 May 2016 00:35:11 +0000 (00:35 +0000)]
Merge "Merge "docs: Updated support library revision history for 23.4.0 am:
788b96f582 am:
26bd35becb" into mnc-io-docs am:
3a21716590 am:
359e303f5f" into nyc-dev
am:
dce5918405
* commit '
dce59184053be7e6f5f7a75c0448b85d979c4786':
Change-Id: I67983eab2f3116657b1c9a278edc3d72eccfabb7
Andrew Solovay [Thu, 12 May 2016 00:34:37 +0000 (00:34 +0000)]
Merge "docs: Updated support library revision history for 23.4.0 am:
788b96f582 am:
26bd35becb am:
84d134b6cf am:
795017bc93" into nyc-dev
am:
1dd0df9383
* commit '
1dd0df9383786a415aad2d2dccf876a6db062603':
docs: Updated support library revision history for 23.4.0
Change-Id: Id12e44726ba6448b7ccce08d2a613be8e88c4ca7
Teng-Hui Zhu [Thu, 12 May 2016 00:34:13 +0000 (00:34 +0000)]
Merge "Update and add attributes to the JavaDoc for VectorDrawable" into nyc-dev
am:
caacf332a1
* commit '
caacf332a1e568e065c9245565c135a7450cc941':
Update and add attributes to the JavaDoc for VectorDrawable
Change-Id: Ia45e5de947807058757c5cd6f6a189ed67e9e136
Adarsh Fernando [Thu, 12 May 2016 00:33:30 +0000 (00:33 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3" into mnc-io-docs am:
ef189e9346
am:
fb54c536f1
* commit '
fb54c536f1d14babb58c0bfe82175b57d859e0ed':
Docs: Added new Whitelist feature to Data Saver for DP3
Change-Id: I03d7d73467ded00d50f150a8edd0d66fd6e8aacf
Joe Fernandez [Wed, 11 May 2016 18:22:27 +0000 (11:22 -0700)]
docs: DoDS, wearable reference docs
- fix navtree data file for TOC functionality
b/
28462526
Change-Id: I8fde25b67972e9b610dddcc402a0e8164600ff71
Adarsh Fernando [Thu, 12 May 2016 00:28:23 +0000 (00:28 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3" into mnc-io-docs
am:
ef189e9346
* commit '
ef189e93463da9ba753829096f1cfb7a0b019a73':
Docs: Added new Whitelist feature to Data Saver for DP3
Change-Id: I2f2c1b47841e5abc20791fdf13e385d1b9eaceb3
Eric Schmidt [Thu, 12 May 2016 00:28:09 +0000 (00:28 +0000)]
Merge "docs: Updates to notifications for DP3" into mnc-io-docs am:
f087f0674e
am:
b6fb772c77
* commit '
b6fb772c7791cea94e535de027687319a1be8eb6':
docs: Updates to notifications for DP3
Change-Id: I331b82e02e036e8c68e5cc86ab79faaa30592add
Eric Schmidt [Thu, 12 May 2016 00:25:56 +0000 (00:25 +0000)]
Merge "docs: Added emoji section to api overview." into mnc-io-docs am:
20501e8197
am:
0f0cd92293
* commit '
0f0cd922936ad26c5cc26244e05044f8400bec94':
docs: Added emoji section to api overview.
Change-Id: I49b4bf33c0801e73c59f78e49dd1cd77ea0da868
Adarsh Fernando [Thu, 12 May 2016 00:21:53 +0000 (00:21 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3" into mnc-io-docs
Eric Schmidt [Thu, 12 May 2016 00:19:13 +0000 (00:19 +0000)]
Merge "docs: Updates to notifications for DP3" into mnc-io-docs
am:
f087f0674e
* commit '
f087f0674ecdffea989a2730c513723e2ba26f45':
docs: Updates to notifications for DP3
Change-Id: If1284cb12d39a4d0fbf9ac828ea5b33a7ded9866
Eric Schmidt [Thu, 12 May 2016 00:17:33 +0000 (00:17 +0000)]
Merge "docs: Added emoji section to api overview." into mnc-io-docs
am:
20501e8197
* commit '
20501e819788f33af02fc2f1a535ae5fd5c67afc':
docs: Added emoji section to api overview.
Change-Id: I65c1d07a75d8f29ba9fd41d060ad0dbfdd3933b0
Eric Schmidt [Thu, 12 May 2016 00:08:25 +0000 (00:08 +0000)]
Merge "docs: Updates to notifications for DP3" into mnc-io-docs
Eric Schmidt [Thu, 12 May 2016 00:08:13 +0000 (00:08 +0000)]
Merge "docs: Added emoji section to api overview." into mnc-io-docs
Kevin Hufnagle [Thu, 12 May 2016 00:07:08 +0000 (00:07 +0000)]
Merge "cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc." into mnc-io-docs am:
24c2969312
am:
c34dee0c99
* commit '
c34dee0c99bbc1d21bd557e095d4f88761a4245f':
cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
Change-Id: If46bff14d2a8a461eda04b4e1d40bee06b10984c
Kevin Hufnagle [Thu, 12 May 2016 00:02:18 +0000 (00:02 +0000)]
Merge "cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc." into mnc-io-docs
am:
24c2969312
* commit '
24c29693122dbc92ee8cf670fa6536c613f1b87d':
cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
Change-Id: I4c5f421bb826e750ab8e5117a4d410a95d25de91
Kevin Hufnagle [Wed, 11 May 2016 23:58:17 +0000 (23:58 +0000)]
Merge "cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc." into mnc-io-docs
TreeHugger Robot [Wed, 11 May 2016 23:54:40 +0000 (23:54 +0000)]
Merge "Stop saving ActionMenuItemView state." into nyc-dev
Android Build Merger (Role) [Wed, 11 May 2016 23:49:15 +0000 (23:49 +0000)]
Merge "Merge "docs: Noted minor API changes in release notes" into mnc-io-docs am:
8853f55890 am:
b62d091fb1" into nyc-dev
Andrew Solovay [Wed, 11 May 2016 23:48:53 +0000 (23:48 +0000)]
Merge "docs: Noted minor API changes in release notes" into mnc-io-docs am:
8853f55890
am:
b62d091fb1
* commit '
b62d091fb1c6ca65064e29b406ff0a47092a6232':
docs: Noted minor API changes in release notes
Change-Id: I5f49ee180b0dccaa38b6610b5a26866fd9bc6e64
OSDN Git Service
