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

Merge "Restricted Context layout font loading in TextView" into oc-dev am: 7f90a9fdb0
am: 8f21dc7811

Change-Id: I261f5fbbf233bf332a4e33c38f7a9a379d5ca00c

commit | commitdiff | tree

Svet Ganov [Sun, 30 Apr 2017 06:58:29 +0000 (06:58 +0000)]

Merge "Address API council comments" into oc-dev am: 4c60abc9ae
am: 4ad7cb3347

Change-Id: I676b6f5d97a893c478c2f0e02efa17456c178a17

commit | commitdiff | tree

Clara Bayarri [Sun, 30 Apr 2017 06:55:55 +0000 (06:55 +0000)]

Merge "Restricted Context layout font loading in TextView" into oc-dev
am: 7f90a9fdb0

Change-Id: I32a8e9e627e0b78b22c87b11483e744486e16944

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 06:50:36 +0000 (06:50 +0000)]

Merge "Restricted Context layout font loading in TextView" into oc-dev

commit | commitdiff | tree

Svet Ganov [Sun, 30 Apr 2017 06:49:57 +0000 (06:49 +0000)]

Merge "Address API council comments" into oc-dev
am: 4c60abc9ae

Change-Id: Ibe0d780b116529e285e9dedd4a5f3ef62c54ccd2

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 06:43:07 +0000 (06:43 +0000)]

Merge "Address API council comments" into oc-dev

commit | commitdiff | tree

Sundeep Ghuman [Sun, 30 Apr 2017 05:06:20 +0000 (05:06 +0000)]

Merge "Don't show unset values in AccessPoint toString." into oc-dev am: 606c05396d
am: ce9316e42e

Change-Id: I1f13ad1c8b5d0c126490362fc1421767b67e1057

commit | commitdiff | tree

Sundeep Ghuman [Sun, 30 Apr 2017 04:59:19 +0000 (04:59 +0000)]

Merge "Don't show unset values in AccessPoint toString." into oc-dev
am: 606c05396d

Change-Id: Ie031883b24a4b8342253efaa34e1ec8ecdaa2a04

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 04:53:13 +0000 (04:53 +0000)]

Merge "Don't show unset values in AccessPoint toString." into oc-dev

commit | commitdiff | tree

Erik Kline [Sun, 30 Apr 2017 04:45:50 +0000 (04:45 +0000)]

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev am: d0e65f5ef0
am: bfb23ee118

Change-Id: I84e00f502be7cb5f4609e4bcd61d77c6c90d55d7

commit | commitdiff | tree

Erik Kline [Sun, 30 Apr 2017 04:39:16 +0000 (04:39 +0000)]

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev
am: d0e65f5ef0

Change-Id: I531d5f5964a1212af5842e682bb95d9ee01a6360

commit | commitdiff | tree

TreeHugger Robot [Sun, 30 Apr 2017 04:32:35 +0000 (04:32 +0000)]

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 03:56:35 +0000 (20:56 -0700)]

Import translations. DO NOT MERGE

Change-Id: I1f51ab8497b9244bbade4dacd6647cb6b92413e9
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 03:46:09 +0000 (20:46 -0700)]

Import translations. DO NOT MERGE

Change-Id: I41700b1e734ee444db3d0368f64def55e856093c
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 03:35:55 +0000 (20:35 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ia4c823c422b885e56a8225ab82dab57259892f32
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 03:32:09 +0000 (20:32 -0700)]

Import translations. DO NOT MERGE

Change-Id: I97c3d0b34c8c3e60e9ad291d9f0265d55f92eb79
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 03:28:04 +0000 (20:28 -0700)]

Import translations. DO NOT MERGE

Change-Id: I2d804cb1d7454c9dac81fe6a82e7dd2f78ed06ce
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Sun, 30 Apr 2017 03:21:42 +0000 (20:21 -0700)]

Import translations. DO NOT MERGE

Change-Id: I453fbbd0b1c2bb64f0434efe4329d93497cb1294
Auto-generated-cl: translation import

commit | commitdiff | tree

Ajay Panicker [Sun, 30 Apr 2017 02:09:08 +0000 (02:09 +0000)]

Limit btsnoop file size (3/8)
am: c29bb4a394

Change-Id: Ie40b275a0894da9e84e4296eaaea2d812f08a746

commit | commitdiff | tree

Ajay Panicker [Tue, 18 Apr 2017 03:42:22 +0000 (20:42 -0700)]

