Commit Graph

267653 Commits

Author SHA1 Message Date
Philip P. Moltmann
be591d709c Merge \\\"Handling of Fuji Xerox in RecommendationService.\\\" into nyc-dev am: 5398f2731b am: 0273d5d4ed
am: 00c3ada2eb

Change-Id: I6c92e7dc6ec2b279373f8b5dbcdebb9a11f8d9ce
2016-06-09 19:40:28 +00:00
Philip P. Moltmann
00c3ada2eb Merge \\"Handling of Fuji Xerox in RecommendationService.\\" into nyc-dev am: 5398f2731b
am: 0273d5d4ed

Change-Id: Ib0ea427162ea3003fc1038a308826c2fd26f9774
2016-06-09 19:36:41 +00:00
Philip P. Moltmann
0273d5d4ed Merge \"Handling of Fuji Xerox in RecommendationService.\" into nyc-dev
am: 5398f2731b

Change-Id: I109284a897eba18ec57bd5f61cdade0fcde19a36
2016-06-09 19:31:57 +00:00
TreeHugger Robot
a282745fb8 Merge "Simplify KeyframeSet to avoid caching." 2016-06-09 19:26:50 +00:00
Philip P. Moltmann
5398f2731b Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev 2016-06-09 19:24:05 +00:00
TreeHugger Robot
cd6edf4df2 Merge "Ensure thumbnail cache test suite is running on main thread." 2016-06-09 19:06:07 +00:00
Adrian Roos
2cfedbbe53 Merge \\"Seascape Navigation Bar View\\" into nyc-mr1-dev am: 7d76682bb3
am: 8187b7056d

Change-Id: I3db4375855ac1081ea8e59411bf355f4b08150e0
2016-06-09 18:40:26 +00:00
Adrian Roos
8187b7056d Merge \"Seascape Navigation Bar View\" into nyc-mr1-dev
am: 7d76682bb3

Change-Id: Ifc18745df593f07e6b3f04a296d8bd3003a5cb88
2016-06-09 18:32:21 +00:00
Eric Schmidt
97c92ec088 Merge \\\\\"docs: Added links to performance resources section\\\\\" into mnc-io-docs am: e4b1149320 am: 2dea7d3836 am: b1a99c46b6 am: ab261a1113
am: 810dfaedb7

Change-Id: Ib254b4e9ec2e9fb96bb96f2741b23478464d98af
2016-06-09 18:27:34 +00:00
Adrian Roos
7d76682bb3 Merge "Seascape Navigation Bar View" into nyc-mr1-dev 2016-06-09 18:22:22 +00:00
Eric Schmidt
810dfaedb7 Merge \\\\"docs: Added links to performance resources section\\\\" into mnc-io-docs am: e4b1149320 am: 2dea7d3836 am: b1a99c46b6
am: ab261a1113

Change-Id: I9683c24b3c863a1b38d977ebad31df3220685009
2016-06-09 18:19:40 +00:00
Eric Schmidt
34d2897882 Merge \\\\\"docs: Added links to performance resources section\\\\\" into mnc-io-docs am: e4b1149320 am: 2dea7d3836 am: b1a99c46b6 am: 52f182be1d
am: a2ec486b50

Change-Id: I9ea1f91b0c15095d6a76c31364b0db00a2b48487
2016-06-09 18:14:22 +00:00
Eric Schmidt
a2ec486b50 Merge \\\\"docs: Added links to performance resources section\\\\" into mnc-io-docs am: e4b1149320 am: 2dea7d3836 am: b1a99c46b6
am: 52f182be1d

Change-Id: I0a3ec1940810f8744b07941431addca8118b2ec8
2016-06-09 18:08:29 +00:00
Eric Schmidt
ab261a1113 Merge \\\"docs: Added links to performance resources section\\\" into mnc-io-docs am: e4b1149320 am: 2dea7d3836
am: b1a99c46b6

