git.osdn.net Git - android-x86/frameworks-base.git/log

Sungsoo Lim [Tue, 19 Jul 2016 01:18:57 +0000 (01:18 +0000)]

Merge \\\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\\" into mnc-dev am: f4710c174f am: aa85bf99ee am: 452dc91f2d am: f78637ff64 -s ours am: 19d013d4e3
am: 091cdab02d

Change-Id: I8b93dd198bdcbd28cad847e6765d21b0743a5efd

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:12:17 +0000 (01:12 +0000)]

Merge \\\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\\" into mnc-dev am: f4710c174f am: aa85bf99ee am: 452dc91f2d am: f78637ff64 -s ours am: 19d013d4e3
am: 7b61d99c4e

Change-Id: If5ead984671b499cc5528ec14224dd5339eeeb5d

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:08:25 +0000 (01:08 +0000)]

Merge \\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\" into mnc-dev am: f4710c174f am: aa85bf99ee am: 452dc91f2d am: f78637ff64 -s ours
am: 19d013d4e3

Change-Id: I866cc55f30a582ef95fb91a81528ad364eabfe98

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:03:31 +0000 (01:03 +0000)]

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:54:24 +0000 (00:54 +0000)]

Merge \\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\" into mnc-dev am: f4710c174f am: aa85bf99ee am: 452dc91f2d
am: f78637ff64 -s ours

Change-Id: Ia67c680bd2a72b7e0ce4f6d1225bc85b1b4feadb

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:46:16 +0000 (00:46 +0000)]

Merge \\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\" into mnc-dev am: f4710c174f am: aa85bf99ee
am: 452dc91f2d

Change-Id: Ie64f0351a6cf2e4b07bffd85c6dbbd9d7239ce32

commit | commitdiff | tree

Dmitriy Filchenko [Tue, 19 Jul 2016 00:39:17 +0000 (00:39 +0000)]

Merge \\\"Handle long process names correctly.\\\" am: e2994438d2 am: d5a72fae4a
am: ea9616e48e

Change-Id: Ib14e7dbbba8f91de0491be9b91b5891ce8520c00

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:38:54 +0000 (00:38 +0000)]

Merge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am: f4710c174f
am: aa85bf99ee

Change-Id: Id8919b1b3375f3a760800dbb45567a6023f4f611

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:32:24 +0000 (00:32 +0000)]

Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev
am: f4710c174f

Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3

commit | commitdiff | tree

Dmitriy Filchenko [Tue, 19 Jul 2016 00:27:02 +0000 (00:27 +0000)]

Merge \\"Handle long process names correctly.\\" am: e2994438d2
am: d5a72fae4a

Change-Id: I18b5e389b35b3d4756dc8ab9094349310eeccf14

commit | commitdiff | tree

Tim Murray [Tue, 19 Jul 2016 00:25:52 +0000 (00:25 +0000)]

Merge changes I15da2563,I7845542d into nyc-mr1-dev
am: 7b8b1aab93

Change-Id: I66d92cd3c08a67598cefdc6256825b1c6c1736f5

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:21:51 +0000 (00:21 +0000)]

Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev

commit | commitdiff | tree

Tim Murray [Tue, 19 Jul 2016 00:20:01 +0000 (00:20 +0000)]

Merge changes I15da2563,I7845542d into nyc-mr1-dev

* changes:
Don't reset current thread's priority accidentally.
add tracepoint for when the display chain is stuffed

commit | commitdiff | tree

Dmitriy Filchenko [Tue, 19 Jul 2016 00:19:15 +0000 (00:19 +0000)]

Merge \"Handle long process names correctly.\"
am: e2994438d2

Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358

commit | commitdiff | tree

Treehugger Robot [Tue, 19 Jul 2016 00:09:24 +0000 (00:09 +0000)]

Merge "Handle long process names correctly."

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 23:54:25 +0000 (23:54 +0000)]

Merge "Merge \\"Include correct account id in action_called_account_remove log message.\\" into nyc-dev am: 0544462bf1 am: d87be07644" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Dmitry Dementyev [Mon, 18 Jul 2016 23:53:52 +0000 (23:53 +0000)]

