OSDN Git Service
Malcolm Chen [Wed, 28 Mar 2018 23:22:11 +0000 (23:22 +0000)]
Merge "Merge "Clean new TelephonyManager API." am:
8d8921d7fc am:
a0706e3590" into pi-dev-plus-aosp
am:
a1aa519da5
Change-Id: I8817fd2b8cb4ba45f56edf6e31426382320e3daa
Tej Singh [Wed, 28 Mar 2018 23:02:07 +0000 (23:02 +0000)]
Merge "Merge "Temperature atom: Use int instead of float." into pi-dev am:
31c807c987" into pi-dev-plus-aosp
am:
128da7c873
Change-Id: I3ad448137fce55ac5da0be114a78e63627ad05ff
Jean-Michel Trivi [Wed, 28 Mar 2018 22:48:11 +0000 (22:48 +0000)]
Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am:
26ef7344c9" into pi-dev-plus-aosp
am:
77fca22044
Change-Id: Icc7994f8625023f2f5c9c76081e17b9d6d166f19
David Pursell [Wed, 28 Mar 2018 22:16:24 +0000 (22:16 +0000)]
Merge "Merge "MessageQueue: explicitly remove FD event listeners." am:
b43daf5f7b am:
040587641b" into pi-dev-plus-aosp
am:
1058f42271
Change-Id: I5093ca0d576473f490347ab4244af11a2835d23a
Sami Kyostila [Wed, 28 Mar 2018 21:51:25 +0000 (21:51 +0000)]
[automerger skipped] Merge "Merge "statsd: Pass alert and config id to Perfetto" into pi-dev am:
66cb4e2871" into pi-dev-plus-aosp
am:
380d6781ca -s ours
Change-Id: I71ae13da882900a5af18c0c556e338ff3a863d7b
Stan Iliev [Wed, 28 Mar 2018 21:38:08 +0000 (21:38 +0000)]
Merge "Merge "Better error reporting for createOrUpdateLayer" into pi-dev am:
67a58660b9" into pi-dev-plus-aosp
am:
0bb7fbe729
Change-Id: I722510bbf527f1dd4eb323bf4be48653eb3562cc
Brad Ebinger [Wed, 28 Mar 2018 21:28:13 +0000 (21:28 +0000)]
[automerger skipped] Merge "Parse SMS locally upon error to get message ref" am:
7a5653599c am:
06cdcab7ba -s ours
am:
1a7aec528b -s ours
Change-Id: I3136490811eddadbec6ad3605c74105b76c4b37d
Android Build Merger (Role) [Wed, 28 Mar 2018 21:10:20 +0000 (21:10 +0000)]
Merge "Merge "Clean new TelephonyManager API." am:
8d8921d7fc am:
a0706e3590" into pi-dev-plus-aosp
Android Build Merger (Role) [Wed, 28 Mar 2018 21:09:59 +0000 (21:09 +0000)]
Merge "Merge "Temperature atom: Use int instead of float." into pi-dev am:
31c807c987" into pi-dev-plus-aosp
Malcolm Chen [Wed, 28 Mar 2018 21:09:36 +0000 (21:09 +0000)]
Merge "Clean new TelephonyManager API." am:
8d8921d7fc
am:
a0706e3590
Change-Id: I42b40c946923b2d8b767fec77c6f6b1c566abd72
Etan Cohen [Wed, 28 Mar 2018 21:08:10 +0000 (21:08 +0000)]
Merge "[RTT] Add API for number of measurements" into pi-dev am:
d1c5b6695f
am:
80b9e35dce
Change-Id: I8070b2464da26a75a50d821746b6a181fb8ece91
Tej Singh [Wed, 28 Mar 2018 21:07:26 +0000 (21:07 +0000)]
Merge "Temperature atom: Use int instead of float." into pi-dev
am:
31c807c987
Change-Id: I736aa42f02e9d303fc76dca20349471a5219821d
Bill Yi [Wed, 28 Mar 2018 21:03:40 +0000 (21:03 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
7c862d461c -s ours
am:
474c7891df -s ours
Change-Id: I559909d91a34adaaa61830a6ae6b23e2e5658556
Yi Jin [Wed, 28 Mar 2018 21:03:11 +0000 (21:03 +0000)]
Merge "Found out it is not possible to exec procrank as non-root/shell. But it is ok to disable procrank since the information can be obtain via dumpsys meminfo" into pi-dev am:
ab34199e9c
am:
0310f0e2cf
Change-Id: Ic4aa59b4c253b4a42cf5d4dbafa94fa071cfb4eb
Android Build Merger (Role) [Wed, 28 Mar 2018 21:01:51 +0000 (21:01 +0000)]
Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am:
26ef7344c9" into pi-dev-plus-aosp
Jean-Michel Trivi [Wed, 28 Mar 2018 21:01:24 +0000 (21:01 +0000)]
Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev
am:
26ef7344c9
Change-Id: If03bf4419f12a60afd0aed8c2d1ee52774c741d3
Android Build Merger (Role) [Wed, 28 Mar 2018 21:00:17 +0000 (21:00 +0000)]
Merge "Merge "MessageQueue: explicitly remove FD event listeners." am:
b43daf5f7b am:
040587641b" into pi-dev-plus-aosp
David Pursell [Wed, 28 Mar 2018 20:59:26 +0000 (20:59 +0000)]
Merge "MessageQueue: explicitly remove FD event listeners." am:
b43daf5f7b
am:
040587641b
Change-Id: Ia4537ab0db75eabe8b3bf3fc07585a36769727f8
Android Build Merger (Role) [Wed, 28 Mar 2018 20:58:53 +0000 (20:58 +0000)]
Merge "Merge "statsd: Pass alert and config id to Perfetto" into pi-dev am:
66cb4e2871" into pi-dev-plus-aosp
Sami Kyostila [Wed, 28 Mar 2018 20:58:27 +0000 (20:58 +0000)]
Merge "statsd: Pass alert and config id to Perfetto" into pi-dev
am:
66cb4e2871
Change-Id: Ia60905455eea9434f63435a0c6fd04276299e927
Android Build Merger (Role) [Wed, 28 Mar 2018 20:54:22 +0000 (20:54 +0000)]
Merge "Merge "Better error reporting for createOrUpdateLayer" into pi-dev am:
67a58660b9" into pi-dev-plus-aosp
Stan Iliev [Wed, 28 Mar 2018 20:53:54 +0000 (20:53 +0000)]
Merge "Better error reporting for createOrUpdateLayer" into pi-dev
am:
67a58660b9
Change-Id: I3f3bcf4d83fcb6210baecf3b7f4e4cc2d8ad996c
Brad Ebinger [Wed, 28 Mar 2018 20:52:29 +0000 (20:52 +0000)]
[automerger skipped] Merge "Parse SMS locally upon error to get message ref" am:
7a5653599c
am:
06cdcab7ba -s ours
Change-Id: Ic2c53def15379c202175a06b457b0a77b8872ddf
Malcolm Chen [Wed, 28 Mar 2018 20:47:45 +0000 (20:47 +0000)]
Merge "Clean new TelephonyManager API."
am:
8d8921d7fc
Change-Id: I6a6ffe87a6b19f5723da955308ec39c83ed5aca3
David Pursell [Wed, 28 Mar 2018 20:43:07 +0000 (20:43 +0000)]
Merge "MessageQueue: explicitly remove FD event listeners."
am:
b43daf5f7b
Change-Id: Ia6d04879f1007344d58ce9b9dbc5b1aeeafb1db7
Chenjie Yu [Wed, 28 Mar 2018 20:41:36 +0000 (20:41 +0000)]
Merge "Fix typo on pull alarm broadcast receiver" into pi-dev am:
e100329647
am:
5ae0e340c3
Change-Id: I7895d7605f59e27084cf2a816584ed04a22d5067
Brad Ebinger [Wed, 28 Mar 2018 20:40:37 +0000 (20:40 +0000)]
Merge "Parse SMS locally upon error to get message ref"
am:
7a5653599c
Change-Id: I95d354c130697849e6a7953fdf4f089c557f5a4e
Salvador Martinez [Wed, 28 Mar 2018 20:35:28 +0000 (20:35 +0000)]
Merge "Update wifi header summary text to show metered state" into pi-dev am:
740d37193f
am:
93dc7a4519
Change-Id: Ica76339e7efe675d481a96c50b83f17a1236dd35
Tej Singh [Wed, 28 Mar 2018 20:33:44 +0000 (20:33 +0000)]
Merge "Temperature atom: Use int instead of float." into pi-dev
Etan Cohen [Wed, 28 Mar 2018 20:33:31 +0000 (20:33 +0000)]
Merge "[RTT] Add API for number of measurements" into pi-dev
am:
d1c5b6695f
Change-Id: I75b5aa6eb2bea59ad8e022a00268b585a0de146c
Jean-Michel Trivi [Wed, 28 Mar 2018 20:30:02 +0000 (20:30 +0000)]
Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 20:29:31 +0000 (20:29 +0000)]
Merge "statsd: Pass alert and config id to Perfetto" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 20:28:59 +0000 (20:28 +0000)]
Merge "Better error reporting for createOrUpdateLayer" into pi-dev
Bill Yi [Wed, 28 Mar 2018 20:28:14 +0000 (20:28 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
7c862d461c -s ours
Change-Id: I192b22e7aaa4382365e22ff2d2b85b16aea21433
Nicolas Geoffray [Wed, 28 Mar 2018 20:27:10 +0000 (20:27 +0000)]
Merge "Add new Wifi API to light grey." into pi-dev am:
0bc998b32f
am:
3301a0380b
Change-Id: Iab1f9777ec32fbc42e4ae1f0c9ed5e38e76bef55
Yi Jin [Wed, 28 Mar 2018 20:17:44 +0000 (20:17 +0000)]
Merge "Found out it is not possible to exec procrank as non-root/shell. But it is ok to disable procrank since the information can be obtain via dumpsys meminfo" into pi-dev
am:
ab34199e9c
Change-Id: I46c9c001ceac7a9283db1ccf9c0ba438d6f65120
TreeHugger Robot [Wed, 28 Mar 2018 20:12:24 +0000 (20:12 +0000)]
Merge "[RTT] Add API for number of measurements" into pi-dev
Chenjie Yu [Wed, 28 Mar 2018 20:12:07 +0000 (20:12 +0000)]
Merge "Fix typo on pull alarm broadcast receiver" into pi-dev
am:
e100329647
Change-Id: I076b07d714b402c4b19dc8fdc947419d8da04d8b
TreeHugger Robot [Wed, 28 Mar 2018 20:06:18 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Salvador Martinez [Wed, 28 Mar 2018 20:05:50 +0000 (20:05 +0000)]
Merge "Update wifi header summary text to show metered state" into pi-dev
am:
740d37193f
Change-Id: I2fe3ef92aa1def1aab8a28b29a862c7d9a708488
Jorim Jaggi [Wed, 28 Mar 2018 20:03:21 +0000 (20:03 +0000)]
Merge "Add different animation for transitions with translucent apps" into pi-dev am:
13c4b14e92
am:
162b5e89ec
Change-Id: Id1eded5e514f0444f697fe52730e39af593aaba4
Dmitry Dementyev [Wed, 28 Mar 2018 19:59:17 +0000 (19:59 +0000)]
Merge "Use rootAlias to index chosen cert and its version." into pi-dev am:
52bc5f2ae1
am:
4120a4d040
Change-Id: Icebea14c938768fa7db6e55e357b9882b6697f96
Nicolas Geoffray [Wed, 28 Mar 2018 19:57:49 +0000 (19:57 +0000)]
Merge "Add new Wifi API to light grey." into pi-dev
am:
0bc998b32f
Change-Id: I9e63bdeda0f2747ba414ad152115dda45d136ca1
Mohamed Abdalkader [Wed, 28 Mar 2018 19:55:50 +0000 (19:55 +0000)]
Merge "Grant CONTACT permissions to IMS package." into pi-dev am:
a21c304be5
am:
581ae181f2
Change-Id: Ic4872fda5f610706818f9e941a81f759520da4af
TreeHugger Robot [Wed, 28 Mar 2018 19:44:26 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Pavel Grafov [Wed, 28 Mar 2018 19:40:31 +0000 (19:40 +0000)]
Merge "Improve javadoc for DISALLOW_DEBUGGING_FEATURES."
Jorim Jaggi [Wed, 28 Mar 2018 19:39:34 +0000 (19:39 +0000)]
Merge "Add different animation for transitions with translucent apps" into pi-dev
am:
13c4b14e92
Change-Id: Ice110754fd73cfc576c89bec346792cdcdd9802b
TreeHugger Robot [Wed, 28 Mar 2018 19:37:46 +0000 (19:37 +0000)]
Merge "Found out it is not possible to exec procrank as non-root/shell. But it is ok to disable procrank since the information can be obtain via dumpsys meminfo" into pi-dev
Felipe Leme [Wed, 28 Mar 2018 19:37:45 +0000 (19:37 +0000)]
Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev am:
b8c00934cb
am:
09da1990a7
Change-Id: I54351c8462cb9030d52707d2a8df5b10d36f54fd
Dmitry Dementyev [Wed, 28 Mar 2018 19:33:33 +0000 (19:33 +0000)]
Merge "Use rootAlias to index chosen cert and its version." into pi-dev
am:
52bc5f2ae1
Change-Id: Id3926848ae5fdad1851b4193319a08652642d1e6
TreeHugger Robot [Wed, 28 Mar 2018 19:33:19 +0000 (19:33 +0000)]
Merge "Fix typo on pull alarm broadcast receiver" into pi-dev
Mohamed Abdalkader [Wed, 28 Mar 2018 19:29:25 +0000 (19:29 +0000)]
Merge "Grant CONTACT permissions to IMS package." into pi-dev
am:
a21c304be5
Change-Id: I416b47c238599addefd7fca124897ea6541fcdff
Felipe Leme [Wed, 28 Mar 2018 19:20:02 +0000 (19:20 +0000)]
Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev
am:
b8c00934cb
Change-Id: Iea7cded56990ae09d5f60bbbc63978273092db6e
Vishwath Mohan [Wed, 28 Mar 2018 19:19:40 +0000 (19:19 +0000)]
Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev am:
86ed912f5a
am:
77b5ccb59b
Change-Id: I6de587d85c7ece9a20613ab935fca6f886dbc1c3
TreeHugger Robot [Wed, 28 Mar 2018 19:15:05 +0000 (19:15 +0000)]
Merge "Update wifi header summary text to show metered state" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 19:14:49 +0000 (19:14 +0000)]
Merge "Add new Wifi API to light grey." into pi-dev
Jorim Jaggi [Wed, 28 Mar 2018 19:09:08 +0000 (19:09 +0000)]
Merge "Add different animation for transitions with translucent apps" into pi-dev
Android Build Merger (Role) [Wed, 28 Mar 2018 19:08:04 +0000 (19:08 +0000)]
Merge "Merge "Use commas to separate API exemptions list, not colon." am:
2fddfcdced am:
9f85ad8c99 am:
33be0a8ca3"
Mathew Inwood [Wed, 28 Mar 2018 19:07:36 +0000 (19:07 +0000)]
Merge "Use commas to separate API exemptions list, not colon." am:
2fddfcdced am:
9f85ad8c99
am:
33be0a8ca3
Change-Id: I00af79a43f37957ff30944f8b9bb1a81a26a9fa9
TreeHugger Robot [Wed, 28 Mar 2018 19:06:43 +0000 (19:06 +0000)]
Merge "Add NtpTimeHelper"
Dmitry Dementyev [Wed, 28 Mar 2018 19:05:21 +0000 (19:05 +0000)]
Merge "Use rootAlias to index chosen cert and its version." into pi-dev
Vishwath Mohan [Wed, 28 Mar 2018 19:01:11 +0000 (19:01 +0000)]
Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev
am:
86ed912f5a
Change-Id: I2582d4770900460a8d37c9d832e9a20583f9adf9
TreeHugger Robot [Wed, 28 Mar 2018 18:57:50 +0000 (18:57 +0000)]
Merge "Grant CONTACT permissions to IMS package." into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 18:54:38 +0000 (18:54 +0000)]
Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev
Myles Watson [Wed, 28 Mar 2018 18:53:26 +0000 (18:53 +0000)]
[automerger skipped] Merge "Tell the user to toggle Bluetooth when enabling HCI logs" into pi-dev am:
8dfb334264 -s ours
am:
1edf1e19cf -s ours
Change-Id: I3a0bbdea63cf0325755eb20e7cc2ee2f8db07510
Mathew Inwood [Wed, 28 Mar 2018 18:46:42 +0000 (18:46 +0000)]
Merge "Use commas to separate API exemptions list, not colon." am:
2fddfcdced
am:
9f85ad8c99
Change-Id: Idc8adc6ccc505b1264cc8e26c76f067ae4abca1f
Vishwath Mohan [Wed, 28 Mar 2018 18:46:34 +0000 (18:46 +0000)]
Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev
Jerry Zhang [Wed, 28 Mar 2018 18:40:29 +0000 (18:40 +0000)]
Merge "Fix Unicode handling." into pi-dev am:
59f888d94c
am:
c744ab4c30
Change-Id: I4a988f695a1653d05453dacf8fce21b288d63c1d
Treehugger Robot [Wed, 28 Mar 2018 18:40:17 +0000 (18:40 +0000)]
Merge "Clean new TelephonyManager API."
Mathew Inwood [Wed, 28 Mar 2018 18:38:48 +0000 (18:38 +0000)]
Merge "Use commas to separate API exemptions list, not colon."
am:
2fddfcdced
Change-Id: I8435589ca414dec8ac7a857f6639b8d39fa18d98
Myles Watson [Wed, 28 Mar 2018 18:38:28 +0000 (18:38 +0000)]
[automerger skipped] Merge "Tell the user to toggle Bluetooth when enabling HCI logs" into pi-dev
am:
8dfb334264 -s ours
Change-Id: I86f50d8ce99308699f2f1c8392c04037a2930403
Jean-Michel Trivi [Tue, 27 Mar 2018 22:29:08 +0000 (15:29 -0700)]
MediaPlayer subtitle data / time discontinuity interfaces
Expose in SDK the interfaces necessary to implement unbundled
subtitle support, which requires:
- exposing an interface to receive the encoded subtitle data
- exposing an interface while allows a renderer to synchronize
its rendering clock with the media time of the player.
Deprecate duplicated timed text constant, all timed text / sub
mime types are defined in MediaFormat.
Bug:
76121592
Test: make offline-sdk-docs
Change-Id: I42cc1d69069babb69a2feeba3f54da89889f4602
Felipe Leme [Wed, 28 Mar 2018 18:33:06 +0000 (18:33 +0000)]
Merge "Added autofill cmds to get and set full-screen mode." into pi-dev am:
39531e28ed
am:
b4c6ae2cb9
Change-Id: I702c9023651ef4d1b03bb220218e446e67d506b4
Jerry Zhang [Wed, 28 Mar 2018 18:32:57 +0000 (18:32 +0000)]
Merge "Fix Unicode handling." into pi-dev
am:
59f888d94c
Change-Id: Id5f085e6f0b9f0aa705cbb6d9eef97b79fbe5982
Felipe Leme [Wed, 28 Mar 2018 18:25:50 +0000 (18:25 +0000)]
Merge "Added autofill cmds to get and set full-screen mode." into pi-dev
am:
39531e28ed
Change-Id: I2b99ee1e6aad140869eb769709fdd559d8f555a3
Jiuyu Sun [Wed, 28 Mar 2018 18:21:36 +0000 (18:21 +0000)]
Merge "Add grant and revoke default permissions to active LUI app." into pi-dev am:
b1adae546c
am:
64034c6edd
Change-Id: I7b75d147c808f7f5b43ff2d722e61f72a51eebab
TreeHugger Robot [Wed, 28 Mar 2018 18:19:39 +0000 (18:19 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs" into pi-dev
Bill Yi [Wed, 28 Mar 2018 18:12:39 +0000 (11:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If50c887a445b8a4a30107830a7dbe67eea17ddbd
Bill Yi [Wed, 28 Mar 2018 18:13:51 +0000 (11:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie6daa882e2679c17920cdb6ba106ffaa2c9c14b0
Jerry Zhang [Wed, 28 Mar 2018 18:16:48 +0000 (18:16 +0000)]
Merge "Fix Unicode handling." into pi-dev
Jiuyu Sun [Wed, 28 Mar 2018 18:08:43 +0000 (18:08 +0000)]
Merge "Add grant and revoke default permissions to active LUI app." into pi-dev
am:
b1adae546c
Change-Id: Ic58c98fac6a1b792ca9525653b3e07e5839741f4
TreeHugger Robot [Wed, 28 Mar 2018 18:07:17 +0000 (18:07 +0000)]
Merge "Added autofill cmds to get and set full-screen mode." into pi-dev
Treehugger Robot [Wed, 28 Mar 2018 18:06:31 +0000 (18:06 +0000)]
Merge "MessageQueue: explicitly remove FD event listeners."
Stan Iliev [Mon, 26 Mar 2018 18:29:50 +0000 (14:29 -0400)]
Better error reporting for createOrUpdateLayer
Pass error handler down to the pipeline object, which allows
skia pipelines to print cache memory usage.
In case of an error, print arguments that were used to invoke
SkSurface::MakeRenderTarget.
Test: Ran android build on a device
Bug:
76115654
Change-Id: I5baddfa66debd505eddc3117cf94aa6ae69bedaa
TreeHugger Robot [Wed, 28 Mar 2018 17:46:19 +0000 (17:46 +0000)]
Merge "Added --debug-mode flag to AAPT2"
Jiuyu Sun [Wed, 28 Mar 2018 17:44:35 +0000 (17:44 +0000)]
Merge "Add grant and revoke default permissions to active LUI app." into pi-dev
Jan Althaus [Wed, 28 Mar 2018 17:35:32 +0000 (17:35 +0000)]
Merge "Change TextClassification to use RemoteActions" into pi-dev am:
08a75e0ee7
am:
39441a9d85
Change-Id: Ib9f44a89c0943eeff54f60f68e1aeb5d83ef3994
Jan Althaus [Wed, 28 Mar 2018 17:23:56 +0000 (17:23 +0000)]
Merge "Change TextClassification to use RemoteActions" into pi-dev
am:
08a75e0ee7
Change-Id: I411c8b207e24c6a4e9ca8660619fae1e0a3a8ef7
Chavi Weingarten [Wed, 28 Mar 2018 17:19:50 +0000 (17:19 +0000)]
Merge "Set snapTargetBeforeMinimized to middle target if position is negative" into pi-dev am:
5e86c3c28d
am:
3b4ea4aef0
Change-Id: I6e6c4096f051f32f41d6f2065506012f941c5bda
Lei Yu [Wed, 28 Mar 2018 17:10:36 +0000 (17:10 +0000)]
Merge "Change the time format to short" into pi-dev am:
9bd77dea82
am:
e17fed3408
Change-Id: If517794479e4f3ace6f25a5e5c8ef117890efa33
Chavi Weingarten [Wed, 28 Mar 2018 17:08:38 +0000 (17:08 +0000)]
Merge "Set snapTargetBeforeMinimized to middle target if position is negative" into pi-dev
am:
5e86c3c28d
Change-Id: Iaec2e71f18816581ffd2172247512cfcc2810306
Jan Althaus [Wed, 28 Mar 2018 17:04:58 +0000 (17:04 +0000)]
Merge "Change TextClassification to use RemoteActions" into pi-dev
Brad Ebinger [Wed, 28 Mar 2018 16:59:41 +0000 (16:59 +0000)]
Merge "Parse SMS locally upon error to get message ref"
Lei Yu [Wed, 28 Mar 2018 16:57:37 +0000 (16:57 +0000)]
Merge "Change the time format to short" into pi-dev
am:
9bd77dea82
Change-Id: Id8856049a5e805a7eec4539b434643d445defa74
Treehugger Robot [Wed, 28 Mar 2018 16:57:30 +0000 (16:57 +0000)]
Merge "Use commas to separate API exemptions list, not colon."
Yohei Yukawa [Wed, 28 Mar 2018 16:50:40 +0000 (16:50 +0000)]
Merge "Improve the JavaDoc for SOFT_INPUT_STATE_UNSPECIFIED" into pi-dev am:
59ecb96da9
am:
45cce268a0
Change-Id: I483b805079891e303081508fae767952bdac6ec4
Chavi Weingarten [Wed, 28 Mar 2018 16:49:07 +0000 (16:49 +0000)]
Merge "Set snapTargetBeforeMinimized to middle target if position is negative" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 16:45:45 +0000 (16:45 +0000)]
Merge "Change the time format to short" into pi-dev
Jorim Jaggi [Wed, 28 Mar 2018 16:42:39 +0000 (16:42 +0000)]
Merge "Fix issues with z-ordering during animations" into pi-dev am:
baac6507dc
am:
81f3cb1081
Change-Id: Ia5ec18a2fe7261e9d295710336da6fca17a92529
Yohei Yukawa [Wed, 28 Mar 2018 16:36:36 +0000 (16:36 +0000)]
Merge "Improve the JavaDoc for SOFT_INPUT_STATE_UNSPECIFIED" into pi-dev
am:
59ecb96da9
Change-Id: Id6292d96a01421ae8a50c4510d9f855cea1f3037
OSDN Git Service