Limit btsnoop file size (3/8)

Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.

Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Change-Id: I40d5da4c1b1c9b45908e5790d130f1c5e804c773
(cherry picked from commit 00e82f235cb15d742eb7a25a81f0323b1b6408cf)

commit | commitdiff | tree

Selim Cinek [Sat, 29 Apr 2017 23:20:58 +0000 (23:20 +0000)]

Merge "Fixed an issue where notifications wouldn't have a channel" into oc-dev am: 34c226d602
am: 274e7068f9

Change-Id: Ib753b05c842f9d78f1fafb34a7881db6ae40e4c7

commit | commitdiff | tree

Selim Cinek [Sat, 29 Apr 2017 23:14:26 +0000 (23:14 +0000)]

Merge "Fixed an issue where notifications wouldn't have a channel" into oc-dev
am: 34c226d602

Change-Id: I188cf60bc893aa14869a84f5e699298faaf61469

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 23:09:36 +0000 (23:09 +0000)]

Merge "Fixed an issue where notifications wouldn't have a channel" into oc-dev

commit | commitdiff | tree

Winson Chung [Sat, 29 Apr 2017 22:55:22 +0000 (22:55 +0000)]

Merge "Fixing test due to null PiP default bounds." into oc-dev am: 0152fd3686
am: 592d25dd3e

Change-Id: I5dd0eecec624c18d671a94b54f36b89bd008a6d5

commit | commitdiff | tree

Yipeng Cao [Sat, 29 Apr 2017 22:49:26 +0000 (22:49 +0000)]

Merge "Fixed the hasCarrierFrequency flag in GnssStatus (part1)" into oc-dev am: 80e1b2fc56
am: d78417d6cc

Change-Id: I804d261ffe382ea283fdbbd0e3973810a723315e

commit | commitdiff | tree

Winson Chung [Sat, 29 Apr 2017 22:44:51 +0000 (22:44 +0000)]

Merge "Fixing test due to null PiP default bounds." into oc-dev
am: 0152fd3686

Change-Id: Id14fa9d368f1c121f36ab3b20f0183a8cc5a8934

commit | commitdiff | tree

Yipeng Cao [Sat, 29 Apr 2017 22:42:25 +0000 (22:42 +0000)]

Merge "Fixed the hasCarrierFrequency flag in GnssStatus (part1)" into oc-dev
am: 80e1b2fc56

Change-Id: I9cff443fbb5009d3bb20d9050cd5980dc7c0b17f

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 22:36:56 +0000 (22:36 +0000)]

Merge "Fixing test due to null PiP default bounds." into oc-dev

commit | commitdiff | tree

Yipeng Cao [Sat, 29 Apr 2017 22:34:55 +0000 (22:34 +0000)]

Merge "Fixed the hasCarrierFrequency flag in GnssStatus (part1)" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 22:09:14 +0000 (22:09 +0000)]

Merge "AOD: Hold WakeLocks 100ms beyond release"

commit | commitdiff | tree

Adam Lesinski [Sat, 29 Apr 2017 21:50:50 +0000 (21:50 +0000)]

Merge "AAPT2: binary parser should be more lenient with files" into oc-dev am: 557a0c50a0
am: 7ed9a3b3ad

Change-Id: Ic64fb3a0f4a1e1f9bead421012d91e004f91b78e

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 21:47:12 +0000 (21:47 +0000)]

Merge "Use invalid package names for special keys in AccountManager."

commit | commitdiff | tree

Adam Lesinski [Sat, 29 Apr 2017 21:44:54 +0000 (21:44 +0000)]

Merge "AAPT2: binary parser should be more lenient with files" into oc-dev
am: 557a0c50a0

Change-Id: Ief1b27016f7a8555611d1c828d1e71722370ce92

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 21:39:26 +0000 (21:39 +0000)]

Merge "AAPT2: binary parser should be more lenient with files" into oc-dev

commit | commitdiff | tree

Adam Lesinski [Sat, 29 Apr 2017 21:14:17 +0000 (21:14 +0000)]

Merge "AAPT2: Fix string escaping" into oc-dev am: f6bc1402ed
am: 349b647b75

Change-Id: I2208380a8dbeb7df11790ebd05823f46616d2d06

commit | commitdiff | tree

Adam Lesinski [Sat, 29 Apr 2017 21:08:47 +0000 (21:08 +0000)]

Merge "AAPT2: Fix string escaping" into oc-dev
am: f6bc1402ed

Change-Id: I31f0c21dcf391384759e71112957ccdc281965d3

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 21:04:34 +0000 (21:04 +0000)]