Merge \\"Include correct account id in action_called_account_remove log message.\\" into nyc-dev am: 0544462bf1
am: 33c20d39e3

Change-Id: I8857fc1e39fbd9c2368e6f341a1c3cffaaaeaf16

commit | commitdiff | tree

Dmitry Dementyev [Mon, 18 Jul 2016 23:53:52 +0000 (23:53 +0000)]

Merge \\"Include correct account id in action_called_account_remove log message.\\" into nyc-dev am: 0544462bf1
am: d87be07644

Change-Id: I241865f791d8da241e17aa0dfa245b8eb5ba7ada

commit | commitdiff | tree

Dmitry Dementyev [Mon, 18 Jul 2016 23:48:59 +0000 (23:48 +0000)]

Merge \"Include correct account id in action_called_account_remove log message.\" into nyc-dev
am: 0544462bf1

Change-Id: Iaedf8dbf5fb7ee68eebe1026ab3867f544948db9

commit | commitdiff | tree

Dmitry Dementyev [Mon, 18 Jul 2016 23:48:53 +0000 (23:48 +0000)]

Merge \"Include correct account id in action_called_account_remove log message.\" into nyc-dev
am: 0544462bf1

Change-Id: Ibc72de68280c0d859e8391654f4d67de66515800

commit | commitdiff | tree

Dmitry Dementyev [Mon, 18 Jul 2016 23:37:29 +0000 (23:37 +0000)]

Merge "Include correct account id in action_called_account_remove log message." into nyc-dev

commit | commitdiff | tree

Selim Cinek [Mon, 18 Jul 2016 23:11:32 +0000 (23:11 +0000)]

Merge \"Don\'t show repeated fingerprint error messages on bouncer\" into nyc-mr1-dev
am: a3724775a4

Change-Id: I7d888edff3fb7bb0ba7c52dcec698e346a002524

commit | commitdiff | tree

Jeff Sharkey [Mon, 18 Jul 2016 23:11:28 +0000 (23:11 +0000)]

Merge \"Handle auto-unlocked managed profiles.\" into nyc-mr1-dev
am: 2b58e464bb

Change-Id: Idc9ecd57f65a9ad273407ca0ebc30ad7fd15dcc7

commit | commitdiff | tree

Selim Cinek [Mon, 18 Jul 2016 23:05:27 +0000 (23:05 +0000)]

Merge "Don't show repeated fingerprint error messages on bouncer" into nyc-mr1-dev

commit | commitdiff | tree

Dmitriy Filchenko [Mon, 18 Jul 2016 23:00:35 +0000 (16:00 -0700)]

Handle long process names correctly.

pthread_setname_np() expects 16 or fewer characters for the name argument. When the process name is longer, we should trim it.

Change-Id: I40be3a4212bdaab900c8eb30fa27aeeb7ed1b0d1

commit | commitdiff | tree

Jeff Sharkey [Mon, 18 Jul 2016 23:02:45 +0000 (23:02 +0000)]

Merge "Handle auto-unlocked managed profiles." into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 22:51:33 +0000 (22:51 +0000)]

Merge "Merge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc-dev am: bd80098059 am: 4e98676ed3" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 22:51:05 +0000 (22:51 +0000)]

Merge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc-dev am: bd80098059
am: 4e98676ed3

Change-Id: I6b1be04747d205eb7b139425a2b2f257e909bddb

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 22:51:03 +0000 (22:51 +0000)]

Merge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc-dev am: bd80098059
am: 14c55bce2f

Change-Id: I403cd225ce16404acfd6bd054ada1c7dd456595a

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 22:45:12 +0000 (22:45 +0000)]

Merge \"docs: Removed Sony Experia from N Preview download page\" into nyc-dev
am: bd80098059

Change-Id: I31a819f07c06d1f3d131eaa51e438930c0f3f9da

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 22:44:53 +0000 (22:44 +0000)]

