OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Merge \\\"docs: Removed Sony Experia from N Preview download page\\\" into...
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

8 years agoMerge \\\"docs: Removed Sony Experia from N Preview download page\\\" into nyc-dev...
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

8 years agoMerge "Merge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc...
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

8 years agoMerge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc-dev...
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

8 years agoMerge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc-dev...
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

8 years agoMerge \"docs: Removed Sony Experia from N Preview download page\" into nyc-dev
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

8 years agoMerge \"docs: Removed Sony Experia from N Preview download page\" into nyc-dev
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

8 years agoMerge "docs: Removed Sony Experia from N Preview download page" into nyc-dev
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

8 years agoFix build: Remove unused debug flag
Eino-Ville Talvala [Mon, 18 Jul 2016 22:01:56 +0000 (15:01 -0700)]
Fix build: Remove unused debug flag

Change-Id: I929df7018aba8ac7677aa30c17bd842599697ac7

8 years agoMerge "Update windows before sending a window state change event"
Svetoslav Ganov [Mon, 18 Jul 2016 21:54:13 +0000 (21:54 +0000)]
Merge "Update windows before sending a window state change event"

8 years agoMerge \\"CameraMetadata JNI: Move tag lookup to common utility code\\" into nyc-mr1...
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

8 years agoMerge \"CameraMetadata JNI: Move tag lookup to common utility code\" into nyc-mr1-dev
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

8 years agoMerge \"Merge \\\"docs: Late-breaking updates to DP5 release notes\\\" into nyc-dev...
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

8 years agoMerge \\\"docs: Late-breaking updates to DP5 release notes\\\" into nyc-dev am: 142d1...
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

8 years agoMerge \\"Record UID of wakeup packets\\" into nyc-mr1-dev am: 117cf8de91
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

8 years agoMerge "CameraMetadata JNI: Move tag lookup to common utility code" into nyc-mr1-dev
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

8 years agoMerge "Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev...
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

8 years agoMerge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am: 142d1214d0
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

8 years agoMerge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am: 142d1214d0
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

8 years agoMerge "AccountManager: Make account session APIs public api."
Hongming Jin [Mon, 18 Jul 2016 21:24:06 +0000 (21:24 +0000)]
Merge "AccountManager: Make account session APIs public api."

8 years agoMerge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
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

8 years agoMerge \"Record UID of wakeup packets\" into nyc-mr1-dev
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

8 years agoMerge \\"Fix vulnerability in LockSettings service\\" into nyc-mr1-dev am: 6ad9c16ffd
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

8 years agoMerge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
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

8 years agoMerge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev
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

8 years agoMerge "docs: Late-breaking updates to DP5 release notes" into nyc-dev
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

8 years agoMerge "Record UID of wakeup packets" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:58:13 +0000 (20:58 +0000)]
Merge "Record UID of wakeup packets" into nyc-mr1-dev

8 years agoMerge "Fix vulnerability in LockSettings service" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:54:44 +0000 (20:54 +0000)]
Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev

8 years agoMerge \\"Enhance toString on ConferenceParticipant.\\" into nyc-mr1-dev am: b822f7a956
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

8 years agoMerge \"Enhance toString on ConferenceParticipant.\" into nyc-mr1-dev
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

8 years agoMerge "Fix TextView.onCommitCorrection ApiDoc"
Siyamed Sinir [Mon, 18 Jul 2016 20:15:29 +0000 (20:15 +0000)]
Merge "Fix TextView.onCommitCorrection ApiDoc"

8 years agoMerge \"Merge \\\"docs: remove trailing white space from jd files\\\" into nyc-dev...
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

8 years agoMerge \\\"docs: remove trailing white space from jd files\\\" into nyc-dev am: 242f57...
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

8 years agoMerge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev
Tyler Gunn [Mon, 18 Jul 2016 20:13:31 +0000 (20:13 +0000)]
Merge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev

8 years agoMerge "Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am...
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

8 years agoMerge \\"docs: remove trailing white space from jd files\\" into nyc-dev am: 242f5798ac
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

8 years agoMerge \\"docs: remove trailing white space from jd files\\" into nyc-dev am: 242f5798ac
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