Merge "AAPT2: Fix string escaping" into oc-dev

commit | commitdiff | tree

Adam Lesinski [Sat, 29 Apr 2017 20:50:20 +0000 (20:50 +0000)]

Merge changes I446fb6ab,Ife3bbd29 into oc-dev am: 53c9898e79
am: 66534ef01c

Change-Id: I62d31b0d933a2f06b5a97f16447d7500b7fe71d1

commit | commitdiff | tree

Adam Lesinski [Sat, 29 Apr 2017 20:44:17 +0000 (20:44 +0000)]

Merge changes I446fb6ab,Ife3bbd29 into oc-dev
am: 53c9898e79

Change-Id: Ie8ae301856c5734eef2fc919116944ef2e741aa9

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 20:38:15 +0000 (20:38 +0000)]

Merge changes I446fb6ab,Ife3bbd29 into oc-dev

* changes:
Valid resource IDs may be negative
AAPT2: Workaround for findViewById with package ID > 0x7f

commit | commitdiff | tree

Esteban Talavera [Sat, 29 Apr 2017 20:05:48 +0000 (20:05 +0000)]

Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev am: 5bb8294f92
am: 936a32b455

Change-Id: I4762207a20f5c047ceabad659b88c63761c457d0

commit | commitdiff | tree

Esteban Talavera [Sat, 29 Apr 2017 19:55:13 +0000 (19:55 +0000)]

Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev
am: 5bb8294f92

Change-Id: I78a9d01c4e91cfbf8d6703d1c2c15590d0d72fa4

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 19:49:31 +0000 (19:49 +0000)]

Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev

commit | commitdiff | tree

Bill Yi [Sat, 29 Apr 2017 19:17:11 +0000 (19:17 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: d95344d8aa -s ours
am: 5a4a417a66 -s ours

Change-Id: I1a92dc5898143cfeee830c77905bdc91fd05f1ac

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 19:15:35 +0000 (19:15 +0000)]

Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev am: e14159d2c5
am: 4be5c41542

Change-Id: I4b505c1cd61d92d1a4aca4efd5760506379c1f86

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 19:12:39 +0000 (19:12 +0000)]

Merge "Experimental features only on debuggable builds." into oc-dev am: d9f6946c42
am: 8e19424e6f

Change-Id: Ia4a2dc323116ae44bb906d77ba4809845247c65d

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 19:10:35 +0000 (19:10 +0000)]

Merge "API fixes for Companion renaming" into oc-dev am: 0a482bda21
am: b5a5033224

Change-Id: I61dd4d6134d5d2a8fb2af924dfabe93ecd961a3f

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 19:07:05 +0000 (19:07 +0000)]

Merge "Merge commit '2aaa8a6ad5ab9f36075c642bd41bfaf5f43fa0a7' into dec10"

commit | commitdiff | tree

Bill Yi [Sat, 29 Apr 2017 18:22:29 +0000 (18:22 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: d95344d8aa -s ours

Change-Id: I0b97a8efe7a09d1b37d756a43efa4af083120d67

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 18:14:53 +0000 (18:14 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 17:58:45 +0000 (17:58 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:48:28 +0000 (17:48 +0000)]

Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev
am: e14159d2c5

Change-Id: Ia51f9f817a7792c5b4e63ad5af532ebd59cff95f

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:42:42 +0000 (17:42 +0000)]

Merge "Experimental features only on debuggable builds." into oc-dev
am: d9f6946c42

Change-Id: I3d6228116545661eb30d997d8f7137f168adc79e

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:38:53 +0000 (17:38 +0000)]

Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:33:54 +0000 (17:33 +0000)]

Merge "Experimental features only on debuggable builds." into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:32:50 +0000 (11:32 -0600)]

Merge commit '2aaa8a6ad5ab9f36075c642bd41bfaf5f43fa0a7' into dec10

Change-Id: I7940f41fe5906377f357a6cd711fa3e1660ebef1

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:22:04 +0000 (17:22 +0000)]

Merge "API fixes for Companion renaming" into oc-dev
am: 0a482bda21

Change-Id: Ieae01b365a956afb48531a16adf3051e1624255d

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:15:12 +0000 (17:15 +0000)]

Merge "Rename Companion permissions" into oc-dev
am: 48c0dc6c4b

Change-Id: Ia52e6c6347969612dc1d4baf036fd696ac568c58

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:11:35 +0000 (17:11 +0000)]