Change-Id: If38d960ef06b24ea1f23c82b521a8162ca625698
2016-06-09 18:02:30 +00:00
Eric Schmidt
52f182be1d Merge \\\"docs: Added links to performance resources section\\\" into mnc-io-docs am: e4b1149320 am: 2dea7d3836
am: b1a99c46b6

Change-Id: I97b35a9519074face9851550b6e6c18300145624
2016-06-09 18:02:19 +00:00
Eric Schmidt
b1a99c46b6 Merge \\"docs: Added links to performance resources section\\" into mnc-io-docs am: e4b1149320
am: 2dea7d3836

Change-Id: I73d48da51be02656ae636686b42253c35ebc3762
2016-06-09 17:56:38 +00:00
Eric Schmidt
2dea7d3836 Merge \"docs: Added links to performance resources section\" into mnc-io-docs
am: e4b1149320

Change-Id: Ib1fa097035dce4d6e4c55ac6d87aa26bacceade8
2016-06-09 17:45:53 +00:00
Eric Schmidt
e4b1149320 Merge "docs: Added links to performance resources section" into mnc-io-docs 2016-06-09 17:37:26 +00:00
Muyuan Li
f0592b306f Merge "sysui: refactor for extensibility." 2016-06-09 17:37:21 +00:00
Android Build Merger (Role)
79f9d8e4f1 Merge "Merge \\\\\"Correct the size of example bitmap for xxhdpi.\\\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600 am: e82ac10fa2 am: b93d526ff4 am: 4ddd4f5826" 2016-06-09 17:30:29 +00:00
Android Build Merger (Role)
daf5283e56 Merge "Merge \\\\\"Remove duplicate the from AppBar documentation.\\\\\" into mnc-io-docs am: f9f7a29fe9 am: 9bd21c0fbb am: 9ac187304b am: 9ce7ec6770 am: 80446e9a26" 2016-06-09 17:30:18 +00:00
Android Build Merger (Role)
0bcfc32d75 Merge "Merge \\\\\"Fix code example in testing-support-library.\\\\\" into mnc-io-docs am: e172a4b692 am: 5b8233126d am: 248eb25863 am: 964141ab9d am: 1e06f2ba3f" 2016-06-09 17:30:08 +00:00
Android Build Merger (Role)
57995707e5 Merge "Merge \\\\\"Fix a link to CustomTabsCallback in support-library docs.\\\\\" into mnc-io-docs am: 2ff2814a4a am: 5d75a24896 am: d8b2c49475 am: 8c3edafda4 am: 23d7202a80" 2016-06-09 17:29:58 +00:00
Android Build Merger (Role)
0e61d2dac2 Merge "Merge \\\\\"Correct the size of example bitmap for xxhdpi.\\\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600 am: e82ac10fa2 am: 0e0af5b1c8 am: 023c04ca96" 2016-06-09 17:29:48 +00:00
Aurimas Liutikas
7c0951947f Merge \\\\\"Correct the size of example bitmap for xxhdpi.\\\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600 am: e82ac10fa2 am: b93d526ff4
am: 4ddd4f5826

Change-Id: I17f4483d6693304e6c847cb9ef3c1205c039ce16
2016-06-09 17:29:17 +00:00
Aurimas Liutikas
a15176b016 Merge \\\\\"Remove duplicate the from AppBar documentation.\\\\\" into mnc-io-docs am: f9f7a29fe9 am: 9bd21c0fbb am: 9ac187304b am: 9ce7ec6770
am: 80446e9a26

Change-Id: I98ad2ff5357642b91a296088800c688e6586cd1d
2016-06-09 17:29:15 +00:00
Aurimas Liutikas
3310c0fc9a Merge \\\\\"Fix code example in testing-support-library.\\\\\" into mnc-io-docs am: e172a4b692 am: 5b8233126d am: 248eb25863 am: 964141ab9d
am: 1e06f2ba3f