8 years agoMerge "indexOfValue now uses .equals (cont.)"
Tejas Khorana [Mon, 18 Jul 2016 20:02:09 +0000 (20:02 +0000)]
Merge "indexOfValue now uses .equals (cont.)"

8 years agoMerge \"docs: remove trailing white space from jd files\" into nyc-dev
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

8 years agoMerge \"docs: remove trailing white space from jd files\" into nyc-dev
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

8 years agoMerge "docs: remove trailing white space from jd files" into nyc-dev
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

8 years agoMerge \"Merge \\\"add redirect for \\\"getting started\\\" help button in Studio...
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

8 years agoMerge \\\"add redirect for \\\"getting started\\\" help button in Studio. Also add...
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

8 years agoMerge "Merge \\"add redirect for \\"getting started\\" help button in Studio. Also...
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

8 years agoMerge \\"add redirect for \\"getting started\\" help button in Studio. Also add ...
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

8 years agoMerge \\"add redirect for \\"getting started\\" help button in Studio. Also add ...
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

8 years agoRecord UID of wakeup packets
Adam Lesinski [Thu, 14 Jul 2016 23:56:08 +0000 (16:56 -0700)]
Record UID of wakeup packets

Bug:28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73

8 years agoMerge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_med...
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

8 years agoMerge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_med...
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: I00dbf309d7e1c79d93733e6c3aa08ec7eca41401

8 years agoMerge "add redirect for "getting started" help button in Studio. Also add ?utm_medium...
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

8 years agoadd redirect for "getting started" help button in Studio.
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

8 years agoindexOfValue now uses .equals (cont.)
Tejas Khorana [Mon, 18 Jul 2016 18:18:27 +0000 (11:18 -0700)]
indexOfValue now uses .equals (cont.)

Addresses same issue addressed in SparseArray in LongSparseArray in
the method: indexByValue. Made a new method indexByValueByValue that
compares objects using .equals instead of ==.

Change-Id: I55735fe7ca364d0a9caab2a6909c2eaede845619

8 years agoMerge "Merge \\"Fixed bugreport share dialog padding.\\" into nyc-mr1-dev am: 699e1bc...
Android Build Merger (Role) [Mon, 18 Jul 2016 19:01:15 +0000 (19:01 +0000)]
Merge "Merge \\"Fixed bugreport share dialog padding.\\" into nyc-mr1-dev am: 699e1bc74b am: a49813ded6"

8 years agoMerge \\"Fixed bugreport share dialog padding.\\" into nyc-mr1-dev am: 699e1bc74b
Felipe Leme [Mon, 18 Jul 2016 19:00:55 +0000 (19:00 +0000)]
Merge \\"Fixed bugreport share dialog padding.\\" into nyc-mr1-dev am: 699e1bc74b
am: a49813ded6

Change-Id: Icc22b2886b95cabfc677b0735d0383fe60a118ae

8 years agoMerge "AAPT2: Erase version qualifiers for resources <= minSdk"
Adam Lesinski [Mon, 18 Jul 2016 18:59:40 +0000 (18:59 +0000)]
Merge "AAPT2: Erase version qualifiers for resources <= minSdk"

8 years agoMerge \"Fixed bugreport share dialog padding.\" into nyc-mr1-dev
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

8 years agoMerge "Fixed bugreport share dialog padding." into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 18:37:34 +0000 (18:37 +0000)]
Merge "Fixed bugreport share dialog padding." into nyc-mr1-dev

8 years agodocs: Late-breaking updates to DP5 release notes
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

8 years agoMerge \\"Implement dumpsys --checkin for shortcut manager\\" into nyc-mr1-dev am...
Makoto Onuki [Mon, 18 Jul 2016 18:10:41 +0000 (18:10 +0000)]
Merge \\"Implement dumpsys --checkin for shortcut manager\\" into nyc-mr1-dev am: 121480cda8
am: 3991a376e5

Change-Id: I3ccc92a0a9f6bfcce5207ef29db73063ec50a9f8

