OSDN Git Service
David Friedman [Thu, 28 May 2015 23:18:24 +0000 (23:18 +0000)]
am
36756947: am
c397dde1: am
92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit '
3675694775d69712a2c9d5ee1d39dd2a5127cc86':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
Doris Liu [Thu, 28 May 2015 22:57:22 +0000 (22:57 +0000)]
am
a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev
* commit '
a9ac835437f45c7f7f3fc53f56aec2d53390fa72':
Clean up calls to Rect.intersect()
Glenn Kasten [Thu, 28 May 2015 22:57:17 +0000 (22:57 +0000)]
am
626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev
* commit '
626f0dc73bc1007d16688eddf29ea58ec26f424e':
Deprecations are warnings not errors
Chris Craik [Thu, 28 May 2015 22:57:08 +0000 (22:57 +0000)]
am
da28c868: Merge "Fix round cap approximation to understand scale" into mnc-dev
* commit '
da28c8681a6868d188431aed626abe9bd6da2502':
Fix round cap approximation to understand scale
David Friedman [Thu, 28 May 2015 22:57:03 +0000 (22:57 +0000)]
am
b3af4f43: am
9ffbf9bd: am
ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit '
b3af4f43d747d214c834ff824fd3116d4728b817':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Quddus Chong [Thu, 28 May 2015 22:56:59 +0000 (22:56 +0000)]
am
2f9f8a38: am
01c4d8d3: am
dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
* commit '
2f9f8a38f1d669f3e4a43c087a98c3464c1ad947':
docs: Fixed training TOC formatting and broken link in TV training landing.
Wale Ogunwale [Thu, 28 May 2015 22:56:53 +0000 (22:56 +0000)]
am
c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is removed." into mnc-dev
* commit '
c7cbdd11c322daa3a3c7acbf7e457c3ccf34c4d3':
Don't kill process with active service/receiver when task is removed.
Chris Craik [Thu, 28 May 2015 22:56:47 +0000 (22:56 +0000)]
am
2df124b8: Merge "Fix build" into mnc-dev
* commit '
2df124b8547c4ba7a2b0c9903f21811583f74184':
Fix build
Alan Viverette [Thu, 28 May 2015 22:56:43 +0000 (22:56 +0000)]
am
4562f0bc: Merge "Fix drawable CTS breakages" into mnc-dev
* commit '
4562f0bc898317887f82d62472a3bbbe7b4517f3':
Fix drawable CTS breakages
David Friedman [Thu, 28 May 2015 22:54:29 +0000 (22:54 +0000)]
am
c397dde1: am
92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit '
c397dde17960f2308ecc3ef0b5143c95df8e160c':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
Doris Liu [Thu, 28 May 2015 22:51:41 +0000 (22:51 +0000)]
Merge "Clean up calls to Rect.intersect()" into mnc-dev
Glenn Kasten [Thu, 28 May 2015 22:51:15 +0000 (22:51 +0000)]
Merge "Deprecations are warnings not errors" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:50:02 +0000 (22:50 +0000)]
Merge "Fix round cap approximation to understand scale" into mnc-dev
David Friedman [Thu, 28 May 2015 22:40:16 +0000 (22:40 +0000)]
am
9ffbf9bd: am
ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit '
9ffbf9bd9b40487b7edacdf0c790714f080494c4':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Quddus Chong [Thu, 28 May 2015 22:40:01 +0000 (22:40 +0000)]
am
01c4d8d3: am
dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
* commit '
01c4d8d357aef661d15ef770986e35be324c6d03':
docs: Fixed training TOC formatting and broken link in TV training landing.
Doris Liu [Thu, 28 May 2015 22:35:52 +0000 (15:35 -0700)]
Clean up calls to Rect.intersect()
This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.
bug:
7368679
Change-Id: Ibda3bfd662f8ca83cb5662748d9be250243b72b2
Wale Ogunwale [Thu, 28 May 2015 22:38:02 +0000 (22:38 +0000)]
Merge "Don't kill process with active service/receiver when task is removed." into mnc-dev
Chris Craik [Thu, 28 May 2015 22:34:53 +0000 (22:34 +0000)]
Merge "Fix build" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:33:40 +0000 (15:33 -0700)]
Fix build
Change-Id: I7ee28c474aa821eb598f719723d87416a41537b9
Alan Viverette [Thu, 28 May 2015 22:33:30 +0000 (22:33 +0000)]
Merge "Fix drawable CTS breakages" into mnc-dev
David Friedman [Thu, 28 May 2015 22:33:22 +0000 (22:33 +0000)]
am
92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit '
92451a97271d014ab10ca4685beae728d53601b4':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
David Friedman [Thu, 28 May 2015 22:16:19 +0000 (22:16 +0000)]
Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
David Friedman [Thu, 28 May 2015 22:09:15 +0000 (22:09 +0000)]
am
ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit '
ed8c62955aa6512fb4e929e59893c774ae894358':
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Chris Craik [Thu, 28 May 2015 22:08:39 +0000 (22:08 +0000)]
am
1cd7e4c3: Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev
* commit '
1cd7e4c3d0216cfb9a8a685ca8cf6f0d740a9dff':
Use path intersection instead of saveLayer+mesh to mask projected ripples
Deepanshu Gupta [Thu, 28 May 2015 22:08:34 +0000 (22:08 +0000)]
am
5cd795a9: Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev
* commit '
5cd795a9094eb02c983751ecabca6f24b0a01c58':
Fix NPE in BridgeContext.obtainStyledAttributes()
Deepanshu Gupta [Thu, 28 May 2015 22:08:30 +0000 (22:08 +0000)]
am
1421583b: Merge "Fix BridgeTypedArray.getType()" into mnc-dev
* commit '
1421583bca78ed1d2e22d091d64ae72352c4a9f5':
Fix BridgeTypedArray.getType()
Chris Craik [Thu, 28 May 2015 22:03:06 +0000 (22:03 +0000)]
Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev
Deepanshu Gupta [Thu, 28 May 2015 21:59:08 +0000 (21:59 +0000)]
Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev
Quddus Chong [Thu, 28 May 2015 21:59:02 +0000 (21:59 +0000)]
am
dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
* commit '
dcfa755616504fb4443f4d79d936f30c3742d77a':
docs: Fixed training TOC formatting and broken link in TV training landing.
David Friedman [Thu, 28 May 2015 21:58:57 +0000 (21:58 +0000)]
Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
Deepanshu Gupta [Thu, 28 May 2015 21:58:56 +0000 (21:58 +0000)]
Merge "Fix BridgeTypedArray.getType()" into mnc-dev
Deepanshu Gupta [Thu, 28 May 2015 19:33:04 +0000 (12:33 -0700)]
Fix NPE in BridgeContext.obtainStyledAttributes()
Replace direct member access with getter that checks for nullness.
Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
Deepanshu Gupta [Wed, 27 May 2015 23:57:10 +0000 (16:57 -0700)]
Fix BridgeTypedArray.getType()
Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.
Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
Tao Bao [Thu, 28 May 2015 21:51:44 +0000 (21:51 +0000)]
am
165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
* commit '
165102f350e08bd186b25b90dd8a42aad8975890':
Wait for uncrypt to finish before rebooting
Dianne Hackborn [Thu, 28 May 2015 21:51:37 +0000 (21:51 +0000)]
am
4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev
* commit '
4573dddcce3f232d2eeb20bfe0e204e15a9416e9':
Add new API to set URI on AssistContent.
Tao Bao [Thu, 28 May 2015 21:48:27 +0000 (21:48 +0000)]
Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
Quddus Chong [Thu, 28 May 2015 21:31:29 +0000 (14:31 -0700)]
docs: Fixed training TOC formatting and broken link in TV training landing.
Change-Id: Ie159a1e5d3d84bfc20b2e2f0f5d4973d3880876d
Evgenii Stepanov [Thu, 28 May 2015 21:36:13 +0000 (21:36 +0000)]
am
bf7fe1e0: Merge "Update asan/app_process." into mnc-dev
* commit '
bf7fe1e051fefc5e6c1b96411a842b0305a9192c':
Update asan/app_process.
Quddus Chong [Thu, 28 May 2015 21:36:09 +0000 (21:36 +0000)]
am
0e591ef2: am
7138643f: am
d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
* commit '
0e591ef26ae060bf1d47ffdd02b23b5da416fad7':
docs: Misc. fixes for M Preview docs.
Dianne Hackborn [Thu, 28 May 2015 21:35:40 +0000 (21:35 +0000)]
Merge "Add new API to set URI on AssistContent." into mnc-dev
Evgenii Stepanov [Thu, 28 May 2015 21:30:56 +0000 (21:30 +0000)]
Merge "Update asan/app_process." into mnc-dev
Quddus Chong [Thu, 28 May 2015 21:20:18 +0000 (21:20 +0000)]
am
7138643f: am
d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
* commit '
7138643f4185d402ac216cfcfe3c871c860bf84e':
docs: Misc. fixes for M Preview docs.
Olawale Ogunwale [Thu, 28 May 2015 21:12:17 +0000 (21:12 +0000)]
am
aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev
* commit '
aa47d8d97600e439c73cdbdcc47db44e71831ea6':
Revert "Revert "Remove debugging and skip InputMethod windows""
Quddus Chong [Thu, 28 May 2015 21:05:02 +0000 (21:05 +0000)]
am
d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
* commit '
d5db0f63b4cf03294c2871eb3bf9d3b944700788':
docs: Misc. fixes for M Preview docs.
Olawale Ogunwale [Thu, 28 May 2015 20:59:09 +0000 (20:59 +0000)]
Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev
David Friedman [Thu, 28 May 2015 20:57:33 +0000 (13:57 -0700)]
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
Change-Id: I39c5c060f41cc501ef595e136fa2376232ea108d
Alan Viverette [Thu, 28 May 2015 00:18:57 +0000 (17:18 -0700)]
Fix drawable CTS breakages
1. ClipDrawable.getOpacity() now correctly respects the current level
2. DrawableWrapper checks the contained drawable's changing config even
if it doesn't have a constant state
3. DrawableWrapper gives priority to the last valid child drawable
rather than the drawable attribute
Bug:
21406104
Change-Id: I442fe90d0a3865bfdc6b2d14a7358178310dde02
Quddus Chong [Thu, 28 May 2015 20:47:14 +0000 (20:47 +0000)]
Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
John Spurlock [Thu, 28 May 2015 20:39:44 +0000 (20:39 +0000)]
am
517f3ee4: Merge "Backup/restore notification policy." into mnc-dev
* commit '
517f3ee41afb7713f1fc6fa37a6f3a6efa97a020':
Backup/restore notification policy.
Doris Liu [Thu, 28 May 2015 20:39:39 +0000 (20:39 +0000)]
am
057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev
* commit '
057d93971a5415a989ec5c8a8b0437ee12b6604f':
Fix ScrollView's EdgeEffect to respect clipToPadding flag
Guang Zhu [Thu, 28 May 2015 20:39:33 +0000 (20:39 +0000)]
am
6ac0c8c5: lock device orientation during app compatibility test
* commit '
6ac0c8c5faaa2fdf56a533a6a3452d53850809ee':
lock device orientation during app compatibility test
John Spurlock [Thu, 28 May 2015 20:34:17 +0000 (20:34 +0000)]
Merge "Backup/restore notification policy." into mnc-dev
Doris Liu [Thu, 28 May 2015 20:33:11 +0000 (20:33 +0000)]
Merge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev
Doris Liu [Thu, 28 May 2015 17:18:46 +0000 (10:18 -0700)]
Fix ScrollView's EdgeEffect to respect clipToPadding flag
bug:
19126514
Change-Id: I21fe4fd3e2f1240ee31c51f9deac7f285ffe2408
Guang Zhu [Thu, 28 May 2015 20:22:28 +0000 (13:22 -0700)]
lock device orientation during app compatibility test
Devices on test benches are usually held sideways, which leads to app
rotation during launch. While it's useful to identify such issue from an
app perspective, the app compatibility test should be isolated from such
noise for the purpose of the testing for basic level of compatibility.
Change-Id: I403f96e5d8512ca6a17b05a83d69f4b02f760a32
David Friedman [Thu, 28 May 2015 20:25:32 +0000 (13:25 -0700)]
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Change-Id: I78d719f48f795f0477e4a08920ddb05fce48b5fc
John Spurlock [Thu, 28 May 2015 15:24:10 +0000 (11:24 -0400)]
Backup/restore notification policy.
- Include zen + ranking config in the backup payload.
- Owner user only for now.
- For the most part, reuse existing policy file structure
as the payload format, but elide items that do not survive
across devices (info for secondary users, uids).
- Also elide the manual zen rule, if set.
- During restore, keep ranking info for uninstalled apps
in purgatory until the apps exist.
Bug:
17755700
Change-Id: Iadf71a43cd0efd44fe9a0a29874d60666b6d2076
Quddus Chong [Thu, 28 May 2015 17:13:14 +0000 (10:13 -0700)]
docs: Misc. fixes for M Preview docs.
Change-Id: I816bb18d0110a4a7e585fe727471c2356a93caac
Bryce Lee [Thu, 28 May 2015 20:15:44 +0000 (20:15 +0000)]
am
3aeb5f84: am
2836b863: am
f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
* commit '
3aeb5f848eee2c6de9bb49c9dcc7ca5127ef7c1e':
Introduce indirection for base micro themes.
Adam Lesinski [Thu, 28 May 2015 20:15:39 +0000 (20:15 +0000)]
am
8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
* commit '
8a179cab7971782900f5b4a872f4f432c7d17987':
BatteryStats: Output per-app wifi controller distribution
Bryce Lee [Thu, 28 May 2015 20:07:57 +0000 (20:07 +0000)]
am
2836b863: am
f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
* commit '
2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
Introduce indirection for base micro themes.
Adam Lesinski [Thu, 28 May 2015 20:04:16 +0000 (20:04 +0000)]
Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
Bryce Lee [Thu, 28 May 2015 19:52:17 +0000 (19:52 +0000)]
am
f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
* commit '
f33da5188d5d1d66c1697a84358f334018e9f905':
Introduce indirection for base micro themes.
Adam Lesinski [Thu, 28 May 2015 18:38:12 +0000 (11:38 -0700)]
BatteryStats: Output per-app wifi controller distribution
Currently we only output this data on checkin, adding the output
to dumpsys as well.
Change-Id: I649474b576d7341bbf54ff95c0b0e6fed367bcb0
Evgenii Stepanov [Thu, 7 May 2015 17:55:59 +0000 (10:55 -0700)]
Update asan/app_process.
Build both 32 and 64-bit versions and don't limit it to eng.
Change-Id: I5d6cc8005291100d5fe0f1385e8a0b4ba5f4d630
(cherry picked from commit
e740b17d2400ed0db17d1f7fce4f052bbbf808ab)
Bryce Lee [Thu, 28 May 2015 19:39:44 +0000 (19:39 +0000)]
Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
David Friedman [Thu, 28 May 2015 19:36:56 +0000 (19:36 +0000)]
am
e9ac8174: am
dd6ccfd0: am
8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
* commit '
e9ac81745ef0c5f0d96a2c9dfcf2f84a86ccf85d':
Docs: Quick typo fix.
Luan Nguyen [Thu, 28 May 2015 19:36:51 +0000 (19:36 +0000)]
am
dd054f50: am
15afeaa9: am
2429cc41: docs: Fix bad heading link for doze-standby
* commit '
dd054f505b42c295baaca375d22c737fcb0fcb92':
docs: Fix bad heading link for doze-standby
David Friedman [Thu, 28 May 2015 19:20:19 +0000 (19:20 +0000)]
am
dd6ccfd0: am
8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
* commit '
dd6ccfd0d97c7a794793cd465be029310efa67ea':
Docs: Quick typo fix.
Luan Nguyen [Thu, 28 May 2015 19:20:13 +0000 (19:20 +0000)]
am
15afeaa9: am
2429cc41: docs: Fix bad heading link for doze-standby
* commit '
15afeaa99f6da12f6237a2b24fdd544b298bf589':
docs: Fix bad heading link for doze-standby
Peng Xu [Thu, 28 May 2015 19:15:31 +0000 (19:15 +0000)]
am
08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev
* commit '
08ecf676e655ba7a86744f63045290d1e331c0f6':
Bug fix and documentation clarification
Joe Fernandez [Thu, 28 May 2015 19:15:26 +0000 (19:15 +0000)]
am
e0e8570d: am
46e58a17: am
c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs
* commit '
e0e8570d591cd833f9950c4ac0de8ca425c47f95':
docs: Fix broken links on M Preview.
Luan Nguyen [Thu, 28 May 2015 19:15:20 +0000 (19:15 +0000)]
am
587748cd: am
a21ff962: am
c5d3758e: docs: Remove api-changes.html and references
* commit '
587748cdf78fe0149fef6a0e0ed9099ab804cb1c':
docs: Remove api-changes.html and references
David Friedman [Thu, 28 May 2015 19:03:28 +0000 (19:03 +0000)]
am
8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
* commit '
8bf833e40f403f5f40233bf7c68778b2401c5673':
Docs: Quick typo fix.
Luan Nguyen [Thu, 28 May 2015 19:03:21 +0000 (19:03 +0000)]
am
2429cc41: docs: Fix bad heading link for doze-standby
* commit '
2429cc419794a06866670675a5e5b3d7a746dd6b':
docs: Fix bad heading link for doze-standby
David Friedman [Thu, 28 May 2015 18:59:46 +0000 (18:59 +0000)]
Merge "Docs: Quick typo fix." into mnc-preview-docs
Peng Xu [Thu, 28 May 2015 18:57:45 +0000 (18:57 +0000)]
Merge "Bug fix and documentation clarification" into mnc-dev
Joe Fernandez [Thu, 28 May 2015 18:54:43 +0000 (18:54 +0000)]
am
46e58a17: am
c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs
* commit '
46e58a17890f9013f2d3714607c4c835df3638e0':
docs: Fix broken links on M Preview.
David Friedman [Thu, 28 May 2015 18:54:40 +0000 (18:54 +0000)]
am
319213ee: am
52454e38: am
bb7877c4: Docs: IO quick fix--commenting out part of script.
* commit '
319213eea1438bfa348a4099b5e1d6d8f92d0c4d':
Docs: IO quick fix--commenting out part of script.
Luan Nguyen [Thu, 28 May 2015 18:54:39 +0000 (18:54 +0000)]
am
a21ff962: am
c5d3758e: docs: Remove api-changes.html and references
* commit '
a21ff9621e3b9b8d64945ea55165acf435acd9b9':
docs: Remove api-changes.html and references
Luan Nguyen [Thu, 28 May 2015 18:48:31 +0000 (11:48 -0700)]
docs: Fix bad heading link for doze-standby
bug:
21491909
Change-Id: Id8c10262ab311aca42d3b4d37a479d6543530505
Dianne Hackborn [Thu, 28 May 2015 01:05:52 +0000 (18:05 -0700)]
Add new API to set URI on AssistContent.
Also rework how we transfer AssistContent and AssistStructure
to the assistant, so they are delivered as completely separate
objects rather than the kludgy bundling them in the assist
data thing.
Change-Id: Ib40cc3b152bafeb358fd3adec564a7dda3a0dd1d
Joe Fernandez [Thu, 28 May 2015 18:37:07 +0000 (18:37 +0000)]
am
c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs
* commit '
c8bcfe285626da3734281a17bb1748c68a33d46a':
docs: Fix broken links on M Preview.
Luan Nguyen [Thu, 28 May 2015 18:37:02 +0000 (18:37 +0000)]
am
c5d3758e: docs: Remove api-changes.html and references
* commit '
c5d3758eab49974dde9f2c3796e8abed79c69a1c':
docs: Remove api-changes.html and references
David Friedman [Thu, 28 May 2015 18:36:51 +0000 (18:36 +0000)]
am
52454e38: am
bb7877c4: Docs: IO quick fix--commenting out part of script.
* commit '
52454e38625e7457f645afe97ca3f666d615acc6':
Docs: IO quick fix--commenting out part of script.
Sanket Padawe [Thu, 28 May 2015 18:27:19 +0000 (18:27 +0000)]
am
3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev
* commit '
3a017f2c32eada0af896f8acb30353da05eef8e6':
Fix display of "null" string shown in Wifi Settings for AP.
Joe Fernandez [Thu, 28 May 2015 18:25:58 +0000 (18:25 +0000)]
Merge "docs: Fix broken links on M Preview." into mnc-preview-docs
Luan Nguyen [Thu, 28 May 2015 18:19:05 +0000 (11:19 -0700)]
docs: Remove api-changes.html and references
bug:
21491968
Change-Id: I4e3c9f135cb568735bbdce999c89699ef13b4cfe
David Friedman [Thu, 28 May 2015 18:18:47 +0000 (18:18 +0000)]
am
bb7877c4: Docs: IO quick fix--commenting out part of script.
* commit '
bb7877c4fe2c70ece0ab7d596e2a01a0e7c3c0db':
Docs: IO quick fix--commenting out part of script.
Sanket Padawe [Thu, 28 May 2015 18:10:43 +0000 (18:10 +0000)]
Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev
David Friedman [Thu, 28 May 2015 18:01:31 +0000 (11:01 -0700)]
Docs: IO quick fix--commenting out part of script.
Change-Id: Iaa7aa1d5e055e8ae05c636e1504fa80261f4a78f
Bryce Lee [Thu, 28 May 2015 18:03:57 +0000 (11:03 -0700)]
Introduce indirection for base micro themes.
This is needed, since overlays must add/modify items to base themes, but
simply declaring the style in an overlay will override the parent. To
ensure the true parent is never overridden, a base theme is introduced
that both the regular theme and the overlay can inherit from.
Bug:
21425951
Change-Id: I0967d0b4ddf12e9765bc321a7485a6dbdfef0b1e
Yin-Chia Yeh [Thu, 28 May 2015 18:01:57 +0000 (18:01 +0000)]
am
f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev
* commit '
f4b998153d4d921a64b7cfdb523cd3a97e2849a9':
Camera2: update legacy metadata
Yin-Chia Yeh [Thu, 28 May 2015 17:48:16 +0000 (17:48 +0000)]
Merge "Camera2: update legacy metadata" into mnc-dev
Luan Nguyen [Thu, 28 May 2015 17:42:26 +0000 (10:42 -0700)]
docs: Fix broken links on M Preview.
bug:
21490711
Change-Id: I1608dae5518f7335b5bc366cc28ee27a73a08521
Brian Attwell [Thu, 28 May 2015 17:43:41 +0000 (17:43 +0000)]
am
8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev
* commit '
8d38a8d84f3c6ee81db9e6aa38492a7ce7766206':
Deprecate {READ,WRITE}_PROFILE permission
Luan Nguyen [Thu, 28 May 2015 17:43:36 +0000 (17:43 +0000)]
am
56edce33: am
759b1673: am
c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs
* commit '
56edce33fb408a7ff593d1f4c8b62c252b3c45e8':
docs: Remove broken image link from samples.
Sanket Padawe [Thu, 28 May 2015 17:41:14 +0000 (10:41 -0700)]
Fix display of "null" string shown in Wifi Settings for AP.
Bug:
21476825
Change-Id: I643dcaa3112ff896e7b0abd998f2ad5e13187706
Brian Attwell [Thu, 28 May 2015 17:36:35 +0000 (17:36 +0000)]
Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev
Luan Nguyen [Thu, 28 May 2015 17:28:24 +0000 (17:28 +0000)]
am
759b1673: am
c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs
* commit '
759b1673dd682db6dbddf8531b704dba1853ae1b':
docs: Remove broken image link from samples.
OSDN Git Service
