OSDN Git Service
Brian Duddie [Wed, 15 Jun 2016 21:32:57 +0000 (21:32 +0000)]
Merge \\"Send VR mode notification to AR app on context hub\\" into nyc-dev am:
9a31e8be48
am:
93a2410f2d
Change-Id: Id041412ad3d4bb72d3284e307a9621c2db1f0e8d
Hall Liu [Wed, 15 Jun 2016 21:32:05 +0000 (21:32 +0000)]
Merge \"Add support for Telecom analytics extensions\" into nyc-mr1-dev
am:
81ce5bc113
Change-Id: I0902866046098d6fe23cf093b561008958ba29e2
Brian Duddie [Wed, 15 Jun 2016 21:28:52 +0000 (21:28 +0000)]
Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am:
9a31e8be48
Change-Id: Ied704de01ddc2b9754a5a2d88b7b9624d711dd11
Hall Liu [Wed, 15 Jun 2016 21:24:14 +0000 (21:24 +0000)]
Merge "Add support for Telecom analytics extensions" into nyc-mr1-dev
Richard Ho [Wed, 15 Jun 2016 21:21:10 +0000 (21:21 +0000)]
Merge \\"added null check in doInBackground and if null, properly intializes variables.\\" into nyc-dev am:
07a375186e
am:
354c9ff3d5
Change-Id: I3b9e43d334885bd32e4cf2cbe6b17305c77d9d67
Richard Ho [Wed, 15 Jun 2016 21:14:24 +0000 (21:14 +0000)]
Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev
am:
07a375186e
Change-Id: Icd7c52967c634dbdbef55166523039f4004e4d9a
TreeHugger Robot [Wed, 15 Jun 2016 21:09:31 +0000 (21:09 +0000)]
Merge "Send VR mode notification to AR app on context hub" into nyc-dev
Richard Ho [Wed, 15 Jun 2016 21:06:05 +0000 (21:06 +0000)]
Merge "added null check in doInBackground and if null, properly intializes variables." into nyc-dev
Android Build Merger (Role) [Wed, 15 Jun 2016 21:05:08 +0000 (21:05 +0000)]
Merge "Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad am:
68dd6233bd am:
83806ba310" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 15 Jun 2016 21:04:55 +0000 (21:04 +0000)]
Merge "Merge \\"Fix a naming typo for source_build\\" into nyc-dev am:
dfa654edfe am:
ab1a5e456e" into nyc-mr1-dev-plus-aosp
Kevin Gabayan [Wed, 15 Jun 2016 21:04:11 +0000 (21:04 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad am:
68dd6233bd
am:
83806ba310
Change-Id: I7a9b682ac8eba5101e3bc4a2a649cad8187ddb4e
Tianjie Xu [Wed, 15 Jun 2016 21:04:08 +0000 (21:04 +0000)]
Merge \\"Fix a naming typo for source_build\\" into nyc-dev am:
dfa654edfe
am:
ab1a5e456e
Change-Id: I9bdf90d0d77fe7f4a18f4c745ca84c9131045888
Kevin Gabayan [Wed, 15 Jun 2016 21:04:06 +0000 (21:04 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad am:
68dd6233bd
am:
c31247d9af
Change-Id: I296833729fcc8136c4444d853d2860b164aa2f35
Tianjie Xu [Wed, 15 Jun 2016 21:04:04 +0000 (21:04 +0000)]
Merge \\"Fix a naming typo for source_build\\" into nyc-dev am:
dfa654edfe
am:
5b767d1218
Change-Id: Iba0740a38e7f9fd97175542ee5255548470b510c
Erik Wolsheimer [Wed, 15 Jun 2016 20:58:49 +0000 (20:58 +0000)]
Merge \"Add DENSITY_260, DENSITY_300, DENSITY_340\" into nyc-mr1-dev
am:
e37ee119c2
Change-Id: Ida84134da4145843fa982abf1428790c692a24d6
Kevin Gabayan [Wed, 15 Jun 2016 20:55:53 +0000 (20:55 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad
am:
68dd6233bd
Change-Id: I33ba4b761876f21a72c767f1f9f50c09e22f3a6f
Tianjie Xu [Wed, 15 Jun 2016 20:55:46 +0000 (20:55 +0000)]
Merge \"Fix a naming typo for source_build\" into nyc-dev
am:
dfa654edfe
Change-Id: I3eda6c97b34e6789a7450f737959fb22af9b1be4
Kevin Gabayan [Wed, 15 Jun 2016 20:55:42 +0000 (20:55 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad
am:
68dd6233bd
Change-Id: I63376fc9763bc11b7934e2a9b45c95a8c3745b32
Tianjie Xu [Wed, 15 Jun 2016 20:55:31 +0000 (20:55 +0000)]
Merge \"Fix a naming typo for source_build\" into nyc-dev
am:
dfa654edfe
Change-Id: Ie58c4fa52cec17cec430770fec01e43a5ff5153e
Erik Wolsheimer [Wed, 15 Jun 2016 20:51:57 +0000 (20:51 +0000)]
Merge "Add DENSITY_260, DENSITY_300, DENSITY_340" into nyc-mr1-dev
Kevin Gabayan [Wed, 15 Jun 2016 20:49:49 +0000 (20:49 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f
am:
e46d4fd7ad
Change-Id: I666fc7432cf6140c938423ec4370ca7727996bd6
Tianjie Xu [Wed, 15 Jun 2016 20:46:07 +0000 (20:46 +0000)]
Merge "Fix a naming typo for source_build" into nyc-dev
Kevin Gabayan [Wed, 15 Jun 2016 20:40:34 +0000 (20:40 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136
am:
db843c913f
Change-Id: I1d2af755dd1a06fc2fef464b6ad5bc5e26f11ff6
Daniel Nishi [Wed, 15 Jun 2016 19:59:32 +0000 (19:59 +0000)]
Merge \"Add metrics for the deletion helper.\" into nyc-mr1-dev
am:
aac4febcca
Change-Id: I15bfe6eabd6a00d2ef17756f2e0bf1a1e8662185
Daniel Nishi [Wed, 15 Jun 2016 19:53:08 +0000 (19:53 +0000)]
Merge "Add metrics for the deletion helper." into nyc-mr1-dev
Android Build Merger (Role) [Wed, 15 Jun 2016 19:40:01 +0000 (19:40 +0000)]
Merge "Merge \\"docs: Updates to DP4 release notes for Android for Work\\" into nyc-dev am:
215b85a738 am:
1531ac815f" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Wed, 15 Jun 2016 19:39:34 +0000 (19:39 +0000)]
Merge \\"docs: Updates to DP4 release notes for Android for Work\\" into nyc-dev am:
215b85a738
am:
1531ac815f
Change-Id: I7a2610c52299e405601d29cd464d05b372acf3d1
Andrew Solovay [Wed, 15 Jun 2016 19:38:29 +0000 (19:38 +0000)]
Merge \\"docs: Updates to DP4 release notes for Android for Work\\" into nyc-dev am:
215b85a738
am:
18678a14be
Change-Id: I30444f4e240674c3ebfea9dffefd38f77d5d5e33
Tianjie Xu [Wed, 15 Jun 2016 19:31:53 +0000 (12:31 -0700)]
Fix a naming typo for source_build
When parsing the last_install, the variable name is supposed to be
*source_build* instead of *source_version*.
Bug:
28658632
Change-Id: I1e0ed7150e04885f904b6a3efa18bd5cfe17cc96
Andrew Solovay [Wed, 15 Jun 2016 19:26:37 +0000 (19:26 +0000)]
Merge \"docs: Updates to DP4 release notes for Android for Work\" into nyc-dev
am:
215b85a738
Change-Id: Ib527d2b3aa5bfa12b978bd80f89434878ba0c4a1
Andrew Solovay [Wed, 15 Jun 2016 19:26:28 +0000 (19:26 +0000)]
Merge \"docs: Updates to DP4 release notes for Android for Work\" into nyc-dev
am:
215b85a738
Change-Id: I3065127603d7406cca4604408cfb90e47c11c95e
TreeHugger Robot [Wed, 15 Jun 2016 19:21:49 +0000 (19:21 +0000)]
Merge "docs: Updates to DP4 release notes for Android for Work" into nyc-dev
Brian Duddie [Tue, 14 Jun 2016 22:12:26 +0000 (15:12 -0700)]
Send VR mode notification to AR app on context hub
Bug:
28793778
Change-Id: I7417ba7f696dc61689687bd56b165a81aea1715a
Richard Ho [Mon, 13 Jun 2016 23:54:04 +0000 (16:54 -0700)]
added null check in doInBackground and if null, properly intializes
variables.
Bug:
29234237
Change-Id: I1d65b1a232c71efdd11a917769aec5044867a085
(cherry picked from commit
0f0f5414f4860de7f5e98d783b3172a39a42df2f)
Android Build Merger (Role) [Wed, 15 Jun 2016 18:16:41 +0000 (18:16 +0000)]
Merge "Merge \\"docs: removing duplicate security config doc\\" into nyc-dev am:
d5f7bf8032 am:
70e98fa606" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 15 Jun 2016 18:16:30 +0000 (18:16 +0000)]
Merge "Merge \\"A11y: Fix notification bounds when top notification is scrolled\\" into nyc-dev am:
2e0aadf256 am:
9243f38301" into nyc-mr1-dev-plus-aosp
Joe Fernandez [Wed, 15 Jun 2016 18:15:43 +0000 (18:15 +0000)]
Merge \\"docs: removing duplicate security config doc\\" into nyc-dev am:
d5f7bf8032
am:
70e98fa606
Change-Id: I8bf0f7a653f00b1d018ac055ee8b9d6bf36212a6
Joe Fernandez [Wed, 15 Jun 2016 18:15:39 +0000 (18:15 +0000)]
Merge \\"docs: removing duplicate security config doc\\" into nyc-dev am:
d5f7bf8032
am:
43c606fc71
Change-Id: I334c67825d4e9c52aa4f402cdfcc68d1d0394188
Adrian Roos [Wed, 15 Jun 2016 18:15:37 +0000 (18:15 +0000)]
Merge \\"A11y: Fix notification bounds when top notification is scrolled\\" into nyc-dev am:
2e0aadf256
am:
9243f38301
Change-Id: I4a6e6bd61f8bd64337671cef99239fd90293585c
Adrian Roos [Wed, 15 Jun 2016 18:15:28 +0000 (18:15 +0000)]
Merge \\"A11y: Fix notification bounds when top notification is scrolled\\" into nyc-dev am:
2e0aadf256
am:
c7d07e81e6
Change-Id: I1584066c88cb437a4ec5a7432b24cc040f086730
Daniel Nishi [Wed, 18 May 2016 20:56:13 +0000 (13:56 -0700)]
Add metrics for the deletion helper.
Bug:
28918007
Change-Id: Iead0cba7c35367be4e03fb8af6a038f709c95146
Joe Fernandez [Wed, 15 Jun 2016 18:10:05 +0000 (18:10 +0000)]
Merge \"docs: removing duplicate security config doc\" into nyc-dev
am:
d5f7bf8032
Change-Id: I5d5c54b14aeaee54d1a7b958baac2addb898152c
Joe Fernandez [Wed, 15 Jun 2016 18:09:57 +0000 (18:09 +0000)]
Merge \"docs: removing duplicate security config doc\" into nyc-dev
am:
d5f7bf8032
Change-Id: Ic6be2f3422eec325e31997ba75732074017443c4
Toni Barzic [Wed, 15 Jun 2016 18:07:20 +0000 (18:07 +0000)]
Merge \\"Clear calling identity before calling mountService\\" into nyc-dev am:
b2a45c00f6
am:
f05b791b5d
Change-Id: I7b5ca15e4ae16b30726040a3debc901d54e97bbd
Adrian Roos [Wed, 15 Jun 2016 18:06:28 +0000 (18:06 +0000)]
Merge \"A11y: Fix notification bounds when top notification is scrolled\" into nyc-dev
am:
2e0aadf256
Change-Id: Idf4ae0820c36bfe8f111df849f4df58d02d2fe2c
Adrian Roos [Wed, 15 Jun 2016 18:06:23 +0000 (18:06 +0000)]
Merge \"A11y: Fix notification bounds when top notification is scrolled\" into nyc-dev
am:
2e0aadf256
Change-Id: I73affa5f95d853c34be508da10092e94c7f24e72
Joe Fernandez [Wed, 15 Jun 2016 18:02:50 +0000 (18:02 +0000)]
Merge "docs: removing duplicate security config doc" into nyc-dev
Toni Barzic [Wed, 15 Jun 2016 18:01:00 +0000 (18:01 +0000)]
Merge \\"Clear calling identity before calling mountService\\" into nyc-dev am:
b2a45c00f6
am:
0fd4da4981
Change-Id: I6dac848a3d431917e8b6cdbc6f75617c2330cdda
Christopher Tate [Wed, 15 Jun 2016 17:57:21 +0000 (17:57 +0000)]
Merge \"Implement wildcard support for autoVerify web-link intent filters\" into nyc-mr1-dev
am:
32015d0519
Change-Id: Ibab1b9ccfb7404fe515c3bfe9133bb7934d6e6d8
Adrian Roos [Wed, 15 Jun 2016 17:55:51 +0000 (17:55 +0000)]
Merge "A11y: Fix notification bounds when top notification is scrolled" into nyc-dev
Toni Barzic [Wed, 15 Jun 2016 17:53:10 +0000 (17:53 +0000)]
Merge \"Clear calling identity before calling mountService\" into nyc-dev
am:
b2a45c00f6
Change-Id: I4f5856f2ea1d820ef6f67988222f2301a57a7585
Toni Barzic [Wed, 15 Jun 2016 17:53:01 +0000 (17:53 +0000)]
Merge \"Clear calling identity before calling mountService\" into nyc-dev
am:
b2a45c00f6
Change-Id: Id3e9ac55d5b8e28cf9c3bdc7da4956988e69eeec
Joe Fernandez [Wed, 15 Jun 2016 17:50:42 +0000 (10:50 -0700)]
docs: removing duplicate security config doc
current doc: https://developer.android.com/preview/features/security-config.html
The N Preview version of this page will move to this location when N is
officially released.
Change-Id: Idf3bb2ea13b5f08efd3187bb1b1fbb6944519507
Toni Barzic [Wed, 15 Jun 2016 17:45:55 +0000 (17:45 +0000)]
Merge "Clear calling identity before calling mountService" into nyc-dev
Android Build Merger (Role) [Wed, 15 Jun 2016 17:45:52 +0000 (17:45 +0000)]
Merge "Merge \\"Fix flashlight dim state\\" into nyc-dev am:
817c4ca6d4 am:
7d656b623f" into nyc-mr1-dev-plus-aosp
Jason Monk [Wed, 15 Jun 2016 17:45:20 +0000 (17:45 +0000)]
Merge \\"Fix flashlight dim state\\" into nyc-dev am:
817c4ca6d4
am:
7d656b623f
Change-Id: I03664fef30eadcb3980e5867911bd85e735d7d73
Jason Monk [Wed, 15 Jun 2016 17:45:17 +0000 (17:45 +0000)]
Merge \\"Fix flashlight dim state\\" into nyc-dev am:
817c4ca6d4
am:
ebd701ee3d
Change-Id: I86d8555927e838e5008bdcde93d3242e5e44de20
Chris Tate [Wed, 15 Jun 2016 17:42:12 +0000 (17:42 +0000)]
Merge "Implement wildcard support for autoVerify web-link intent filters" into nyc-mr1-dev
Andrew Solovay [Wed, 15 Jun 2016 16:54:57 +0000 (09:54 -0700)]
docs: Updates to DP4 release notes for Android for Work
See first comment for doc stage location.
Change-Id: I20ee0f104ebf2eb274e599ede8bfe5c0c59077fe
Erik Wolsheimer [Mon, 13 Jun 2016 19:51:36 +0000 (12:51 -0700)]
Add DENSITY_260, DENSITY_300, DENSITY_340
Add supported screen densities to closer match some hardware's physical specifications
BUG:
24132725
Change-Id: I7138d92fa4e1f4320f9068e154bd8318ac0c45c7
Adrian Roos [Tue, 14 Jun 2016 22:51:40 +0000 (15:51 -0700)]
A11y: Fix notification bounds when top notification is scrolled
Previously, scrolled notifications would collapse into a stack (the top
stack). With the new design, that's no longer the case, so tall
notifications can now be scrolled out so much that their translation
becomes negative.
Unfortunatly, getBoundsOnScreen then clips the bounds to the parent,
which interferes with our adjustment to the bounds, so we first undo
the clipping.
Fixes:
29368064
Change-Id: I71da054ed1eb6d06868d56e18d0320f764ed86b3
Jason Monk [Wed, 15 Jun 2016 17:03:45 +0000 (17:03 +0000)]
Merge \"Fix flashlight dim state\" into nyc-dev
am:
817c4ca6d4
Change-Id: I190cc69db49086b4acbf6e99c359ffa93b1ef956
Jason Monk [Wed, 15 Jun 2016 17:03:41 +0000 (17:03 +0000)]
Merge \"Fix flashlight dim state\" into nyc-dev
am:
817c4ca6d4
Change-Id: Ie49b1d3daaffe3f31bde760c1b8ed8391e82771f
Robert Carr [Wed, 15 Jun 2016 17:00:42 +0000 (17:00 +0000)]
Merge \\"PopupWindow: Resolve measure specs before passing to WM.\\" into nyc-dev am:
4a284be41d
am:
33809d724e
Change-Id: I4c191609f3eb25872e5c788be9ba6c90501101cd
Jason Monk [Wed, 15 Jun 2016 16:55:21 +0000 (16:55 +0000)]
Merge "Fix flashlight dim state" into nyc-dev
Robert Carr [Wed, 15 Jun 2016 16:55:03 +0000 (16:55 +0000)]
Merge \\"PopupWindow: Resolve measure specs before passing to WM.\\" into nyc-dev am:
4a284be41d
am:
7b2a3cebf6
Change-Id: I7c89cc83d9a73ab8a9761a11f6f5cbb018fe1a56
Robert Carr [Wed, 15 Jun 2016 16:52:07 +0000 (16:52 +0000)]
Merge \"PopupWindow: Resolve measure specs before passing to WM.\" into nyc-dev
am:
4a284be41d
Change-Id: I3716c7a67310d3f1dea47db0da8db7915610345a
Robert Carr [Wed, 15 Jun 2016 16:47:54 +0000 (16:47 +0000)]
Merge \"PopupWindow: Resolve measure specs before passing to WM.\" into nyc-dev
am:
4a284be41d
Change-Id: I356e7202bd8939eb5543190f17893abd43c0a0a6
TreeHugger Robot [Wed, 15 Jun 2016 16:41:50 +0000 (16:41 +0000)]
Merge "PopupWindow: Resolve measure specs before passing to WM." into nyc-dev
Alex Hills [Wed, 15 Jun 2016 16:13:52 +0000 (16:13 +0000)]
Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
am:
7816efa6af
Change-Id: Idcf5a780abc93b3a7c5d3e497b98352ddc26d257
Alexander Hills [Wed, 15 Jun 2016 16:02:47 +0000 (16:02 +0000)]
Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 15 Jun 2016 15:57:51 +0000 (15:57 +0000)]
Merge "Merge \\"Revert \\"boost starred people to at least high importance\\"\\" into nyc-dev am:
f156ab3f3a am:
d3b9e60746" into nyc-mr1-dev-plus-aosp
Chris Wren [Wed, 15 Jun 2016 15:57:16 +0000 (15:57 +0000)]
Merge \\"Revert \\"boost starred people to at least high importance\\"\\" into nyc-dev am:
f156ab3f3a
am:
b6a19b1ce1
Change-Id: I1a74db56ffae32e80a723584e15b42eb30114fce
Chris Wren [Wed, 15 Jun 2016 15:57:16 +0000 (15:57 +0000)]
Merge \\"Revert \\"boost starred people to at least high importance\\"\\" into nyc-dev am:
f156ab3f3a
am:
d3b9e60746
Change-Id: I06bf5aaf3b814ad2387d249e4a99f746794c41af
Chris Wren [Wed, 15 Jun 2016 15:52:25 +0000 (15:52 +0000)]
Merge \"Revert \"boost starred people to at least high importance\"\" into nyc-dev
am:
f156ab3f3a
Change-Id: I94b88c83a7e63131e4dad93ea3e865a0bf945273
Chris Wren [Wed, 15 Jun 2016 15:52:14 +0000 (15:52 +0000)]
Merge \"Revert \"boost starred people to at least high importance\"\" into nyc-dev
am:
f156ab3f3a
Change-Id: I66e7fb0d71ce8e52f2ec08dfdf07f14596a9e385
Chris Wren [Wed, 15 Jun 2016 15:42:23 +0000 (15:42 +0000)]
Merge "Revert "boost starred people to at least high importance"" into nyc-dev
Android Build Merger (Role) [Wed, 15 Jun 2016 15:09:06 +0000 (15:09 +0000)]
Merge "Merge \\"Fix accessibility for autorotate tile.\\" into nyc-dev am:
7f9e4d13c0 am:
7318603f4e" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Wed, 15 Jun 2016 15:08:44 +0000 (15:08 +0000)]
Merge \\"Fix accessibility for autorotate tile.\\" into nyc-dev am:
7f9e4d13c0
am:
7318603f4e
Change-Id: Ia78a6c5794eb664f9f3d1719d4872943b70430ee
Julia Reynolds [Wed, 15 Jun 2016 15:07:59 +0000 (15:07 +0000)]
Merge \\"Fix accessibility for autorotate tile.\\" into nyc-dev am:
7f9e4d13c0
am:
a844f8b293
Change-Id: I00f7e11c0c16c69898d17367c1978b0c93b7a528
Android Build Merger (Role) [Wed, 15 Jun 2016 15:03:15 +0000 (15:03 +0000)]
Merge "Merge \\"Update semantics of on-body Keystore API.\\" into nyc-dev am:
c152fc15a9 am:
6aaa25d722" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Wed, 15 Jun 2016 15:02:55 +0000 (15:02 +0000)]
Merge \"Fix accessibility for autorotate tile.\" into nyc-dev
am:
7f9e4d13c0
Change-Id: Ic0ff4b1219ca5c1723bce74cba7736521fd447aa
Shawn Willden [Wed, 15 Jun 2016 15:02:44 +0000 (15:02 +0000)]
Merge \\"Update semantics of on-body Keystore API.\\" into nyc-dev am:
c152fc15a9
am:
6aaa25d722
Change-Id: Ibfcd7257d42bc6e675d089a2542f88ce06af20fd
Shawn Willden [Wed, 15 Jun 2016 15:02:36 +0000 (15:02 +0000)]
Merge \\"Update semantics of on-body Keystore API.\\" into nyc-dev am:
c152fc15a9
am:
4a48884612
Change-Id: I002f817f3d336b914e659b655ae0bf21ef3c76db
Julia Reynolds [Wed, 15 Jun 2016 15:02:27 +0000 (15:02 +0000)]
Merge \"Fix accessibility for autorotate tile.\" into nyc-dev
am:
7f9e4d13c0
Change-Id: Ifb1575b9b50696242c46b690e061fcd350660ed7
Shawn Willden [Wed, 15 Jun 2016 14:55:50 +0000 (14:55 +0000)]
Merge \"Update semantics of on-body Keystore API.\" into nyc-dev
am:
c152fc15a9
Change-Id: Ic9a083b5f7c458c2aa7e218168c461da7fc154d0
Julia Reynolds [Wed, 15 Jun 2016 14:54:40 +0000 (14:54 +0000)]
Merge "Fix accessibility for autorotate tile." into nyc-dev
Shawn Willden [Wed, 15 Jun 2016 14:54:43 +0000 (14:54 +0000)]
Merge \"Update semantics of on-body Keystore API.\" into nyc-dev
am:
c152fc15a9
Change-Id: Icf116ed3d722eede02e743a4559ff684a36a82e0
Jason Monk [Wed, 15 Jun 2016 14:53:03 +0000 (10:53 -0400)]
Fix flashlight dim state
Change-Id: I7875d4a0c3733ac2462713d7618d1b7595ea2075
Fixes:
29330406
Android Build Merger (Role) [Wed, 15 Jun 2016 14:52:24 +0000 (14:52 +0000)]
Merge "Merge \\"Make lid switch edge rather than level triggered.\\" into nyc-dev am:
e85da2bc2e am:
ad0eb9d1d6" into nyc-mr1-dev-plus-aosp
Michael Wright [Wed, 15 Jun 2016 14:51:57 +0000 (14:51 +0000)]
Merge \\"Make lid switch edge rather than level triggered.\\" into nyc-dev am:
e85da2bc2e
am:
ad0eb9d1d6
Change-Id: Ic522bbc6fc617b766278248d814cc4fa23b5159c
Michael Wright [Wed, 15 Jun 2016 14:51:22 +0000 (14:51 +0000)]
Merge \\"Make lid switch edge rather than level triggered.\\" into nyc-dev am:
e85da2bc2e
am:
3ccb86541b
Change-Id: Idb9926ac643bee1233457deb875b959a562a7339
Shawn Willden [Wed, 15 Jun 2016 14:48:52 +0000 (14:48 +0000)]
Merge "Update semantics of on-body Keystore API." into nyc-dev
Michael Wright [Wed, 15 Jun 2016 14:47:21 +0000 (14:47 +0000)]
Merge \"Make lid switch edge rather than level triggered.\" into nyc-dev
am:
e85da2bc2e
Change-Id: Iba2a0acf6901f3b7b1d1d3bea6053ad6e2aea7db
Michael Wright [Wed, 15 Jun 2016 14:46:47 +0000 (14:46 +0000)]
Merge \"Make lid switch edge rather than level triggered.\" into nyc-dev
am:
e85da2bc2e
Change-Id: I20b3665d2ea3323991166936d47d85399d679aa4
Michael Wright [Wed, 15 Jun 2016 14:34:55 +0000 (14:34 +0000)]
Merge "Make lid switch edge rather than level triggered." into nyc-dev
Scott Main [Wed, 15 Jun 2016 04:48:45 +0000 (04:48 +0000)]
Merge \\"Update the DP4 setup instruction for api level 24\\" into nyc-dev am:
627bca6e80
am:
6ed6dba025
Change-Id: Ifbf470eb68a2931365271d49b0de3245033de7c5
Scott Main [Wed, 15 Jun 2016 04:47:17 +0000 (04:47 +0000)]
Merge \\"Update the DP4 setup instruction for api level 24\\" into nyc-dev am:
627bca6e80
am:
9b426517d3
Change-Id: I728bc0bc4ef63228948336eaac3200375764bf03
smain@google.com [Wed, 15 Jun 2016 04:43:43 +0000 (04:43 +0000)]
Merge \"Update the DP4 setup instruction for api level 24\" into nyc-dev
am:
627bca6e80
Change-Id: I569f06d42bfcc8f47a8cb0addad7dbdcce5398f6
smain@google.com [Wed, 15 Jun 2016 04:43:08 +0000 (04:43 +0000)]
Merge \"Update the DP4 setup instruction for api level 24\" into nyc-dev
am:
627bca6e80
Change-Id: Id96cdca298e44f0cfee347c1be82cd22222d24ba
OSDN Git Service