8 years agoMerge \\"Remove the DMAgent whitelisting\\" into nyc-mr1-dev am: bf6c6b44e1
Makoto Onuki [Mon, 18 Jul 2016 18:10:36 +0000 (18:10 +0000)]
Merge \\"Remove the DMAgent whitelisting\\" into nyc-mr1-dev am: bf6c6b44e1
am: 41fa9fe0a4

Change-Id: I5bbe059464a8719b92bf16997482382c7de02e99

8 years agoMerge \\"DO NOT MERGE: FloatingToolbar - Check that app supports RTL.\\" into nyc...
Abodunrinwa Toki [Mon, 18 Jul 2016 18:10:32 +0000 (18:10 +0000)]
Merge \\"DO NOT MERGE: FloatingToolbar - Check that app supports RTL.\\" into nyc-mr1-dev am: 63b31d5729
am: 73746d5d24  -s ours

Change-Id: I166a4d5da51e34a5d629b50f6683b52d0507b4eb

8 years agoMerge "Add more UserMananger related tests."
Sudheer Shanka [Mon, 18 Jul 2016 18:06:27 +0000 (18:06 +0000)]
Merge "Add more UserMananger related tests."

8 years agoMerge \"Implement dumpsys --checkin for shortcut manager\" into nyc-mr1-dev
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

8 years agoMerge \"Remove the DMAgent whitelisting\" into nyc-mr1-dev
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

8 years agoMerge \"DO NOT MERGE: FloatingToolbar - Check that app supports RTL.\" into nyc-mr1-dev
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

8 years agoMerge \\"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\\" into nyc-mr1-dev am: 810ae1ec7b
Hall Liu [Mon, 18 Jul 2016 18:00:24 +0000 (18:00 +0000)]
Merge \\"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\\" into nyc-mr1-dev am: 810ae1ec7b
am: 2a07f0de6b

Change-Id: I75260ce07bafbf45651d1582c0aa7937440d4584