Change-Id: I54bafe38094f3964629b3806bb1656ae4797173c
2016-06-09 17:29:13 +00:00
Aurimas Liutikas
27bd946db0 Merge \\\\\"Fix a link to CustomTabsCallback in support-library docs.\\\\\" into mnc-io-docs am: 2ff2814a4a am: 5d75a24896 am: d8b2c49475 am: 8c3edafda4
am: 23d7202a80

Change-Id: I88d469a3662a973e07c2faa1c7ac310ee17d9ab9
2016-06-09 17:29:11 +00:00
Aurimas Liutikas
7bc7a1ea6f Merge \\\\\"Correct the size of example bitmap for xxhdpi.\\\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600 am: e82ac10fa2 am: 0e0af5b1c8
am: 023c04ca96

Change-Id: I92cbf8b42c5b940740d3b6ae59ecff6b3138f6ab
2016-06-09 17:29:09 +00:00
Ben Lin
151451967a Merge "Isolate Menu/Action management into dedicated manager classes." 2016-06-09 17:26:11 +00:00
Aurimas Liutikas
299048ae64 Merge \\\\\"Remove duplicate the from AppBar documentation.\\\\\" into mnc-io-docs am: f9f7a29fe9 am: 9bd21c0fbb am: 9ac187304b am: 065c770f80
am: 619e0c3dd4

Change-Id: Iee65f5e23eef5fa42debd35e13e727de4db74c18
2016-06-09 17:24:40 +00:00
Aurimas Liutikas
844a2ff95c Merge \\\\\"Fix code example in testing-support-library.\\\\\" into mnc-io-docs am: e172a4b692 am: 5b8233126d am: 248eb25863 am: a550dfc9b3
am: 88a5c41c2b

Change-Id: Id0d31792e24927f47d93569c527b0874302ea904
2016-06-09 17:24:37 +00:00
Aurimas Liutikas
3fad7835b5 Merge \\\\\"Fix a link to CustomTabsCallback in support-library docs.\\\\\" into mnc-io-docs am: 2ff2814a4a am: 5d75a24896 am: d8b2c49475 am: bca9886b2c
am: e28ef6365d

Change-Id: I34ce8d7a8fbd6050e248d70c2e739fa4d163d391
2016-06-09 17:24:34 +00:00
Bill Yi
2112824b40 Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 3bbeae9ddd -s ours
am: 71856b14d2  -s ours

Change-Id: I44af41f9e993bbd6bb010f2d7faef264491a5d6d
2016-06-09 17:24:31 +00:00
Todd Kennedy
a3d4c84311 Merge \\"make round icon usage configurable\\" into nyc-mr1-dev am: 7b52b2eccd
am: ca251e5325

Change-Id: Icdf6c4c97c8ef7601f64e920623b47d215efa9d4
2016-06-09 17:24:29 +00:00
Aurimas Liutikas
4ddd4f5826 Merge \\\\"Correct the size of example bitmap for xxhdpi.\\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600 am: e82ac10fa2
am: b93d526ff4

Change-Id: I652f3f74bd81438c2b7aab594e152357373eb7b7
2016-06-09 17:19:14 +00:00
Aurimas Liutikas
80446e9a26 Merge \\\\"Remove duplicate the from AppBar documentation.\\\\" into mnc-io-docs am: f9f7a29fe9 am: 9bd21c0fbb am: 9ac187304b
am: 9ce7ec6770

Change-Id: I908da508df1be1ce9554516a9438bf835b3030ee
2016-06-09 17:19:11 +00:00
Aurimas Liutikas
1e06f2ba3f Merge \\\\"Fix code example in testing-support-library.\\\\" into mnc-io-docs am: e172a4b692 am: 5b8233126d am: 248eb25863
am: 964141ab9d