Merge \"docs: Removed Sony Experia from N Preview download page\" into nyc-dev
am: bd80098059

Change-Id: I6c643be53bdec19cfc1f814644f913621a6707ff

commit | commitdiff | tree

Tim Murray [Mon, 18 Jul 2016 22:35:42 +0000 (15:35 -0700)]

Don't reset current thread's priority accidentally.

If there's no RenderThread for the top app and FIFO UI is enabled, it's
possible to reset the current system_server thread's priority and
scheduler.

bug 30173296

Change-Id: I15da2563356ddd66911d695db43660ce5400da07

commit | commitdiff | tree

Tim Murray [Mon, 18 Jul 2016 21:11:28 +0000 (14:11 -0700)]

add tracepoint for when the display chain is stuffed

bug 30173296

Change-Id: I7845542d4e5c19ccb7c3ee6498cc2d70278b5397

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jul 2016 22:34:13 +0000 (22:34 +0000)]

Merge "docs: Removed Sony Experia from N Preview download page" into nyc-dev

commit | commitdiff | tree

Eino-Ville Talvala [Mon, 18 Jul 2016 21:30:30 +0000 (21:30 +0000)]

Merge \"CameraMetadata JNI: Move tag lookup to common utility code\" into nyc-mr1-dev
am: ff080be098

Change-Id: Ica003bc034d6e0a741c2dda3e7c3bfc5756ce2cf

commit | commitdiff | tree

Eino-Ville Talvala [Mon, 18 Jul 2016 21:25:35 +0000 (21:25 +0000)]

Merge "CameraMetadata JNI: Move tag lookup to common utility code" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 21:25:15 +0000 (21:25 +0000)]

Merge "Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am: 142d1214d0 am: 507c9165d1" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 21:24:52 +0000 (21:24 +0000)]

Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am: 142d1214d0
am: 507c9165d1

Change-Id: I2d01fdf589bd3492cfdcd28f5410c95dd3ea7fd2

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 21:24:30 +0000 (21:24 +0000)]

Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am: 142d1214d0
am: 74171f88c2

Change-Id: I281ca582bc2461e8e099e731cd6126e7bddf0b16

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 21:15:53 +0000 (21:15 +0000)]

Merge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
am: 142d1214d0

Change-Id: I565e615e575eed25ae2957fbaf7de72b97541739

commit | commitdiff | tree

Adam Lesinski [Mon, 18 Jul 2016 21:15:48 +0000 (21:15 +0000)]

Merge \"Record UID of wakeup packets\" into nyc-mr1-dev
am: 117cf8de91

Change-Id: Id4e843eef00a623353fe3027de13460aa92e699f

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 21:15:20 +0000 (21:15 +0000)]

Merge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
am: 142d1214d0

Change-Id: I6344b9fc5f70f6f02bcc5044bb40e42bda3433b8

commit | commitdiff | tree

Jim Miller [Mon, 18 Jul 2016 21:09:37 +0000 (21:09 +0000)]

Merge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev
am: 6ad9c16ffd

Change-Id: Id4db555de3df2d73046aa6358e6b559f4529890d

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jul 2016 21:07:34 +0000 (21:07 +0000)]

Merge "docs: Late-breaking updates to DP5 release notes" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jul 2016 20:58:13 +0000 (20:58 +0000)]

Merge "Record UID of wakeup packets" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jul 2016 20:54:44 +0000 (20:54 +0000)]

Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev

commit | commitdiff | tree

Tyler Gunn [Mon, 18 Jul 2016 20:24:37 +0000 (20:24 +0000)]

Merge \"Enhance toString on ConferenceParticipant.\" into nyc-mr1-dev
am: b822f7a956

Change-Id: I7b6b1a94fd04b22755cba511b674f128ee63260b

commit | commitdiff | tree

Tyler Gunn [Mon, 18 Jul 2016 20:13:31 +0000 (20:13 +0000)]

Merge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 20:09:07 +0000 (20:09 +0000)]