8 years agoMerge \"Merge \\"Merge \\\"docs: Added support library 24.1.0\\\" into nyc-dev am...
Andrew Solovay [Mon, 18 Jul 2016 17:54:59 +0000 (17:54 +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
am: 7c3b9e2f8c

Change-Id: I24b4eec0e2ef79a53e89abc5a4dd0210393e2826

8 years agoMerge \"Merge \\\"docs: Added support library 24.1.0\\\" into nyc-dev am: 872ecfb0bf...
Andrew Solovay [Mon, 18 Jul 2016 17:54:57 +0000 (17:54 +0000)]
Merge \"Merge \\\"docs: Added support library 24.1.0\\\" into nyc-dev am: 872ecfb0bf am: 965c66b41b\" into nyc-mr1-dev-plus-aosp
am: 4a2ea7008f

Change-Id: I72c8f95b16217c2b4a8f2ef2804d4618889b98ca

8 years agoMerge \\"Document that WallpaperManager.getDrawable() can return null\\" into nyc...
Chris Tate [Mon, 18 Jul 2016 17:54:54 +0000 (17:54 +0000)]
Merge \\"Document that WallpaperManager.getDrawable() can return null\\" into nyc-mr1-dev am: 3cec9d44b3
am: ca0e0b9b6c

Change-Id: Id27ec9541d4075f80a546d3df2bfd7577e38f0fc

8 years agoMerge \"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\" into nyc-mr1-dev
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

8 years agoMerge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev
Makoto Onuki [Mon, 18 Jul 2016 17:50:24 +0000 (17:50 +0000)]
Merge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev

8 years agoMerge "Remove the DMAgent whitelisting" into nyc-mr1-dev
Makoto Onuki [Mon, 18 Jul 2016 17:50:17 +0000 (17:50 +0000)]
Merge "Remove the DMAgent whitelisting" into nyc-mr1-dev

8 years agoMerge "DO NOT MERGE: FloatingToolbar - Check that app supports RTL." into nyc-mr1-dev
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

8 years agoMerge "Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecf...
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

8 years agoMerge "Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf...
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

8 years agoMerge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev
Hall Liu [Mon, 18 Jul 2016 17:44:38 +0000 (17:44 +0000)]
Merge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev

8 years agoMerge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf
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

8 years agoMerge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf...
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

8 years agoMerge \"Document that WallpaperManager.getDrawable() can return null\" into nyc-mr1-dev
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

8 years agodocs: remove trailing white space from jd files
Mark Lu [Mon, 18 Jul 2016 17:42:11 +0000 (10:42 -0700)]
docs: remove trailing white space from jd files

Change-Id: Id7fb958460bf2f28d88c6120df0395690f32783a

8 years agoMerge \"docs: Added support library 24.1.0\" into nyc-dev
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

8 years agoMerge "Remove two-finger scroll specific code"
Chong Zhang [Mon, 18 Jul 2016 17:30:51 +0000 (17:30 +0000)]
Merge "Remove two-finger scroll specific code"

8 years agoRemove two-finger scroll specific code
Chong Zhang [Fri, 15 Jul 2016 18:28:17 +0000 (11:28 -0700)]
Remove two-finger scroll specific code

Revert changes in ag/845161, ag/843943 and ag/817515 that's added
specifically for two-finger scroll mode.

Change-Id: I8679a3bd5b3907180d33d99e3a071e7edfb2ed96

8 years agoMerge "indexOfValueByValue now uses .equals"
Tejas Khorana [Mon, 18 Jul 2016 17:29:48 +0000 (17:29 +0000)]
Merge "indexOfValueByValue now uses .equals"

8 years agoMerge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am: 872ecfb0bf"...
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

8 years agoMerge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev
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

8 years agoMerge \"docs: Added support library 24.1.0\" into nyc-dev
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

8 years agoMerge "Added missing copyright notice."
Felipe Leme [Mon, 18 Jul 2016 17:25:56 +0000 (17:25 +0000)]
Merge "Added missing copyright notice."

8 years agoMerge "docs: Added support library 24.1.0" into nyc-dev
Andrew Solovay [Mon, 18 Jul 2016 17:16:59 +0000 (17:16 +0000)]
Merge "docs: Added support library 24.1.0" into nyc-dev

8 years agodocs: Removed Sony Experia from N Preview download page
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

8 years agoMerge \"Doc change: updated issues in DP5 release notes. am: 73b700404c am: 142c4f7a9...
Dirk Dougherty [Mon, 18 Jul 2016 15:33:03 +0000 (15:33 +0000)]
Merge \"Doc change: updated issues in DP5 release notes. am: 73b700404c am: 142c4f7a9f\" into nyc-mr1-dev-plus-aosp
am: 8f90ec2c82

Change-Id: I52ccd61e8fe251b5434cd231552ccfef887fe37a

8 years agoDoc change: updated issues in DP5 release notes. am: 73b700404c am: 3061ceaf82
Dirk Dougherty [Mon, 18 Jul 2016 15:33:00 +0000 (15:33 +0000)]
Doc change: updated issues in DP5 release notes. am: 73b700404c am: 3061ceaf82
am: 1eee792833

Change-Id: I72609701a85aa8baf4118958fb4b8283b5d903f7

8 years agoMerge "Doc change: updated issues in DP5 release notes. am: 73b700404c am: 142c4f7a9f...
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

8 years agoDoc change: updated issues in DP5 release notes. am: 73b700404c
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

8 years agoDoc change: updated issues in DP5 release notes. am: 73b700404c
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

8 years agoMerge \"Merge \\\"update the version number used in docs and update the offline docs...
Scott Main [Mon, 18 Jul 2016 15:22:09 +0000 (15:22 +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
am: 9b64190eca

Change-Id: I0653fe8e9bc7e4d5db97bdf6166fb73c451047f9

8 years agoMerge \\\"update the version number used in docs and update the offline docs landing...
smain@google.com [Mon, 18 Jul 2016 15:22:05 +0000 (15:22 +0000)]
Merge \\\"update the version number used in docs and update the offline docs landing page\\\" into nyc-dev am: 6623f4177c am: 38b71c5741
am: 5eac2b0d88

Change-Id: I63b57594c6d2eb833a577ff8b51c01e9d2e31d39

8 years agoDoc change: updated issues in DP5 release notes.
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

8 years agoDoc change: updated issues in DP5 release notes.
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

8 years agoMerge "Merge \\"update the version number used in docs and update the offline docs...
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