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

Mark Lu [Tue, 19 Jul 2016 01:35:40 +0000 (01:35 +0000)]

Merge \"Merge \\\"docs: fix typo error in class name\\\" into nyc-dev am: 35d61e4117 am: 9d7d33a407\" into nyc-mr1-dev-plus-aosp
am: d5dfcf3a43

Change-Id: Ib974eff7890873c4f10a47080d12d8e090668383

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:35:36 +0000 (01:35 +0000)]

Merge \"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\" into nyc-mr1-dev-plus-aosp
am: 6af22c7ec3 -s ours

Change-Id: Ib228aba8dac071f674a2f528850bb76d2ee2982e

commit | commitdiff | tree

Mark Lu [Tue, 19 Jul 2016 01:35:34 +0000 (01:35 +0000)]

Merge \\\"docs: Fixed indentation for android:required attribute\\\" into nyc-dev am: 831ea9e190 am: d88928aaf5
am: f02c643623

Change-Id: I7e82c65b9c358e0b51c5df709c65ff1a966f9f32

commit | commitdiff | tree

Mark Lu [Tue, 19 Jul 2016 01:35:30 +0000 (01:35 +0000)]

Merge \\\"docs: fix typo error in class name\\\" into nyc-dev am: 35d61e4117 am: 2025a23bcb
am: 14d0e9791f

Change-Id: I88f4c3bcf0900409b312008bb49eb2edf802e3d9

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 19 Jul 2016 01:20:29 +0000 (01:20 +0000)]

Merge "Merge \\"docs: fix typo error in class name\\" into nyc-dev am: 35d61e4117 am: 9d7d33a407" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 19 Jul 2016 01:20:13 +0000 (01:20 +0000)]

Merge "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" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mark Lu [Tue, 19 Jul 2016 01:19:14 +0000 (01:19 +0000)]

Merge \\"docs: Fixed indentation for android:required attribute\\" into nyc-dev am: 831ea9e190
am: d88928aaf5

Change-Id: I8b90852db53247ec743a2f30b0ab6cd83396f1c4

commit | commitdiff | tree

Mark Lu [Tue, 19 Jul 2016 01:19:13 +0000 (01:19 +0000)]

Merge \\"docs: fix typo error in class name\\" into nyc-dev am: 35d61e4117
am: 9d7d33a407

Change-Id: Iab63b676e08c061b7f07bfa124eb30ec5f1fdc99

commit | commitdiff | tree

Mark Lu [Tue, 19 Jul 2016 01:19:03 +0000 (01:19 +0000)]

Merge \\"docs: fix typo error in class name\\" into nyc-dev am: 35d61e4117
am: 2025a23bcb

Change-Id: I7255c3dc05a55506a09081c8bee387382601e04e

commit | commitdiff | tree

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:18:52 +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: 7b61d99c4e
am: 56eb6e7ddf -s ours

Change-Id: I036b68692bfdbf86784a8243255098dafc1ed1f7

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

Mark Lu [Tue, 19 Jul 2016 01:08:39 +0000 (01:08 +0000)]

Merge \"docs: Fixed indentation for android:required attribute\" into nyc-dev
am: 831ea9e190

Change-Id: If9bf78d0077b4799dcbc82222fcc393519d041d6

commit | commitdiff | tree

Mark Lu [Tue, 19 Jul 2016 01:08:35 +0000 (01:08 +0000)]

Merge \"docs: fix typo error in class name\" into nyc-dev
am: 35d61e4117

Change-Id: I79840e467314db0ec5756f94750ff46f272c9a5d

commit | commitdiff | tree

Mark Lu [Tue, 19 Jul 2016 01:08:30 +0000 (01:08 +0000)]

Merge \"docs: fix typo error in class name\" into nyc-dev
am: 35d61e4117

Change-Id: I88bd65d22260d6f47905bed60ce7c0c58ed2bc0e

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

TreeHugger Robot [Tue, 19 Jul 2016 00:59:25 +0000 (00:59 +0000)]

Merge "docs: Fixed indentation for android:required attribute" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 19 Jul 2016 00:56:28 +0000 (00:56 +0000)]

Merge "docs: fix typo error in class name" into nyc-dev

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:45:29 +0000 (00:45 +0000)]

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

Change-Id: I64722a3adb0f8d66c53d8b8445be5502824ab83e

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

Tim Murray [Tue, 19 Jul 2016 00:33:04 +0000 (00:33 +0000)]

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

Change-Id: I98afd5bead70cf25ca43e49c1215ccef1e472a83

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

