OSDN Git Service
Amanda Kassay [Fri, 22 Jul 2016 07:06:41 +0000 (07:06 +0000)]
Merge \"Merge \\\"Adding projec.yaml files to all top/sub categories.\\\" into nyc-dev am:
5a76378471 am:
ce78cff77e\" into nyc-mr1-dev-plus-aosp
am:
55d6135d01
Change-Id: I5411cb2b3ea9b9d5969736ae536b1428effd6531
Amanda Kassay [Fri, 22 Jul 2016 07:06:37 +0000 (07:06 +0000)]
Merge \\\"Adding projec.yaml files to all top/sub categories.\\\" into nyc-dev am:
5a76378471 am:
ce78cff77e
am:
820d191048
Change-Id: Idef83a88e11af1d602a5a1117d8603e895f2621e
Chih-Hung Hsieh [Fri, 22 Jul 2016 07:06:28 +0000 (07:06 +0000)]
Merge \"resolve merge conflicts of
3fb651b to nyc-mr1-dev-plus-aosp\" into nyc-mr1-dev-plus-aosp
am:
2d8ef6c26d
Change-Id: Ice9b7f3d21a15618c388d94da8b5b96137f6a4bf
TreeHugger Robot [Fri, 22 Jul 2016 06:59:58 +0000 (06:59 +0000)]
Merge "resolve merge conflicts of
f53bfc9 to master"
TreeHugger Robot [Fri, 22 Jul 2016 05:36:24 +0000 (05:36 +0000)]
Merge "Cap minimum visibilty of floating windows by the real size."
Stephen Hines [Fri, 22 Jul 2016 05:19:07 +0000 (22:19 -0700)]
resolve merge conflicts of
f53bfc9 to master
Change-Id: Idb454415b166b2ff215c604475dd9129958e7edd
Bill Yi [Fri, 22 Jul 2016 03:34:41 +0000 (03:34 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
d6498d1120 -s ours
am:
ce600b4e12 -s ours
Change-Id: Id9977bf5bea6d1e790f40652bc5abde18eda9b14
Bill Yi [Fri, 22 Jul 2016 03:34:35 +0000 (03:34 +0000)]
Import translations. DO NOT MERGE am:
7a81bcd670 -s ours
am:
bf5e412fd1 -s ours
Change-Id: I61ae596a9b42ed70e95e8709ab89b2b32782a774
Srinath Sridharan [Fri, 22 Jul 2016 03:34:32 +0000 (03:34 +0000)]
Merge \\"Adding a new getThreadScheduler() method.\\" into nyc-mr1-dev am:
6c92c0eb5c
am:
37de263d42
Change-Id: I07687f7b135622800bd68549a2efe3c445827b39
Srinath Sridharan [Fri, 22 Jul 2016 03:31:48 +0000 (03:31 +0000)]
Adding a new getThreadScheduler() method. am:
1b15d13243
am:
af8a8c54c8 -s ours
Change-Id: I861ebb75295b044e5dfb083c3d5f81c89a224e22
TreeHugger Robot [Fri, 22 Jul 2016 02:44:34 +0000 (02:44 +0000)]
Merge "Fix undefined fontScale issue in Configuration"
TreeHugger Robot [Fri, 22 Jul 2016 02:41:07 +0000 (02:41 +0000)]
Merge "Remove lines that hit ActivityMonitor on destory."
Android Build Merger (Role) [Fri, 22 Jul 2016 02:21:08 +0000 (02:21 +0000)]
Merge "Merge \\"Adding projec.yaml files to all top/sub categories.\\" into nyc-dev am:
5a76378471 am:
ce78cff77e" into nyc-mr1-dev-plus-aosp
Benjamin Franz [Fri, 22 Jul 2016 02:21:03 +0000 (02:21 +0000)]
Merge \\\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9 am:
cb805b35f3 -s ours am:
662e2a7975 am:
0eadbe6d36
am:
378b7d1f39 -s ours
Change-Id: I81c892217d6ca9296dcbb6c0a278827ffe7d8a1e
Billy Lamberta [Fri, 22 Jul 2016 02:21:00 +0000 (02:21 +0000)]
Merge \\\"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\\\" into nyc-dev am:
7dbcfcadd5 am:
199e855f9f
am:
a043fce41d
Change-Id: I4c18b11436fb9f7bbd932f6dae7d2997e38e3106
Billy Lamberta [Fri, 22 Jul 2016 02:20:56 +0000 (02:20 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f am:
c7cffa3e6a am:
cb3ae89fbd
am:
53d8d74853
Change-Id: I8a797e697ce602a506cea73091e93f6a7b14d47b
TreeHugger Robot [Fri, 22 Jul 2016 02:16:58 +0000 (02:16 +0000)]
Merge "resolve merge conflicts of
3fb651b to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Amanda Kassay [Fri, 22 Jul 2016 02:16:02 +0000 (02:16 +0000)]
Merge \\"Adding projec.yaml files to all top/sub categories.\\" into nyc-dev am:
5a76378471
am:
ce78cff77e
Change-Id: I961da4993413646cd89e9fce3f338aad466e37bd
Chih-Hung Hsieh [Fri, 22 Jul 2016 02:14:36 +0000 (19:14 -0700)]
resolve merge conflicts of
3fb651b to nyc-mr1-dev-plus-aosp
Change-Id: I52d56e84620c85638798d949f8eb819387a01902
Bill Yi [Fri, 22 Jul 2016 02:13:25 +0000 (02:13 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
d6498d1120 -s ours
Change-Id: I40a278fefe8891467e6b7e3f01a1f18514b85fb0
Bill Yi [Fri, 22 Jul 2016 02:13:22 +0000 (02:13 +0000)]
Import translations. DO NOT MERGE
am:
7a81bcd670 -s ours
Change-Id: Ice2ddc3fe3979638b402fab4e5fe58b4a5d23a40
Srinath Sridharan [Fri, 22 Jul 2016 02:13:18 +0000 (02:13 +0000)]
Merge \"Adding a new getThreadScheduler() method.\" into nyc-mr1-dev
am:
6c92c0eb5c
Change-Id: I34c5380121bd805a0c8afe35ab82cf149ba3e79c
Srinath Sridharan [Fri, 22 Jul 2016 02:13:13 +0000 (02:13 +0000)]
Adding a new getThreadScheduler() method.
am:
1b15d13243
Change-Id: Ie15ad328a687bac65e1505e2c324536d3eb0102a
Benjamin Franz [Fri, 22 Jul 2016 02:13:07 +0000 (02:13 +0000)]
Merge \\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9 am:
cb805b35f3 -s ours am:
662e2a7975
am:
0eadbe6d36
Change-Id: I44f878a88710950bdee31c326c6b3b465999e7c4
Billy Lamberta [Fri, 22 Jul 2016 02:13:02 +0000 (02:13 +0000)]
Merge \\"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\\" into nyc-dev am:
7dbcfcadd5
am:
199e855f9f
Change-Id: I7a3f484d68b1c79e2fa9905b1283411220134fee
Billy Lamberta [Fri, 22 Jul 2016 02:12:54 +0000 (02:12 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f am:
c7cffa3e6a
am:
cb3ae89fbd
Change-Id: Ic24fdb8902d85766d6f4aa9ed79367310b358726
TreeHugger Robot [Fri, 22 Jul 2016 02:04:57 +0000 (02:04 +0000)]
Merge "Attempt at fixing broken tests and regressing performance."
Amanda Kassay [Fri, 22 Jul 2016 01:56:39 +0000 (01:56 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am:
83fb75ded3 am:
e9d58227bb am:
576bda4222
am:
1f38231b7f
Change-Id: I66198829c5445862f764562bc8285878ee71973c
Mark Lu [Fri, 22 Jul 2016 01:56:36 +0000 (01:56 +0000)]
Merge \\\"docs: fixed \\\'@\\\' signs that were escaped improperly\\\" into nyc-dev am:
a7ce29962c am:
081b4b3265
am:
424e11ffce
Change-Id: I1b6eaa1952615ac5d3c1a280529042f46a35b4a2
Erik Kline [Fri, 22 Jul 2016 01:56:33 +0000 (01:56 +0000)]
Support removing specific routes from local_network am:
6599ee8b96
am:
51c8fe903b
Change-Id: I02c0805c38e11226bd11b815da5418f1afc1ab89
Bill Yi [Fri, 22 Jul 2016 01:53:57 +0000 (01:53 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
e3f28911af -s ours
am:
6ca7959ea9 -s ours
Change-Id: Ib82db2dd0c41e8a6db91ad59e930107b6e2d247b
Bill Yi [Fri, 22 Jul 2016 01:53:54 +0000 (01:53 +0000)]
Import translations. DO NOT MERGE am:
8eff1c381b -s ours
am:
ed70bc2077 -s ours
Change-Id: I0d09b52dd4d3e7bd54ca01b101f7abf41cca5c2d
Thierry Strudel [Fri, 22 Jul 2016 01:53:51 +0000 (01:53 +0000)]
Merge changes from topic \\'enable_persist_kernel_log\\' into nyc-mr1-dev am:
1a48150980
am:
27b73a8a1c
Change-Id: Ic1c4a4f40718faf9e328228376da6363216ccec1
Mark Salyzyn [Fri, 22 Jul 2016 01:53:47 +0000 (01:53 +0000)]
Settings: add logpersist kernel only selection (strings) am:
66b89bc2da
am:
37e4077f66
Change-Id: If071745ff9bdc4aaf7644405fa1f42586a904f59
Mark Salyzyn [Fri, 22 Jul 2016 01:53:43 +0000 (01:53 +0000)]
Settings: add logpersist selection (strings) am:
3e05a70543 -s ours
am:
475e451a14
Change-Id: I95cf84e22985b6064020630941893b3279ec02c6
Chih-hung Hsieh [Fri, 22 Jul 2016 01:53:29 +0000 (01:53 +0000)]
resolve merge conflicts of
5152fd9 to stage-aosp-master
am:
05160d70d1
Change-Id: Id1d734fd162d6063fdc818afc68f09809f764c5f
Amanda Kassay [Fri, 22 Jul 2016 01:45:48 +0000 (01:45 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am:
83fb75ded3 am:
e9d58227bb
am:
576bda4222
Change-Id: I4514cd8829df2c6aec1abecc03e8044e82c30ecc
Mark Lu [Fri, 22 Jul 2016 01:45:44 +0000 (01:45 +0000)]
Merge \\"docs: fixed \\'@\\' signs that were escaped improperly\\" into nyc-dev am:
a7ce29962c
am:
081b4b3265
Change-Id: Ied462165f9a794a6d213ee93b4876e52d139e200
Erik Kline [Fri, 22 Jul 2016 01:45:39 +0000 (01:45 +0000)]
Support removing specific routes from local_network
am:
6599ee8b96
Change-Id: I51a341796698ff02aa7a62f5f8b66050982f488e
Bill Yi [Fri, 22 Jul 2016 01:45:35 +0000 (01:45 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
e3f28911af -s ours
Change-Id: I57bb5d48154f9eadbe6657d3af6861fc1f673ee9
Bill Yi [Fri, 22 Jul 2016 01:45:31 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE
am:
8eff1c381b -s ours
Change-Id: Ifea203c04a0312a552568b842e464252e3506cb7
Mark Salyzyn [Fri, 22 Jul 2016 01:45:14 +0000 (01:45 +0000)]
Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
am:
1a48150980
Change-Id: I1e9eb21d5df60caf717e056bb571e93add127075
Mark Salyzyn [Fri, 22 Jul 2016 01:44:47 +0000 (01:44 +0000)]
Settings: add logpersist kernel only selection (strings)
am:
66b89bc2da
Change-Id: I296fcbdc2bfee105bc0ce838c75989d32e14b12e
Mark Salyzyn [Fri, 22 Jul 2016 01:39:47 +0000 (01:39 +0000)]
Settings: add logpersist selection (strings)
am:
3e05a70543 -s ours
Change-Id: Ia4d081b5db59fdc2f518d04129216f8d014bdbbe
TreeHugger Robot [Fri, 22 Jul 2016 01:18:52 +0000 (01:18 +0000)]
Merge "Handle partial clip files by showing a failure notification."
Chih-Hung Hsieh [Fri, 22 Jul 2016 01:13:31 +0000 (18:13 -0700)]
resolve merge conflicts of
5152fd9 to stage-aosp-master
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
Chih-hung Hsieh [Fri, 22 Jul 2016 00:55:18 +0000 (00:55 +0000)]
Merge "Fix google-explicit-constructor warnings in frameworks/base"
Ben Lin [Thu, 21 Jul 2016 01:24:29 +0000 (18:24 -0700)]
Attempt at fixing broken tests and regressing performance.
1. testDeleteDocument_Cancel seems to pass far more often than
testDeleteDocument, which always errors out due to not able to find the
menu item. This is to combine the tests so we don't lose coverage, but
also have less noise in APCT until we figure out what's going on.
2. We have regression currently on our jank tests. Per Guang's
suggestion, we are going to try freezing device orientation to see if it
helps.
Bug:
30190207
Change-Id: Ibdfdb75471b3220faaa9e8abef03df489ff185c3
Android Build Merger (Role) [Fri, 22 Jul 2016 00:30:57 +0000 (00:30 +0000)]
Merge "[NAN] Fix TlvElement member names - reflect public access. am:
e40b4d344e"
Android Build Merger (Role) [Fri, 22 Jul 2016 00:30:46 +0000 (00:30 +0000)]
Merge "[NAN] TLV utilities iterator - throw correct exception am:
3e5ac12302"
Etan Cohen [Fri, 22 Jul 2016 00:30:01 +0000 (00:30 +0000)]
[NAN] Fix TlvElement member names - reflect public access.
am:
e40b4d344e
Change-Id: I22cc48b0ba4b873c299fb01df1a925cea8f5727a
Etan Cohen [Fri, 22 Jul 2016 00:29:46 +0000 (00:29 +0000)]
[NAN] TLV utilities iterator - throw correct exception
am:
3e5ac12302
Change-Id: Ic6638a0d937f9eddba34cc1777655ab05e0e1bf6
Andrew Solovay [Fri, 22 Jul 2016 00:29:25 +0000 (00:29 +0000)]
Merge \\\\"docs: Replacing curly apostrophes with straight ones\\\\" into nyc-docs am:
1d545c4f83 am:
adfb20c2f0 am:
cc94c31e15
am:
37e98c1233
Change-Id: Ic2042261717580bb5cbe73b4b29a39d2d9807a2d
Andrew Solovay [Fri, 22 Jul 2016 00:29:22 +0000 (00:29 +0000)]
docs: Replacing curly apostrophes with straight ones am:
abea4b1dcd am:
85d40b4feb am:
c3ec8f28a5
am:
bc0f9cad4f
Change-Id: I502fb6957cb36b903151cf68d9a97a704dabff53
Andrew Solovay [Fri, 22 Jul 2016 00:07:48 +0000 (00:07 +0000)]
Merge \\\"docs: Replacing curly apostrophes with straight ones\\\" into nyc-docs am:
1d545c4f83 am:
adfb20c2f0
am:
cc94c31e15
Change-Id: I6be807b81d6d7686ed98a9adead875ecfbbd06bf
Andrew Solovay [Fri, 22 Jul 2016 00:07:45 +0000 (00:07 +0000)]
docs: Replacing curly apostrophes with straight ones am:
abea4b1dcd am:
85d40b4feb
am:
c3ec8f28a5
Change-Id: Iff015598faf6f2026be06077b84209b967199f6d
Andrew Solovay [Thu, 21 Jul 2016 23:56:57 +0000 (23:56 +0000)]
Merge \\"docs: Replacing curly apostrophes with straight ones\\" into nyc-docs am:
1d545c4f83
am:
adfb20c2f0
Change-Id: I45b64c1ad1359f4ce908db07d968cffeb9406ace
Andrew Solovay [Thu, 21 Jul 2016 23:56:50 +0000 (23:56 +0000)]
docs: Replacing curly apostrophes with straight ones am:
abea4b1dcd
am:
85d40b4feb
Change-Id: I7bac719771e700f33e1081a34a76d3f656bbe65d
Andrew Solovay [Thu, 21 Jul 2016 23:48:00 +0000 (23:48 +0000)]
Merge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs
am:
1d545c4f83
Change-Id: Ia21fd5e04dc0565feea5207951372e6ceaf60e38
Andrew Solovay [Thu, 21 Jul 2016 23:47:58 +0000 (23:47 +0000)]
docs: Replacing curly apostrophes with straight ones
am:
abea4b1dcd
Change-Id: I1fd344ed7087b962a66d577b1c3cb5fa0e81fbaa
Garfield, Tan [Thu, 21 Jul 2016 18:10:44 +0000 (11:10 -0700)]
Handle partial clip files by showing a failure notification.
Bug:
30221384
Change-Id: Ib32b6b5ca5b8f7be887b8f35b80daeeb33770cbe
Chih-Hung Hsieh [Thu, 21 Jul 2016 18:23:06 +0000 (11:23 -0700)]
Fix google-explicit-constructor warnings in frameworks/base
* Add explicit keyword to conversion constructors.
* Add NOLINT to implicit conversion constructors.
Bug:
28341362
Test: build with clang-tidy
Change-Id: Ie4d37072ab57d1662d18db4de1c8577247f43337
TreeHugger Robot [Thu, 21 Jul 2016 23:07:15 +0000 (23:07 +0000)]
Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs
TreeHugger Robot [Thu, 21 Jul 2016 23:03:14 +0000 (23:03 +0000)]
Merge "Change the color of loading spinner to the color of selected roots."
Etan Cohen [Thu, 21 Jul 2016 22:52:53 +0000 (22:52 +0000)]
[NAN] Modify arguments from \"array, length\" to \"array\"
am:
0a5b7efcb2
Change-Id: I0ce1c4cbaac1f54f67d2593e31f2956e67b5eb9f
David Gross [Thu, 21 Jul 2016 22:25:38 +0000 (22:25 +0000)]
resolve merge conflicts of
95e42d9 to nyc-dev-plus-aosp am:
289688de68
am:
619fa2673f
Change-Id: Id9c94a0b2b3b0b89e297a7bc7dddc0b5a51aede5
Sreevani Sreejith [Thu, 21 Jul 2016 22:25:35 +0000 (22:25 +0000)]
Merge \\\"Merge \\\\\"docs: Fixed typo.\\\\\" into mnc-io-docs am:
71f742920d am:
9b911b8736\\\" into nyc-dev am:
7e9ce5ceaa am:
d0516671b1
am:
7b82ec394b
Change-Id: Iff072a3ce97ab41923490c136756eccd7f124f46
sreevanis [Thu, 21 Jul 2016 22:25:32 +0000 (22:25 +0000)]
Merge \\\\\"docs: Fixed typo.\\\\\" into mnc-io-docs am:
71f742920d am:
01f12a9e18 am:
daaa7b7e5b am:
11dca20c16
am:
5ae40a1f74
Change-Id: Ie4501a357689f226672bcc124dd075b068ff1a75
Allison Babick [Thu, 21 Jul 2016 22:22:32 +0000 (22:22 +0000)]
Merge "Add user-modifiable downloads backup conditions."
David Gross [Thu, 21 Jul 2016 21:56:11 +0000 (21:56 +0000)]
resolve merge conflicts of
95e42d9 to nyc-dev-plus-aosp
am:
289688de68
Change-Id: I652da37413ea880c902cc6ff2a40526f481da9dc
David Gross [Thu, 21 Jul 2016 21:06:20 +0000 (14:06 -0700)]
resolve merge conflicts of
95e42d9 to nyc-dev-plus-aosp
Change-Id: Iaa22f6c36676974223919918657f5d04d94e482e
Sreevani Sreejith [Thu, 21 Jul 2016 20:50:37 +0000 (20:50 +0000)]
Merge \\"Merge \\\\"docs: Fixed typo.\\\\" into mnc-io-docs am:
71f742920d am:
9b911b8736\\" into nyc-dev am:
7e9ce5ceaa
am:
d0516671b1
Change-Id: Ib04d6cc64908182d7c394cf30f3bd00755031e81
Sreevani Sreejith [Thu, 21 Jul 2016 20:50:34 +0000 (20:50 +0000)]
Merge \\\\"docs: Fixed typo.\\\\" into mnc-io-docs am:
71f742920d am:
01f12a9e18 am:
daaa7b7e5b
am:
11dca20c16
Change-Id: I288effe4723b1620a4530c7ee19f20bd789854e6
Andrew Solovay [Thu, 21 Jul 2016 20:50:23 +0000 (13:50 -0700)]
docs: Replacing curly apostrophes with straight ones
Need to have a CL ready to go in case that's necessary to force
a docs build on the new branch, so I'm setting up this one. Doing
nothing but changing ’ to ' in a few files.
Change-Id: I408f9152d4898e75ab34a92606620afeaf4d3ab9
Sreevani Sreejith [Thu, 21 Jul 2016 20:43:06 +0000 (20:43 +0000)]
Merge \"Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am:
71f742920d am:
9b911b8736\" into nyc-dev
am:
7e9ce5ceaa
Change-Id: Ic5f9b2cd6e099cc350b07ba81cdd96700cfd9077
sreevanis [Thu, 21 Jul 2016 20:43:02 +0000 (20:43 +0000)]
Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am:
71f742920d am:
01f12a9e18
am:
daaa7b7e5b
Change-Id: I4d8a02a6e09e967733f1d0ec36a23f4a73ce40f2
Android Build Merger (Role) [Thu, 21 Jul 2016 20:39:26 +0000 (20:39 +0000)]
Merge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am:
71f742920d am:
9b911b8736" into nyc-dev
Sreevani Sreejith [Thu, 21 Jul 2016 20:38:53 +0000 (20:38 +0000)]
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am:
71f742920d
am:
9b911b8736
Change-Id: If294d38647849c51c2ba46b041417346a410c533
Sreevani Sreejith [Thu, 21 Jul 2016 20:38:48 +0000 (20:38 +0000)]
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am:
71f742920d
am:
01f12a9e18
Change-Id: I3c72f75050a4426d4e67fd6a73b7d0f3bc8eff71
sreevanis [Thu, 21 Jul 2016 20:32:55 +0000 (20:32 +0000)]
Merge \"docs: Fixed typo.\" into mnc-io-docs
am:
71f742920d
Change-Id: Ia489afb465582c6600d35ffed5826816b4043746
sreevanis [Thu, 21 Jul 2016 20:32:51 +0000 (20:32 +0000)]
Merge \"docs: Fixed typo.\" into mnc-io-docs
am:
71f742920d
Change-Id: Ife230ca465a93b9cad9367d302fe402e574f3175
Sreevani Sreejith [Thu, 21 Jul 2016 20:24:50 +0000 (20:24 +0000)]
Merge "docs: Fixed typo." into mnc-io-docs
Kirill Grouchnikov [Thu, 21 Jul 2016 18:56:00 +0000 (18:56 +0000)]
Merge "Tweaking scroll-related functionality of AbsListView"
David Gross [Thu, 21 Jul 2016 18:43:15 +0000 (11:43 -0700)]
resolve merge conflicts of
ed6625d to stage-aosp-master
Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8
Amanda Kassay [Thu, 21 Jul 2016 17:19:40 +0000 (17:19 +0000)]
Merge \\\"Adding projec.yaml files to all top/sub categories.\\\" into nyc-dev am:
5a76378471 am:
07d5731381
am:
5ebc9dcec2
Change-Id: I092f82b417ec89a695ec9890804a99ca2c12124f
Amanda Kassay [Thu, 21 Jul 2016 17:13:36 +0000 (17:13 +0000)]
Merge \\"Adding projec.yaml files to all top/sub categories.\\" into nyc-dev am:
5a76378471
am:
07d5731381
Change-Id: Iba9139457028ae8a398dd5681e5d6c26305f8f4d
Amanda Kassay [Thu, 21 Jul 2016 17:09:46 +0000 (17:09 +0000)]
Merge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
am:
5a76378471
Change-Id: Ibf98357a67297ee6bb20d58d2c1063917aa5c7b1
Amanda Kassay [Thu, 21 Jul 2016 17:09:39 +0000 (17:09 +0000)]
Merge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
am:
5a76378471
Change-Id: Ib4e0a75117044599c72de287039c60f0391788c2
Amanda Kassay [Thu, 21 Jul 2016 17:02:12 +0000 (17:02 +0000)]
Merge "Adding projec.yaml files to all top/sub categories." into nyc-dev
David Gross [Thu, 21 Jul 2016 16:15:37 +0000 (16:15 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."
Bill Yi [Thu, 21 Jul 2016 16:09:12 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 21 Jul 2016 16:07:41 +0000 (09:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30233028
Change-Id: If78d06c444ccd169c81a1ec4e5d8af86c846ced9
Srinath Sridharan [Thu, 21 Jul 2016 16:00:39 +0000 (16:00 +0000)]
Merge "Adding a new getThreadScheduler() method." into nyc-mr1-dev
Benjamin Franz [Thu, 21 Jul 2016 15:57:21 +0000 (15:57 +0000)]
Merge \\\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9 am:
cb805b35f3 -s ours am:
662e2a7975 am:
461309a63a
am:
1ca903022c -s ours
Change-Id: Ia7b3c9756c7224ac38c028d9018813442fe02436
Billy Lamberta [Thu, 21 Jul 2016 15:57:15 +0000 (15:57 +0000)]
Merge \\\"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\\\" into nyc-dev am:
7dbcfcadd5 am:
4f93fdb999
am:
f472f858d3
Change-Id: I79a3e554c46880d6d7c7dd73ccd2775671a27399
Billy Lamberta [Thu, 21 Jul 2016 15:57:08 +0000 (15:57 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f am:
c7cffa3e6a am:
576f482813
am:
7509892568
Change-Id: I3187adf6f20e06296d1440986d68bd08398ee64a
Amanda Kassay [Thu, 21 Jul 2016 15:57:00 +0000 (15:57 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am:
83fb75ded3 am:
e9d58227bb am:
0d6757dafd
am:
1825bb09ef
Change-Id: Ibc27ac036690bff63481e54e88fefb0fa91fcdc1
Benjamin Franz [Thu, 21 Jul 2016 15:50:39 +0000 (15:50 +0000)]
Merge \\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9 am:
cb805b35f3 -s ours am:
662e2a7975
am:
461309a63a
Change-Id: Id36d384021feafabd71ff382ca8054da2f67a722
Billy Lamberta [Thu, 21 Jul 2016 15:50:37 +0000 (15:50 +0000)]
Merge \\"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\\" into nyc-dev am:
7dbcfcadd5
am:
4f93fdb999
Change-Id: I41fb264f3388716fb4ec08c058f2210752611228
Billy Lamberta [Thu, 21 Jul 2016 15:50:35 +0000 (15:50 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f am:
c7cffa3e6a
am:
576f482813
Change-Id: I3d6c2b990f67864969b14304066c6f853fd2708c
OSDN Git Service