Change-Id: I86b8b3690c5e0c5b82cafb8417dd4423b483046a
2016-06-09 17:19:08 +00:00
Aurimas Liutikas
23d7202a80 Merge \\\\"Fix a link to CustomTabsCallback in support-library docs.\\\\" into mnc-io-docs am: 2ff2814a4a am: 5d75a24896 am: d8b2c49475
am: 8c3edafda4

Change-Id: I84429d3b95fe5e225828dbf379206acff2e77663
2016-06-09 17:19:05 +00:00
Aurimas Liutikas
023c04ca96 Merge \\\\"Correct the size of example bitmap for xxhdpi.\\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600 am: e82ac10fa2
am: 0e0af5b1c8

Change-Id: I35003907a10f8aa675a774aba2a8105fbd7b7bbc
2016-06-09 17:16:51 +00:00
Aurimas Liutikas
619e0c3dd4 Merge \\\\"Remove duplicate the from AppBar documentation.\\\\" into mnc-io-docs am: f9f7a29fe9 am: 9bd21c0fbb am: 9ac187304b
am: 065c770f80

Change-Id: I34ce6e3d3409883d6c4165a01c484ff0cafc1fc9
2016-06-09 17:13:41 +00:00
Aurimas Liutikas
88a5c41c2b Merge \\\\"Fix code example in testing-support-library.\\\\" into mnc-io-docs am: e172a4b692 am: 5b8233126d am: 248eb25863
am: a550dfc9b3

Change-Id: Ie97f8b9922d8c5dfc6034ec20b388b692d53a93e
2016-06-09 17:13:37 +00:00
Aurimas Liutikas
e28ef6365d Merge \\\\"Fix a link to CustomTabsCallback in support-library docs.\\\\" into mnc-io-docs am: 2ff2814a4a am: 5d75a24896 am: d8b2c49475
am: bca9886b2c

Change-Id: Ia100b4b0a8f5b7a24db1897ef973ca760a3a8041
2016-06-09 17:13:35 +00:00
Bill Yi
71856b14d2 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 3bbeae9ddd  -s ours

Change-Id: I30eede8a0a084b61746033444487e991b20c94f5
2016-06-09 17:13:31 +00:00
Todd Kennedy
ca251e5325 Merge \"make round icon usage configurable\" into nyc-mr1-dev
am: 7b52b2eccd

Change-Id: I99706274705ca5589a70370af8dd17f5a4bc0297
2016-06-09 17:13:28 +00:00
Aurimas Liutikas
b93d526ff4 Merge \\\"Correct the size of example bitmap for xxhdpi.\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600
am: e82ac10fa2

Change-Id: I984489411a4aceb62c495f861f18c130699ffe62
2016-06-09 17:09:26 +00:00
Aurimas Liutikas
9ce7ec6770 Merge \\\"Remove duplicate the from AppBar documentation.\\\" into mnc-io-docs am: f9f7a29fe9 am: 9bd21c0fbb
am: 9ac187304b

Change-Id: I5d1a08a1c8b69409fb5e7350582868f9cf383902
2016-06-09 17:09:14 +00:00
Aurimas Liutikas
964141ab9d Merge \\\"Fix code example in testing-support-library.\\\" into mnc-io-docs am: e172a4b692 am: 5b8233126d
am: 248eb25863

Change-Id: I28e1c06db8f2095dd2d8f05effac4fe2c7f4f974
2016-06-09 17:09:05 +00:00
Aurimas Liutikas
8c3edafda4 Merge \\\"Fix a link to CustomTabsCallback in support-library docs.\\\" into mnc-io-docs am: 2ff2814a4a am: 5d75a24896
am: d8b2c49475

Change-Id: I56ddae17078815ead1812bf598665e0f5c4ecc88
2016-06-09 17:08:58 +00:00
Aurimas Liutikas
0e0af5b1c8 Merge \\\"Correct the size of example bitmap for xxhdpi.\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600
am: e82ac10fa2

Change-Id: Ie1c0f2c4ff45420a4cb54f57ada28ee85db779fa
2016-06-09 17:02:55 +00:00