Dmitry Dementyev [Mon, 18 Jul 2016 23:59:07 +0000 (23:59 +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
am: 92ba4b129d

Change-Id: I26ad6e227b2d9b9526ae84108eef2bb79c7a3a54

commit | commitdiff | tree

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

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

Change-Id: I4b8c59b7ae6035917d106741ba98b9c0a18d3b6c

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:23:43 +0000 (23:23 +0000)]

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

Change-Id: I2d917af40f00ec6274d821948d2a3f6725ebeaaf

commit | commitdiff | tree

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

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

Change-Id: I16b8beb110c534124475e7e0111a912ffa3e5799

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 23:02:11 +0000 (23:02 +0000)]

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

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 23:01:41 +0000 (23:01 +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
am: 4826805c2e

Change-Id: Ibbb38e76de6f5083ccedcacf65a8e6dbab9b71d2

commit | commitdiff | tree

Robert Shih [Mon, 18 Jul 2016 23:00:51 +0000 (23:00 +0000)]

Merge "android_media_MediaRecorder: NULL check after getMediaRecorder"

commit | commitdiff | tree

Andrew Solovay [Mon, 18 Jul 2016 22:55:57 +0000 (22:55 +0000)]

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

Change-Id: I097e57700bcffdaee86afdcc12b36afdec8a42ee

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 22:01:56 +0000 (15:01 -0700)]

Fix build: Remove unused debug flag

Change-Id: I929df7018aba8ac7677aa30c17bd842599697ac7

commit | commitdiff | tree

Svetoslav Ganov [Mon, 18 Jul 2016 21:54:13 +0000 (21:54 +0000)]

Merge "Update windows before sending a window state change event"

commit | commitdiff | tree

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

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

Change-Id: Ic56dabd3ce29f899b093ee9d6e2d4b365f4c60e6

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

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

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

Change-Id: Ic38b8924a3944ff857afa23bf1909269ed269534

commit | commitdiff | tree

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

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

Change-Id: I81f27f05b7082b130bcedcf4f2abe2e8ce508ce5

commit | commitdiff | tree

Adam Lesinski [Mon, 18 Jul 2016 21:29:56 +0000 (21:29 +0000)]

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

Change-Id: I6973342d48a8a8cebe8f4515c6d67d271dbcf7f7

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

Hongming Jin [Mon, 18 Jul 2016 21:24:06 +0000 (21:24 +0000)]

Merge "AccountManager: Make account session APIs public api."

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

Jim Miller [Mon, 18 Jul 2016 21:15:43 +0000 (21:15 +0000)]

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

Change-Id: I7d604ab0a4c76672a765a064011574cd427aac64

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

Robert Shih [Tue, 26 Jan 2016 23:25:26 +0000 (15:25 -0800)]

android_media_MediaRecorder: NULL check after getMediaRecorder

Bug: 22416023
Change-Id: I47cc0c5750722735ab11cbc408f2d28c4d4bdd2f

commit | commitdiff | tree

Tyler Gunn [Mon, 18 Jul 2016 20:29:22 +0000 (20:29 +0000)]

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

Change-Id: I49dcd951c8e27211c7b8a374a50edb1218814531

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

Siyamed Sinir [Mon, 18 Jul 2016 20:15:29 +0000 (20:15 +0000)]

Merge "Fix TextView.onCommitCorrection ApiDoc"

commit | commitdiff | tree

Mark Lu [Mon, 18 Jul 2016 20:13:49 +0000 (20:13 +0000)]

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

Change-Id: I54f7a82a46f1dc25c4cb1383d66e0fd22ae628ed

commit | commitdiff | tree

Mark Lu [Mon, 18 Jul 2016 20:13:46 +0000 (20:13 +0000)]

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

Change-Id: Idcc76ca477e3fb52fbbf61830ef6ad1e84795e99

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

Tejas Khorana [Mon, 18 Jul 2016 20:02:09 +0000 (20:02 +0000)]

Merge "indexOfValue now uses .equals (cont.)"

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

Scott Main [Mon, 18 Jul 2016 19:42:08 +0000 (19:42 +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
am: 7c491c9e83

Change-Id: I36fa73418cf79b0e87be002e92f2aad887a420b0

commit | commitdiff | tree

smain@google.com [Mon, 18 Jul 2016 19:42:02 +0000 (19:42 +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
am: 359e0e6bfe

Change-Id: I4fa9eee55f3242cc33210d47b71d9ec73cf0b295

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