Merge "Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am: 242f5798ac am: a5e5cf6a84" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mark Lu [Mon, 18 Jul 2016 20:08:39 +0000 (20:08 +0000)]

Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am: 242f5798ac
am: a5e5cf6a84

Change-Id: I87606bd4b170bcf8b0a76652f9da3892be524059

commit | commitdiff | tree

Mark Lu [Mon, 18 Jul 2016 20:08:37 +0000 (20:08 +0000)]

Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am: 242f5798ac
am: f46504d95e

Change-Id: Ie98db8eaeadffa5c7a39fd08c41961a798ee8442

commit | commitdiff | tree

Mark Lu [Mon, 18 Jul 2016 19:55:28 +0000 (19:55 +0000)]

Merge \"docs: remove trailing white space from jd files\" into nyc-dev
am: 242f5798ac

Change-Id: Id3692c9293f6e41fb57188e5a7641f913c690a56

commit | commitdiff | tree

Mark Lu [Mon, 18 Jul 2016 19:55:28 +0000 (19:55 +0000)]

Merge \"docs: remove trailing white space from jd files\" into nyc-dev
am: 242f5798ac

Change-Id: I6d0c57812a6af0663f483a26aa037a85cd84838c

commit | commitdiff | tree

Mark Lu [Mon, 18 Jul 2016 19:48:50 +0000 (19:48 +0000)]

Merge "docs: remove trailing white space from jd files" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 19:36:38 +0000 (19:36 +0000)]

Merge "Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am: 56bacea883 am: f1172504de" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Scott Main [Mon, 18 Jul 2016 19:36:12 +0000 (19:36 +0000)]

Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am: 56bacea883
am: f1172504de

Change-Id: I4c590a2bfa09e021eac40057f60e3143ce096940

commit | commitdiff | tree

Scott Main [Mon, 18 Jul 2016 19:34:49 +0000 (19:34 +0000)]

Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am: 56bacea883
am: 6e446a5f38

Change-Id: I33812f3e71fda1975e1edd6e6de48a0436c700e6

commit | commitdiff | tree

Adam Lesinski [Thu, 14 Jul 2016 23:56:08 +0000 (16:56 -0700)]

Record UID of wakeup packets

Bug:28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73

commit | commitdiff | tree

smain@google.com [Mon, 18 Jul 2016 19:27:18 +0000 (19:27 +0000)]

Merge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\" into nyc-dev
am: 56bacea883

Change-Id: Ib620e4caf5e5a9ca9e10a0daa9dce13d6622cf61

commit | commitdiff | tree

smain@google.com [Mon, 18 Jul 2016 19:27:18 +0000 (19:27 +0000)]

commit | commitdiff | tree

Scott Main [Mon, 18 Jul 2016 19:19:45 +0000 (19:19 +0000)]

Merge "add redirect for "getting started" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics" into nyc-dev

commit | commitdiff | tree

smain@google.com [Fri, 15 Jul 2016 22:25:25 +0000 (15:25 -0700)]

add redirect for "getting started" help button in Studio.
Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics

Change-Id: I914d4fac51d3cf7e839a7b5785a7c8cd43b57346

commit | commitdiff | tree

Felipe Leme [Mon, 18 Jul 2016 18:53:04 +0000 (18:53 +0000)]

Merge \"Fixed bugreport share dialog padding.\" into nyc-mr1-dev
am: 699e1bc74b

Change-Id: Ie571191e8c64569b545040665be5eca7ad35fb4e

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jul 2016 18:37:34 +0000 (18:37 +0000)]

Merge "Fixed bugreport share dialog padding." into nyc-mr1-dev

commit | commitdiff | tree

Dmitry Dementyev [Fri, 8 Jul 2016 17:46:22 +0000 (10:46 -0700)]

Include correct account id in action_called_account_remove log message.

Bug: 30013930

Change-Id: I857866e224d8dbc986c3b7e83a5f4e899e09f3ab

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 18:12:49 +0000 (11:12 -0700)]

docs: Late-breaking updates to DP5 release notes

See first comment for doc stage location.