Merge "API fixes for Companion renaming" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 17:04:42 +0000 (17:04 +0000)]

Merge "Rename Companion permissions" into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 16:53:35 +0000 (16:53 +0000)]

Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev am: 408ec0b463
am: 11188aee8a

Change-Id: I49be72bd46caf9d3a9e71fb68326ade9ffd5826f

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 16:44:11 +0000 (16:44 +0000)]

Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev
am: 408ec0b463

Change-Id: I9d013dec3bffac03ddebbd5689f20f94d5d5f96d

commit | commitdiff | tree

Jeff Sharkey [Sat, 29 Apr 2017 16:39:32 +0000 (16:39 +0000)]

Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev

commit | commitdiff | tree

Makoto Onuki [Sat, 29 Apr 2017 16:31:34 +0000 (16:31 +0000)]

Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev am: 1f1d372524
am: 6bd5e862e0

Change-Id: I0e8e25da9f3a6bc73bc9954a3ea0379a71c8bbe6

commit | commitdiff | tree

Makoto Onuki [Sat, 29 Apr 2017 16:25:22 +0000 (16:25 +0000)]

Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev
am: 1f1d372524

Change-Id: Ide5cfde6d0f8982c0fa51f6f8e10f1ce7a65389e

commit | commitdiff | tree

Makoto Onuki [Sat, 29 Apr 2017 16:19:39 +0000 (16:19 +0000)]

Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev

commit | commitdiff | tree

Phil Weaver [Sat, 29 Apr 2017 16:12:30 +0000 (16:12 +0000)]

Merge "A11y changes for API council" into oc-dev am: 060f0f0341
am: 3ed7b9e257

Change-Id: I9365af91fa88239b95c602806e04c86b548e5b2e

commit | commitdiff | tree

Phil Weaver [Sat, 29 Apr 2017 16:02:19 +0000 (16:02 +0000)]

Merge "A11y changes for API council" into oc-dev
am: 060f0f0341

Change-Id: I01903d823b11d558f415c2a15baa2cf69cbfdeda

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 15:54:21 +0000 (15:54 +0000)]

Merge "A11y changes for API council" into oc-dev

commit | commitdiff | tree

Julia Reynolds [Sat, 29 Apr 2017 14:31:25 +0000 (14:31 +0000)]

Merge "Autogrouped summaries should be muted" into oc-dev am: e97fae5110
am: c6282f0405

Change-Id: I82870d4e77bb894c5a1c8afe710fa49e916dfa2d

commit | commitdiff | tree

Julia Reynolds [Sat, 29 Apr 2017 14:23:20 +0000 (14:23 +0000)]

Merge "Autogrouped summaries should be muted" into oc-dev
am: e97fae5110

Change-Id: I0f0ecdef0083d9bba0527f1d13510f15bdd30c1b

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 14:15:22 +0000 (14:15 +0000)]

Merge "Autogrouped summaries should be muted" into oc-dev

commit | commitdiff | tree

Erik Kline [Sat, 29 Apr 2017 07:54:59 +0000 (07:54 +0000)]

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" am: 169681db26 am: b663a7d6d7 am: b6ec8ed691
am: a805bfc4ca

Change-Id: Ib68e2d099cd98c60429dac7d196f2f023849c6cc

commit | commitdiff | tree

Erik Kline [Sat, 29 Apr 2017 07:50:31 +0000 (07:50 +0000)]

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" am: 169681db26 am: b663a7d6d7
am: b6ec8ed691

Change-Id: If6c7225e853e1969022d9b9d6cee127c477e0df7

commit | commitdiff | tree

Erik Kline [Sat, 29 Apr 2017 07:46:00 +0000 (07:46 +0000)]

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" am: 169681db26
am: b663a7d6d7

Change-Id: I64d3251de665cead6b0067728574b367698619d2

commit | commitdiff | tree

Erik Kline [Sat, 29 Apr 2017 07:39:58 +0000 (07:39 +0000)]

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"
am: 169681db26

Change-Id: Ifd9e1c3645c2fa7c6671991edf52d1deb63d9d1c

commit | commitdiff | tree

Erik Kline [Sat, 29 Apr 2017 07:33:34 +0000 (07:33 +0000)]

Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"

commit | commitdiff | tree

Wale Ogunwale [Sat, 29 Apr 2017 07:14:56 +0000 (07:14 +0000)]

Merge "Don't try to create user for task snapshot tests" into oc-dev am: ef1648c2cd
am: 4cd2bae157

