OSDN Git Service
Jon Miranda [Mon, 8 May 2017 20:45:14 +0000 (20:45 +0000)]
Merge "Calls cancel on mDimAnimator to ensure that ref counts are accurate." into oc-dev am:
e6b55b9960
am:
a077885731
Change-Id: Ia20405b22319dd665305b87c095a016b60cf2a91
Jon Miranda [Mon, 8 May 2017 20:36:42 +0000 (20:36 +0000)]
Merge "Calls cancel on mDimAnimator to ensure that ref counts are accurate." into oc-dev
am:
e6b55b9960
Change-Id: Id152c631fe22e169f3a84fce6006fc7adcdb2a53
TreeHugger Robot [Mon, 8 May 2017 20:28:16 +0000 (20:28 +0000)]
Merge "Calls cancel on mDimAnimator to ensure that ref counts are accurate." into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:04:30 +0000 (20:04 +0000)]
Merge "Fix double bolding"
Felipe Leme [Mon, 8 May 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Fixed scenario where an authentication response has no dataset." into oc-dev am:
1c38d29482
am:
98333b84a2
Change-Id: I166b085c41d06c104080b8489a7111f527a12081
TreeHugger Robot [Mon, 8 May 2017 19:34:13 +0000 (19:34 +0000)]
Merge "Fix NPE when opening tether preference."
Felipe Leme [Mon, 8 May 2017 19:28:23 +0000 (19:28 +0000)]
Merge "Fixed scenario where an authentication response has no dataset." into oc-dev
am:
1c38d29482
Change-Id: I09159b6fd7b41e17e099da9ac5fa3ef7a5f0d6b2
TreeHugger Robot [Mon, 8 May 2017 19:20:06 +0000 (19:20 +0000)]
Merge "Fixed scenario where an authentication response has no dataset." into oc-dev
Android Build Merger (Role) [Mon, 8 May 2017 19:12:02 +0000 (19:12 +0000)]
Merge "Merge "Additional log instrumentation for multi-user" into oc-dev am:
dadc05635a am:
f2ffdb28a4"
Fyodor Kupolov [Mon, 8 May 2017 19:11:09 +0000 (19:11 +0000)]
Merge "Additional log instrumentation for multi-user" into oc-dev am:
dadc05635a
am:
f2ffdb28a4
Change-Id: Iaaacd4a7044ae57f57b9ed0f5179e341f9ed354b
Bookatz [Mon, 8 May 2017 19:04:22 +0000 (19:04 +0000)]
Merge changes from topic 'wakelockTotalDuration' into oc-dev am:
6b1989c7e2
am:
6103e0445f
Change-Id: I5dcff27685fa96f6cdc0159ee454720c9d5e1e01
Bookatz [Mon, 8 May 2017 19:03:03 +0000 (19:03 +0000)]
Added actual (unpooled) partial wakelock times. am:
506a8183fd
am:
6d70b7aa2f
Change-Id: I76e27cc342049590e46ff141f65b0282e4064d49
Fyodor Kupolov [Mon, 8 May 2017 19:02:04 +0000 (19:02 +0000)]
Merge "Additional log instrumentation for multi-user" into oc-dev
am:
dadc05635a
Change-Id: Id0a11d3797830c8f3178972b664f710e947030c6
Bookatz [Mon, 8 May 2017 18:57:34 +0000 (18:57 +0000)]
Merge changes from topic 'wakelockTotalDuration' into oc-dev
am:
6b1989c7e2
Change-Id: I04a7323ed927ebfad40129166d7e0cc61be7b3af
Bookatz [Mon, 8 May 2017 18:56:33 +0000 (18:56 +0000)]
Added actual (unpooled) partial wakelock times.
am:
506a8183fd
Change-Id: I684b9287bf7bec032da54c497744f863768917e2
TreeHugger Robot [Mon, 8 May 2017 18:52:34 +0000 (18:52 +0000)]
Merge "Additional log instrumentation for multi-user" into oc-dev
Justin Klaassen [Mon, 8 May 2017 18:50:16 +0000 (18:50 +0000)]
Merge "Night display status restored until valid state" into oc-dev am:
2710490ac9
am:
d2767c45b0
Change-Id: I1af9411b0338112c41112b54aee14f42412536f2
TreeHugger Robot [Mon, 8 May 2017 18:34:32 +0000 (18:34 +0000)]
Merge changes from topic 'wakelockTotalDuration' into oc-dev
* changes:
Wakelock durations are 0 instead of -1 if unused
Added actual (unpooled) partial wakelock times.
Justin Klaassen [Mon, 8 May 2017 18:33:06 +0000 (18:33 +0000)]
Merge "Night display status restored until valid state" into oc-dev
am:
2710490ac9
Change-Id: Ie1bcdaff64110ea0e3a6ec3ea14e1637c5390008
Fyodor Kupolov [Mon, 8 May 2017 18:27:35 +0000 (18:27 +0000)]
Merge "Do not call updateApplicationInfo with mResourceManager lock" into oc-dev am:
bf34f4922d
am:
4b00db5492
Change-Id: I7413f031c5f47c66e5231e7666d5a93df73dc94f
TreeHugger Robot [Mon, 8 May 2017 18:20:29 +0000 (18:20 +0000)]
Merge "Fix flaky SecurityControllerTest.testCaCertLoader"
TreeHugger Robot [Mon, 8 May 2017 18:20:29 +0000 (18:20 +0000)]
Merge "Night display status restored until valid state" into oc-dev
Fyodor Kupolov [Mon, 8 May 2017 18:18:00 +0000 (18:18 +0000)]
Merge "Do not call updateApplicationInfo with mResourceManager lock" into oc-dev
am:
bf34f4922d
Change-Id: Id7ccea22af67938883995a37c0acc054d9751aad
Seigo Nonaka [Tue, 2 May 2017 05:17:36 +0000 (22:17 -0700)]
Fix double bolding
resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.
This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.
To be clear, this CL changes the function names but keeps the same
semantics as before.
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug:
37880319
Change-Id: Ied73189b11792fb062da46f45afd2db664e6ecb4
TreeHugger Robot [Mon, 8 May 2017 18:10:11 +0000 (18:10 +0000)]
Merge "Do not call updateApplicationInfo with mResourceManager lock" into oc-dev
Jason Monk [Mon, 8 May 2017 18:05:48 +0000 (18:05 +0000)]
Merge "Fix ephemeral intent caching in notification" into oc-dev am:
f10a089fdc
am:
2f7bad49c6
Change-Id: I05a3531a77cb58ff4b27c06804b12dd0b3893491
Paul Duffin [Mon, 8 May 2017 17:50:12 +0000 (17:50 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
Jason Monk [Mon, 8 May 2017 17:44:23 +0000 (17:44 +0000)]
Merge "Start drawing QS slashes rather than using AVDS"
Jason Monk [Mon, 8 May 2017 17:44:03 +0000 (17:44 +0000)]
Merge "Fix ephemeral intent caching in notification" into oc-dev
am:
f10a089fdc
Change-Id: Id41706875501971cbe83181885d2a47aadf788b1
TreeHugger Robot [Mon, 8 May 2017 17:37:10 +0000 (17:37 +0000)]
Merge "Fix ephemeral intent caching in notification" into oc-dev
Fan Zhang [Mon, 8 May 2017 17:00:47 +0000 (10:00 -0700)]
Fix NPE when opening tether preference.
Change-Id: I387d340859cef1adb190e9c763d78c167f0b298b
Fix:
38105700
Test: make RunSettingsLibRoboTests
Daniel Nicoara [Mon, 8 May 2017 16:48:21 +0000 (16:48 +0000)]
Merge "Remove controller connection API" into oc-dev am:
daefe1dcc7
am:
41950bc2c6
Change-Id: I48855908fe4fc4c284bc84b0d99bae5a82099c5d
Daniel Nicoara [Mon, 8 May 2017 16:38:56 +0000 (16:38 +0000)]
Merge "Remove controller connection API" into oc-dev
am:
daefe1dcc7
Change-Id: Ic46c8ed4e41b80927f74b2fa96ed997f6b581134
TreeHugger Robot [Mon, 8 May 2017 16:30:30 +0000 (16:30 +0000)]
Merge "Remove controller connection API" into oc-dev
Yang Ni [Mon, 8 May 2017 16:22:04 +0000 (16:22 +0000)]
Merge "Destroy Allocation right away on exception" am:
52bc790f61 am:
a37bef769a am:
fd9f091995
am:
26a5164479
Change-Id: I5017653d4a19b6a0e111f5ae5f0905cf7a5e7d2c
Yang Ni [Mon, 8 May 2017 16:12:37 +0000 (16:12 +0000)]
Merge "Destroy Allocation right away on exception" am:
52bc790f61 am:
a37bef769a
am:
fd9f091995
Change-Id: Ie83694e722af77c7fc324b8b850e4308f093ab04
Justin Klaassen [Mon, 8 May 2017 14:11:46 +0000 (07:11 -0700)]
Fix flaky SecurityControllerTest.testCaCertLoader
Fixes:
38108698
Test: runtest -c .statusbar.policy.SecurityControllerTest systemui
Change-Id: I6029a09984b72599622f0df57187a20aba4dab30
Yang Ni [Mon, 8 May 2017 16:06:39 +0000 (16:06 +0000)]
Merge "Destroy Allocation right away on exception" am:
52bc790f61
am:
a37bef769a
Change-Id: Id67163535eeaa36d1cd9edd34d19ed04858d62a2
Yang Ni [Mon, 8 May 2017 16:00:34 +0000 (16:00 +0000)]
Merge "Destroy Allocation right away on exception"
am:
52bc790f61
Change-Id: I2724dd4adf68aa8330b10b8f596d9d7db3619e03
Yang Ni [Mon, 8 May 2017 15:52:07 +0000 (15:52 +0000)]
Merge "Destroy Allocation right away on exception"
Jason Monk [Mon, 8 May 2017 15:23:14 +0000 (11:23 -0400)]
Fix ephemeral intent caching in notification
Add some stuffs to make it not cache at bad times, or ever really...
Test: See bug, its long
Change-Id: I27987301ebf393de6f781b17ed7bc789789c01ab
Fixes:
37793400
Michael Wright [Mon, 8 May 2017 14:59:21 +0000 (14:59 +0000)]
Merge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev am:
00487cf936
am:
b9e1b02f72
Change-Id: I65e4b422849689cf5cfbac6a5c2d4f06fcc9bc8d
Michael Wright [Mon, 8 May 2017 14:53:51 +0000 (14:53 +0000)]
Merge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev
am:
00487cf936
Change-Id: Iee08e297248aa57179a434f81f27e3e7924aa201
TreeHugger Robot [Mon, 8 May 2017 14:49:20 +0000 (14:49 +0000)]
Merge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev
Andrei Stingaceanu [Mon, 8 May 2017 13:34:17 +0000 (13:34 +0000)]
Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev am:
2880a4b41f
am:
1fadfb0765
Change-Id: If8e0edfd2f1e1aeaa0831863fb2cd6b83a252083
Justin Klaassen [Fri, 5 May 2017 22:19:33 +0000 (15:19 -0700)]
Night display status restored until valid state
Fixes:
38013048
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services
Change-Id: I8dc4177f89727a29ee6ab8e3db5a23c8127b800c
Andrei Stingaceanu [Mon, 8 May 2017 13:28:16 +0000 (13:28 +0000)]
Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev
am:
2880a4b41f
Change-Id: I1c114c411d97aba08ecfb390c28ceb18eee4cbbd
TreeHugger Robot [Mon, 8 May 2017 13:21:27 +0000 (13:21 +0000)]
Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev
Jorim Jaggi [Mon, 8 May 2017 13:04:56 +0000 (13:04 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev am:
5286b96576
am:
f5b8b9ccd8
Change-Id: Iee07bce280068961c29544eddbc2facd1d608462
Jorim Jaggi [Mon, 8 May 2017 12:58:05 +0000 (12:58 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev
am:
5286b96576
Change-Id: I9e84ae5c1729bd417d449d18eec0449c40029a2c
Jorim Jaggi [Mon, 8 May 2017 12:51:42 +0000 (12:51 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev
Paul Duffin [Wed, 1 Mar 2017 13:21:10 +0000 (13:21 +0000)]
Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug:
30188076
Test: make checkbuild
Change-Id: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
Rubin Xu [Mon, 8 May 2017 12:17:09 +0000 (12:17 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev am:
a5f08d340d
am:
d9404903ee -s ours
Change-Id: Ide8a223f128b506943f238f865af86d0a7ca85e8
Rubin Xu [Mon, 8 May 2017 12:10:17 +0000 (12:10 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev
am:
a5f08d340d
Change-Id: I4d94dd962459c8a565eb2efc7d26afe80e14786b
TreeHugger Robot [Mon, 8 May 2017 12:02:45 +0000 (12:02 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev
Nicolas Geoffray [Mon, 8 May 2017 10:35:28 +0000 (10:35 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
Jeff Sharkey [Sun, 7 May 2017 17:56:40 +0000 (17:56 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev am:
5a421ad0ef
am:
22343c42d2
Change-Id: Id56528c56ec4520591c00b53faf6b4de7380b891
Jeff Sharkey [Sun, 7 May 2017 17:54:32 +0000 (17:54 +0000)]
Merge "No quota-level details for public volumes." into oc-dev am:
4566cb5756
am:
da61aba219
Change-Id: I30d0d4e9a9d686fe13e71f5360683bd546d7f5c5
Jeff Sharkey [Sun, 7 May 2017 17:49:39 +0000 (17:49 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev
am:
5a421ad0ef
Change-Id: Iad313a998a159049cfc55fff978b47be93f5e834
Jeff Sharkey [Sun, 7 May 2017 17:45:36 +0000 (17:45 +0000)]
Merge "No quota-level details for public volumes." into oc-dev
am:
4566cb5756
Change-Id: Ib778a428d4f43b976b13ab21aee021bb9beb7d79
Jeff Sharkey [Sun, 7 May 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:38:15 +0000 (17:38 +0000)]
Merge "No quota-level details for public volumes." into oc-dev
Svet Ganov [Sun, 7 May 2017 01:44:32 +0000 (01:44 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev am:
6bfcc82a4b
am:
eebdc4eb66
Change-Id: I6ae48f6a8cc457b57e4a414629aedf7cdae3df49
Svet Ganov [Sun, 7 May 2017 01:33:11 +0000 (01:33 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev
am:
6bfcc82a4b
Change-Id: I4bc2190dba1afc2274547a00984635cbbc3a4b6b
TreeHugger Robot [Sun, 7 May 2017 01:17:02 +0000 (01:17 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev
Dianne Hackborn [Sun, 7 May 2017 01:15:16 +0000 (01:15 +0000)]
Merge "Fix issue #
38037532: Toasts cause apps to become foreground" into oc-dev am:
1801f688b9
am:
1d1a8c512c
Change-Id: I7c07a165dd882c9d9918c10d9d7071c4f9b9c646
Dianne Hackborn [Sun, 7 May 2017 01:07:41 +0000 (01:07 +0000)]
Merge "Fix issue #
38037532: Toasts cause apps to become foreground" into oc-dev
am:
1801f688b9
Change-Id: Ib812e0357e50b5af010552d0ef18d27e071370b2
Dianne Hackborn [Sun, 7 May 2017 00:59:06 +0000 (00:59 +0000)]
Merge "Fix issue #
38037532: Toasts cause apps to become foreground" into oc-dev
Svet Ganov [Sat, 6 May 2017 23:12:16 +0000 (16:12 -0700)]
Only clear state for force stopped fill service
Test: manual
bug:
37785814
Change-Id: I5e40a284788bacf1ebae5ddefffb93b1a5b47d39
Svet Ganov [Sat, 6 May 2017 23:05:12 +0000 (23:05 +0000)]
Merge "Add call super" into oc-dev am:
a41a968f10
am:
c13d648d4b
Change-Id: I93f57d5bfeaad9c94f6b7460734125cc259624b0
Svet Ganov [Sat, 6 May 2017 22:54:33 +0000 (22:54 +0000)]
Merge "Add call super" into oc-dev
am:
a41a968f10
Change-Id: I864d2ec8d19e37ee1cd849d6cefb216df79ff6dd
TreeHugger Robot [Sat, 6 May 2017 22:46:37 +0000 (22:46 +0000)]
Merge "Add call super" into oc-dev
Svet Ganov [Sat, 6 May 2017 02:38:45 +0000 (19:38 -0700)]
Add call super
Test: manual
bug:
37775067
Change-Id: I50a50f1fbdb7e9c087c72ad0be3b767aeab9572a
TreeHugger Robot [Sat, 6 May 2017 19:54:01 +0000 (19:54 +0000)]
Merge "Draw rectangle shadow fast in low elevation cases"
TreeHugger Robot [Sat, 6 May 2017 19:24:01 +0000 (19:24 +0000)]
Merge "Updated tonal palette algorithm"
Charlie Tsai [Fri, 5 May 2017 10:51:47 +0000 (11:51 +0100)]
Draw rectangle shadow fast in low elevation cases
When the elevation is not high, the shadow is similar
to just add some dark lines on the edges and corners of
rectangle views. Using simple algorithm can also improve
the performance and save more memory.
Test: The render result of unit test is updated.
Bug:
37906145
Change-Id: I28758f868ee6e24e4552368bddfb7ac10fe0a205
TreeHugger Robot [Sat, 6 May 2017 16:19:55 +0000 (16:19 +0000)]
Merge "Increase timeout for flaky testCACertLoader()"
Philip P. Moltmann [Sat, 6 May 2017 16:04:28 +0000 (16:04 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev am:
0271dfd814
am:
25b3e07877
Change-Id: I838d612ed3768f86a3207189454bcdfb7311d7ab
Philip P. Moltmann [Sat, 6 May 2017 15:57:57 +0000 (15:57 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev
am:
0271dfd814
Change-Id: I3bde59a5bf68a9cf4cb328c39bdbf22292b0ed86
TreeHugger Robot [Sat, 6 May 2017 15:51:44 +0000 (15:51 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev
Phil Weaver [Sat, 6 May 2017 15:46:00 +0000 (15:46 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev am:
2a86bad94c
am:
c89c9dd3a9
Change-Id: I873787374ca65c0d18bf0c62416c4ffd4db69ef3
Phil Weaver [Sat, 6 May 2017 15:40:20 +0000 (15:40 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev
am:
2a86bad94c
Change-Id: I268464c67b76de2a5c467a8cbb60b4dbee784b47
Phil Weaver [Sat, 6 May 2017 15:29:19 +0000 (15:29 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev
phweiss [Sat, 6 May 2017 14:21:51 +0000 (16:21 +0200)]
Increase timeout for flaky testCACertLoader()
Bug:
37535489
Bug:
38045871
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java
Change-Id: I5778082973af7c6d4d719b83e334fec552b0a89e
Lucas Dupin [Sat, 6 May 2017 04:07:17 +0000 (04:07 +0000)]
Merge "Get wallpaper colors from thumbnail"
Android Build Merger (Role) [Sat, 6 May 2017 03:33:53 +0000 (03:33 +0000)]
Merge "Merge "Audio service: always unduck focus requester when granted" into oc-dev am:
8e3a8a7027 am:
f306510be0"
Tomasz Wasilczyk [Sat, 6 May 2017 03:32:53 +0000 (03:32 +0000)]
Merge "Implement step and scan calls of ITuner."
Jean-Michel Trivi [Sat, 6 May 2017 03:32:48 +0000 (03:32 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev am:
8e3a8a7027
am:
f306510be0
Change-Id: I21a3b1a63aefbe27883454682db70baa77cc4292
Colin Cross [Sat, 6 May 2017 03:31:00 +0000 (03:31 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am:
d308803b82 am:
06a6e81c1d am:
fb18f4cfed -s ours
am:
f89107022b -s ours
Change-Id: I8d94acca20ef57885cda5cafa31c0f498c756741
nharold [Sat, 6 May 2017 03:25:24 +0000 (03:25 +0000)]
Merge "Merge changes from topic 'sms-files-move-opt-to-base' am:
abcc43d86a am:
d38615b846 am:
63a79edbe0 -s ours" into oc-dev-plus-aosp
am:
22ac87f20c
Change-Id: I8943df82ccc0f45f5d2b8bfd3c59c68403086744
Jean-Michel Trivi [Sat, 6 May 2017 03:09:15 +0000 (03:09 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev
am:
8e3a8a7027
Change-Id: I724cabd147d86d34dc8b76cbbe083500e9b994f5
Colin Cross [Sat, 6 May 2017 03:05:18 +0000 (03:05 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am:
d308803b82 am:
06a6e81c1d
am:
fb18f4cfed -s ours
Change-Id: I8b61ee0eedd7c0c9b217ab943200db330925bd0e
TreeHugger Robot [Sat, 6 May 2017 03:03:07 +0000 (03:03 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev
Svetoslav Ganov [Sat, 6 May 2017 03:01:19 +0000 (03:01 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev am:
71c999febb
am:
e5d03623e7
Change-Id: If390f389b270c1c35f1ee60c09b2cf5bfecd1df1
Android Build Merger (Role) [Sat, 6 May 2017 02:58:25 +0000 (02:58 +0000)]
Merge "Merge changes from topic 'sms-files-move-opt-to-base' am:
abcc43d86a am:
d38615b846 am:
63a79edbe0 -s ours" into oc-dev-plus-aosp
nharold [Sat, 6 May 2017 02:54:22 +0000 (02:54 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base' am:
abcc43d86a am:
d38615b846
am:
63a79edbe0 -s ours
Change-Id: I601b62fd047d2b446de3d6c67c18bcc0a56316f9
Svetoslav Ganov [Sat, 6 May 2017 02:51:45 +0000 (02:51 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev
am:
71c999febb
Change-Id: I91b9e3bea2335b01c6f0d52500a3b3775c62d163
Svetoslav Ganov [Sat, 6 May 2017 02:41:50 +0000 (02:41 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev
Philip P. Moltmann [Sat, 6 May 2017 02:37:00 +0000 (02:37 +0000)]
Merge "Report less data in structure to autofill provider" into oc-dev am:
d19113b390
am:
889b15b4c2
Change-Id: Id60c55e06e94c3f639703beda9b249dcf0f8bd6c
Jeff Sharkey [Sat, 6 May 2017 02:29:03 +0000 (02:29 +0000)]
Merge "Offer to wait until broadcasts have drained." into oc-dev am:
6f4aab2c01
am:
8c921a8f14
Change-Id: Ia55b3b9666b2683e880e07071b53645ba309a57c
OSDN Git Service