Change-Id: Ib1ea6047d2b8d1ea9ff7e749ae380df65853b7c0

commit | commitdiff | tree

Makoto Onuki [Mon, 18 Jul 2016 18:05:40 +0000 (18:05 +0000)]

Merge \"Implement dumpsys --checkin for shortcut manager\" into nyc-mr1-dev
am: 121480cda8

Change-Id: I38508e2b47dcb2fe2e8046f7c148b4ddbf6a2697

commit | commitdiff | tree

Makoto Onuki [Mon, 18 Jul 2016 18:05:36 +0000 (18:05 +0000)]

Merge \"Remove the DMAgent whitelisting\" into nyc-mr1-dev
am: bf6c6b44e1

Change-Id: I85b2fabd9f33697be15bccbaf8602fa525012772

commit | commitdiff | tree

Abodunrinwa Toki [Mon, 18 Jul 2016 18:05:32 +0000 (18:05 +0000)]

Merge \"DO NOT MERGE: FloatingToolbar - Check that app supports RTL.\" into nyc-mr1-dev
am: 63b31d5729

Change-Id: I77c82ad4ce15368c92041d994e10c8a44a33667c

commit | commitdiff | tree

Hall Liu [Mon, 18 Jul 2016 17:54:48 +0000 (17:54 +0000)]

Merge \"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\" into nyc-mr1-dev
am: 810ae1ec7b

Change-Id: Ic4633dcf16425445f67c9810e2b80a446b4adee4

commit | commitdiff | tree

Makoto Onuki [Mon, 18 Jul 2016 17:50:24 +0000 (17:50 +0000)]

Merge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev

commit | commitdiff | tree

Makoto Onuki [Mon, 18 Jul 2016 17:50:17 +0000 (17:50 +0000)]

Merge "Remove the DMAgent whitelisting" into nyc-mr1-dev

commit | commitdiff | tree

Abodunrinwa Toki [Mon, 18 Jul 2016 17:49:25 +0000 (17:49 +0000)]

Merge "DO NOT MERGE: FloatingToolbar - Check that app supports RTL." into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 17:44:49 +0000 (17:44 +0000)]

Merge "Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf\" into nyc-mr1-dev am: c024e480ab" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 17:44:43 +0000 (17:44 +0000)]

Merge "Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf am: 965c66b41b" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Mon, 18 Jul 2016 17:44:38 +0000 (17:44 +0000)]

Merge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 17:44:21 +0000 (17:44 +0000)]

Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf
am: 965c66b41b

Change-Id: I510d983c9f84e2679f1237566396cdf93e85890a

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 17:44:12 +0000 (17:44 +0000)]

Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf\" into nyc-mr1-dev
am: c024e480ab

Change-Id: I3d46dd6d160fb23702db36b5ce9090d8a6b32b6e

commit | commitdiff | tree

Christopher Tate [Mon, 18 Jul 2016 17:44:04 +0000 (17:44 +0000)]

Merge \"Document that WallpaperManager.getDrawable() can return null\" into nyc-mr1-dev
am: 3cec9d44b3

Change-Id: I72443aa4360cb4c22c9b4faf0cf98b395097757f

commit | commitdiff | tree

Mark Lu [Mon, 18 Jul 2016 17:42:11 +0000 (10:42 -0700)]

docs: remove trailing white space from jd files

Change-Id: Id7fb958460bf2f28d88c6120df0395690f32783a

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 17:37:22 +0000 (17:37 +0000)]

Merge \"docs: Added support library 24.1.0\" into nyc-dev
am: 872ecfb0bf

Change-Id: Ibfcaf05e0bcc73c5c8b1d096553d2a9e042d7300

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 17:29:41 +0000 (17:29 +0000)]

Merge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am: 872ecfb0bf" into nyc-mr1-dev

commit | commitdiff | tree

Chris Tate [Mon, 18 Jul 2016 17:29:37 +0000 (17:29 +0000)]

Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 17:29:02 +0000 (17:29 +0000)]

Merge \"docs: Added support library 24.1.0\" into nyc-dev
am: 872ecfb0bf