Change-Id: I5843e9609e2c09d170207ac8bced0f3f334ae5ba

commit | commitdiff | tree

Wale Ogunwale [Sat, 29 Apr 2017 07:08:57 +0000 (07:08 +0000)]

Merge "Don't try to create user for task snapshot tests" into oc-dev
am: ef1648c2cd

Change-Id: I4e39fbec806a0e5080dcbcc2902b3ec880f78d1e

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 07:03:50 +0000 (07:03 +0000)]

Merge "Don't try to create user for task snapshot tests" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Sat, 29 Apr 2017 06:49:22 +0000 (06:49 +0000)]

Merge "Reduce min height for two target prefs to match spec."

commit | commitdiff | tree

Jakub Pawlowski [Sat, 29 Apr 2017 06:22:55 +0000 (06:22 +0000)]

Merge "Bluetooth: bluetooth.le API fixes" into oc-dev am: 62c36e1c17
am: 1e83aa2617

Change-Id: I9b425fc6777d9f1bdf5b8b2bf61ab67d932bfa2a

commit | commitdiff | tree

Jakub Pawlowski [Sat, 29 Apr 2017 06:17:20 +0000 (06:17 +0000)]

Merge "Bluetooth: bluetooth.le API fixes" into oc-dev
am: 62c36e1c17

Change-Id: Ie480ec7cdb89e81953d635b155b3c6f54cc89c40

commit | commitdiff | tree

Jakub Pawlowski [Sat, 29 Apr 2017 06:11:34 +0000 (06:11 +0000)]

Merge "Bluetooth: bluetooth.le API fixes" into oc-dev

commit | commitdiff | tree

Erik Kline [Sat, 29 Apr 2017 04:20:04 +0000 (13:20 +0900)]

Use ConnectivityService's NETWORK_STACK permission for SoftAp operations

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 37647880
Bug: 37750597
Change-Id: I4fb603b7491013bc13b0c08a785eae6cd37337b9
(cherry picked from commit 256be78f7d00c619cca9ed5a550b04fabd4cc48e)

commit | commitdiff | tree

Erik Kline [Sat, 29 Apr 2017 04:20:04 +0000 (13:20 +0900)]

commit | commitdiff | tree

Philip P. Moltmann [Sat, 29 Apr 2017 05:43:45 +0000 (05:43 +0000)]

Merge "Make autofilled highlight an attribute" into oc-dev am: c7bd554d06
am: 5732faa336

Change-Id: Ib4ed809cd2aadb385cbb5bce7de18fcb4d1563ca

commit | commitdiff | tree

Makoto Onuki [Sat, 29 Apr 2017 05:40:13 +0000 (05:40 +0000)]

Merge "Make sure to update oom-adjustment when a service starts." into oc-dev am: ee818db6b2
am: 737e460420

Change-Id: I60d7290832689d38e49d1948d1c99a38ef09b381

commit | commitdiff | tree

Philip P. Moltmann [Sat, 29 Apr 2017 05:32:32 +0000 (05:32 +0000)]

Merge "Add constant for autofill-service-add URL" into oc-dev am: 09d8db0381
am: b29e0906f9

Change-Id: I163d68c15984cf43aa07371a7ee07ee6e662c346

commit | commitdiff | tree

Philip P. Moltmann [Sat, 29 Apr 2017 05:32:12 +0000 (05:32 +0000)]

Merge "Make autofilled highlight an attribute" into oc-dev
am: c7bd554d06

Change-Id: I8a35929069510a1483a734febb695a6f06af88a2

commit | commitdiff | tree

Makoto Onuki [Sat, 29 Apr 2017 05:27:14 +0000 (05:27 +0000)]

Merge "Make sure to update oom-adjustment when a service starts." into oc-dev
am: ee818db6b2

Change-Id: I99197f11f9cbab9b32b481fede9b747f9504b7fd

commit | commitdiff | tree

Philip P. Moltmann [Sat, 29 Apr 2017 05:24:03 +0000 (05:24 +0000)]

Merge "Add constant for autofill-service-add URL" into oc-dev
am: 09d8db0381

Change-Id: Icddb1688c646732f2bb1739d54cd480d4465996b

commit | commitdiff | tree

Philip P. Moltmann [Sat, 29 Apr 2017 05:16:34 +0000 (05:16 +0000)]

Merge "Make autofilled highlight an attribute" into oc-dev

commit | commitdiff | tree

Makoto Onuki [Sat, 29 Apr 2017 05:15:39 +0000 (05:15 +0000)]