Change-Id: I6ba46b8efcc8567d6192ac274e08ed1489cb0c2e

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 17:16:59 +0000 (17:16 +0000)]

Merge "docs: Added support library 24.1.0" into nyc-dev

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 17:14:31 +0000 (10:14 -0700)]

docs: Removed Sony Experia from N Preview download page

See first comment for doc stage location.

Change-Id: Ib26adafa1ef4d7a104abd1d007ee2f3410bca200

commit | commitdiff | tree

Jeff Sharkey [Mon, 18 Jul 2016 16:11:36 +0000 (10:11 -0600)]

Handle auto-unlocked managed profiles.

There are cases where a managed profile provides an auth challenge
which is really an automatic unlock as a side effect from the parent
profile being unlocked. Detect this case and suppress PRE_BOOT
notifications.

Bug: 29931646
Change-Id: I801605b0b59a7924bfe7f433415d9704664a5cbc

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 15:28:33 +0000 (15:28 +0000)]

Merge "Doc change: updated issues in DP5 release notes. am: 73b700404c am: 142c4f7a9f" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Dirk Dougherty [Mon, 18 Jul 2016 15:28:03 +0000 (15:28 +0000)]

Doc change: updated issues in DP5 release notes. am: 73b700404c
am: 142c4f7a9f

Change-Id: I13a07cd7b525f5bb1fa1f599f0f3ec0ebaa57296

commit | commitdiff | tree

Dirk Dougherty [Mon, 18 Jul 2016 15:26:50 +0000 (15:26 +0000)]

Doc change: updated issues in DP5 release notes. am: 73b700404c
am: 3061ceaf82

Change-Id: Ib4be8ed685e72f4eef343958e543e1419ba8ced6

commit | commitdiff | tree

Dirk Dougherty [Mon, 18 Jul 2016 15:21:38 +0000 (15:21 +0000)]

Doc change: updated issues in DP5 release notes.
am: 73b700404c

Change-Id: Ia4cf47f5fc268d50cc30d7cfc6c990fb1f5eefec

commit | commitdiff | tree

Dirk Dougherty [Mon, 18 Jul 2016 15:21:11 +0000 (15:21 +0000)]

Doc change: updated issues in DP5 release notes.
am: 73b700404c

Change-Id: Id7bb33217a91f0e37497c83c6e4efbce8743df8b

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 15:16:21 +0000 (15:16 +0000)]

Merge "Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c am: e8c3590a77" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Scott Main [Mon, 18 Jul 2016 15:15:50 +0000 (15:15 +0000)]

Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c
am: e8c3590a77

Change-Id: I69c3100afecb4a545f71bb9a3c28f9580b18ca89

commit | commitdiff | tree

Scott Main [Mon, 18 Jul 2016 15:15:14 +0000 (15:15 +0000)]

Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c
am: 38b71c5741

Change-Id: Ice045bb360e2de70af6cc3cc721d6ec5f55e8f58

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 15:09:44 +0000 (15:09 +0000)]

Merge "Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e\" into nyc-mr1-dev am: 838542a660" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 18 Jul 2016 15:09:29 +0000 (15:09 +0000)]

Merge "Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev am: b5239329b1" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Dirk Dougherty [Mon, 18 Jul 2016 15:09:24 +0000 (08:09 -0700)]

Doc change: updated issues in DP5 release notes.

Change-Id: I8c5af9a9523be71451a23bbac9b34da5079dbc27

commit | commitdiff | tree

Dirk Dougherty [Mon, 18 Jul 2016 15:09:05 +0000 (15:09 +0000)]

Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e\" into nyc-mr1-dev
am: 838542a660

Change-Id: Ic79c889b404ea1c576b8f50431e2774dc8b2de12

commit | commitdiff | tree

Lorenzo Colitti [Mon, 18 Jul 2016 15:08:54 +0000 (15:08 +0000)]

Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev
am: b5239329b1

Change-Id: Ib712c3c7b44d3a623d5f5facf0c7f6844c3ebb82