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

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Guliz Tuncay [Fri, 16 Nov 2018 22:27:49 +0000 (14:27 -0800)]

[automerger skipped] [automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa am: 608d567e43 am: e5322fa084 -s ours
am: 3c53f926f3 -s ours

Change-Id: I441d92faa9cfd4b2d748c05236eda6921b677d7c

commit | commitdiff | tree

Guliz Tuncay [Fri, 16 Nov 2018 22:03:29 +0000 (14:03 -0800)]

[automerger skipped] [automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa am: 608d567e43
am: e5322fa084 -s ours

Change-Id: I42907e9163fc5b58600b2fcd99088f7c49ddbcf0

commit | commitdiff | tree

Guliz Tuncay [Fri, 16 Nov 2018 21:46:12 +0000 (13:46 -0800)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa
am: 608d567e43

Change-Id: I5d09ecdb574e347f5f8c8c86a7f6a8ecb26e42c4

commit | commitdiff | tree

Lorenzo Colitti [Fri, 16 Nov 2018 13:29:38 +0000 (13:29 +0000)]

Merge changes from topic "sort stats" into pi-dev

* changes:
Change types of fields of network stats reported to framework.
Fix negative uid stats caused by 464xlat adjust when eBPF is on.

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:40 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa

Change-Id: I63d8639a52f0be081b397e1bb7813d1e7e4b8aa4

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:32 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad

Change-Id: Iece38d8723b40e22f86f4aa599d42dbf9a2fcbab

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:25 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f

Change-Id: If661d9f3206b0e9da2a98ffb14b0ff38154cd757

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:20 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63

Change-Id: I9541ff6206955ed3479d5b4aa6c78f23304d3165

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:12 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970

Change-Id: I6a0825a14c8b0f38415cccacc315ba84eb88f5b9

commit | commitdiff | tree

Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]

Select only preinstalled Spell Checker Services

When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.

Fixes: 64764051
Bug: 118694079
Test: Manually as follows:
0. Make sure AOSP keyboard is pre-installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0  -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
    -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb reboot
8. adb shell settings get --user 0 secure selected_spell_checker
    -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e

commit | commitdiff | tree

TreeHugger Robot [Tue, 13 Nov 2018 20:54:41 +0000 (20:54 +0000)]

Merge "Hide wallpaper when backdrop arrives" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 13 Nov 2018 19:06:14 +0000 (19:06 +0000)]

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

commit | commitdiff | tree

Bill Yi [Tue, 13 Nov 2018 17:42:16 +0000 (09:42 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie0f23de1ecc1c4ce58b29828989adb080ee0de51

commit | commitdiff | tree

junyulai [Thu, 8 Nov 2018 14:33:09 +0000 (22:33 +0800)]

Change types of fields of network stats reported to framework.

Currently, NetworkStats use int to handle uid, set and tag,
while native side using unsigned int mixing with signed int
with that. This commit make necessary changes in JNI part while
libnetdbpf unifying the types of fields.

Bug: 112226716
Bug: 119193941
Test: 1. manually reconnect vpn
      2. update apps from playstore
      3. atest libnetdbpf_test
      4. runtest frameworks-net
      5. cts-tradefed run cts -m CtsUsageStatsTestCases -t \
              android.app.usage.cts.NetworkUsageStatsTest

Change-Id: I6c27124db8292e2825fba51b8994f013897cb566
Merged-In: I6c27124db8292e2825fba51b8994f013897cb566
(cherry picked from commit bf7803eed8283d5a1caa2efe90aa449590ddb94f)

commit | commitdiff | tree

TreeHugger Robot [Tue, 13 Nov 2018 02:47:41 +0000 (02:47 +0000)]

Merge "Set stealth mode during inflation" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Nov 2018 22:58:23 +0000 (22:58 +0000)]

Merge "Update system server profile" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Nov 2018 22:11:00 +0000 (22:11 +0000)]

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

commit | commitdiff | tree

Bill Yi [Mon, 12 Nov 2018 18:15:23 +0000 (10:15 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic323b33cd07325dbeb6706f8d875537a6e3edcc4

commit | commitdiff | tree

Wesley.CW Wang [Mon, 12 Nov 2018 05:04:02 +0000 (13:04 +0800)]

RESTRICT AUTOMERGE: Disable separated emergency button

Test: Manually
Bug: 119384606
Change-Id: I629dd42751dc80ccd434d66f95eabefc9a8164af

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 16:31:18 +0000 (16:31 +0000)]

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

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 09:19:31 +0000 (01:19 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8c00a67900b443175c57d71b90022a634d670263

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 04:31:19 +0000 (20:31 -0800)]

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev am: bc7da75f87 am: 8c06bfb6a4
am: 77a8b4d7d7

Change-Id: Ia23aef867a97767f9800481cb3747b7ff5ba053d

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 04:23:21 +0000 (20:23 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793 am: c9590c8fc1 -s ours am: 0881f3bb25 -s ours
am: 638e56b43a -s ours

Change-Id: I5551e2b998d6a8fed32309b98ec8dace3066c355

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 04:14:14 +0000 (20:14 -0800)]

Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev am: cff099466e am: 21060a9e0d
am: 72100b44e8

Change-Id: I5ca6d17de7a450265ab534d078e238408fa16f97

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 04:12:56 +0000 (20:12 -0800)]

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev am: bc7da75f87
am: 8c06bfb6a4

Change-Id: Ic8f5a84eac8899a07f504c450a549f6d0a6668d0

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 04:06:21 +0000 (20:06 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807 am: 5e3def3f70 -s ours am: 599b561ff1 -s ours
am: 4aa205acf7 -s ours

Change-Id: Ifb889541c383d0cb413838c1e2097b784564e4f7

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 04:06:18 +0000 (20:06 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793 am: c9590c8fc1 -s ours
am: 0881f3bb25 -s ours

Change-Id: I75c047e0e331d90ff7660f3484ee3d72cdd45cfa

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:55:02 +0000 (19:55 -0800)]

Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev am: cff099466e
am: 21060a9e0d

Change-Id: I404b2530e16205e480bcb3524c8d070700b15961

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:49:37 +0000 (19:49 -0800)]

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev
am: bc7da75f87

Change-Id: Ibdf168a787a6208e78afce6ee311cfd84b198c4b

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:48:37 +0000 (19:48 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807 am: 5e3def3f70 -s ours
am: 599b561ff1 -s ours

Change-Id: I6931f8b42325661d01f6a58c969bb571675038f1

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:47:36 +0000 (19:47 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793
am: c9590c8fc1 -s ours

Change-Id: I8c87d21d8f99ea3a8e9639a56e8acb10712e7366

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:43:45 +0000 (19:43 -0800)]

Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev
am: cff099466e

Change-Id: I173094597612750f9c4645236ddeb972aa5ad7c5

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:41:31 +0000 (19:41 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807
am: 5e3def3f70 -s ours

Change-Id: Iab399a5abfc4c27aac2956e4d048ef491bd64a3e

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793
  [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]

Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]

Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:14:44 +0000 (19:14 -0800)]

Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev am: cfbf7a21c3 am: d2eb52dd7b
am: 8a312ab779

Change-Id: Idba2de531bdd4a6ea3ac3e4831332076f6a3b4da

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:06:49 +0000 (19:06 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a am: 39a2390fb9 -s ours am: 497cb6d257 -s ours
am: adf9725b51 -s ours

Change-Id: I1f4a8f43ecf4ae56131b838379345668b90cdf1e

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 03:05:19 +0000 (19:05 -0800)]

Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am: 8c5514b186 am: fefdff353f
am: bae17b1a99

Change-Id: I1cd543688afefa72d37eea3579b992c33900d862

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:57:20 +0000 (18:57 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4 am: cbaf1505a0 -s ours am: 82f5bd65de -s ours
am: 0a47e3fafe -s ours

Change-Id: Ic5276cb43514d5e9653bfff2fb9402dc281ac4d4

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:52:44 +0000 (18:52 -0800)]

Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev am: cfbf7a21c3
am: d2eb52dd7b

Change-Id: I81c9ccd2c72f1e7df73c45c7f667c5b8b34b0f81

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:46:15 +0000 (18:46 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a am: 39a2390fb9 -s ours
am: 497cb6d257 -s ours

Change-Id: I023423567ab71703b9411c498ef904010d39f04d

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:44:48 +0000 (18:44 -0800)]

Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am: 8c5514b186
am: fefdff353f

Change-Id: Ib2772d84dc02ef1b3ec12e7347528b7c3d601a5f

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:44:33 +0000 (18:44 -0800)]

Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev am: 3fa917c8bc am: 51ec5967af
am: ab66d6295a

Change-Id: I740ca5a23ab06786dc4ac0039c6c52f556f09b2c

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:38:08 +0000 (18:38 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4 am: cbaf1505a0 -s ours
am: 82f5bd65de -s ours

Change-Id: I36df2a13e12e8050327edc47232a501de40357a3

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:36:34 +0000 (18:36 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343 am: 204f727404 -s ours am: 519fa54629 -s ours
am: 5123593cce -s ours

Change-Id: I8fa29c2084d806a005e92e59c612554e67359c31

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:35:07 +0000 (18:35 -0800)]

Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev am: 568344a776 am: 8b1df08930
am: 87a3e6a26a

Change-Id: I2d975bbb67f6ca2379d64112fd5e2c86f3713c4e

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:27:05 +0000 (18:27 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f am: 176758a8cb -s ours am: 1da1b80a9f -s ours
am: 7b409ed9ce -s ours

Change-Id: I05abea995f9e82aed3d0bc780e75b141c3a8ed55

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:20:38 +0000 (18:20 -0800)]

Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev am: 3fa917c8bc
am: 51ec5967af

Change-Id: If8018f95a4a1ce3431d5fd28979056cd5e0f6535

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:19:52 +0000 (18:19 -0800)]

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev am: ef0d8b4472 am: d72f7d1d9e
am: c9bdb75378

Change-Id: Ie6d5f985739a9ff83eb66bb74173cc6d867a06f2

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:15:34 +0000 (18:15 -0800)]

Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev
am: cfbf7a21c3

Change-Id: I26bdbcd48705c30189d55904823cfd03a0fd11dc

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:13:08 +0000 (18:13 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343 am: 204f727404 -s ours
am: 519fa54629 -s ours

Change-Id: I993fdf5434f660d1b91925fd85241b2b49e4fc39

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:13:06 +0000 (18:13 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
am: 39a2390fb9 -s ours

Change-Id: I7ce95669411440d93e113c1f6facd374a9c36241

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:11:36 +0000 (18:11 -0800)]

Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev am: 568344a776
am: 8b1df08930

Change-Id: I9702562624983fc18ffccb5f3b40da55f0f0bb0b

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:10:56 +0000 (18:10 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677 -s ours am: 94c6fa964f -s ours
am: d8749970e3 -s ours

Change-Id: Ia2171161838c168016bb33aa34fba495af640ed6

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:07:06 +0000 (18:07 -0800)]

Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev
am: 8c5514b186

Change-Id: I20cb7234b5b7a48b57af23b71311989978503de9

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:04:59 +0000 (18:04 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
am: cbaf1505a0 -s ours

Change-Id: I362c59a89efba73b45a9a5d81474cac8448c2f84

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:04:52 +0000 (18:04 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f am: 176758a8cb -s ours
am: 1da1b80a9f -s ours

Change-Id: I51dd2717412247842355cfab15242e7b26d8e0ac

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:01:59 +0000 (18:01 -0800)]

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev am: ef0d8b4472
am: d72f7d1d9e

Change-Id: Id74e8948cfb2e7bb2cd94bbb7e7b87315f3b4332

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 02:01:06 +0000 (18:01 -0800)]

Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev
am: 3fa917c8bc

Change-Id: I9b83367bb794f295c81ccfaf7c9ac1f2113c72e4

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:59:03 +0000 (17:59 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
am: 204f727404 -s ours

Change-Id: I3830beca2052ed387304bcdb546aa431627dae1f

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:54:56 +0000 (17:54 -0800)]

Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev
am: 568344a776

Change-Id: If9f7d923e98f33d346ede4bfe3be622f3742ee90

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:54:44 +0000 (17:54 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677 -s ours
am: 94c6fa964f -s ours

Change-Id: Iee603d93a2a105600195663aa7101312f9e6bcc7

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:52:40 +0000 (17:52 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f
am: 176758a8cb -s ours

Change-Id: I83944a6a1e013ba6c0a675637e102949115b4ba0

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:50:47 +0000 (17:50 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 am: 09f4f73afa -s ours am: 5c7f0c40fb -s ours
am: e138bd2c05 -s ours

Change-Id: I61ec524345d81388a8f69e6eea309d1860ce976a

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:49:06 +0000 (17:49 -0800)]

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev
am: ef0d8b4472

Change-Id: Ie4cdce55a83a00f2ceac184cbc858b7fa4deddcb

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:46:47 +0000 (17:46 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
am: 236da59677 -s ours

Change-Id: I8f2cce17bfcec29b146a46343cded42d1afd99de

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:44:42 +0000 (17:44 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 am: 09f4f73afa -s ours
am: 5c7f0c40fb -s ours

Change-Id: Id8896ffc8ac52ac571ce856d657b928b6e385d74

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]

Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
  [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]

Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Bill Yi [Sun, 11 Nov 2018 01:35:57 +0000 (17:35 -0800)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903
am: 09f4f73afa -s ours

Change-Id: Ib2b40d7dd3601e97353a63718bfbc44e5c967ee4

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]

Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
  [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]

Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]

Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
  [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]

Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]

Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f
  [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]

Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:15 +0000 (19:47 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f

Change-Id: I63583ee2589e27644de2fe138fde88d1efd7c4f6

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:09 +0000 (19:47 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed

Change-Id: I58f6aae098f5dcb6c8ecfcaef6427f5276d36324

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 19:46:51 +0000 (11:46 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:53 +0000 (19:40 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903

Change-Id: I80379f2416b5f60734fce3db6b8d74ceca628331

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:44 +0000 (19:40 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2

Change-Id: I17330d6b3d4cf62d89a3413605ceae1b701bb858

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 19:40:18 +0000 (11:40 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:19 +0000 (18:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4

Change-Id: I2bb4251fa00c257d00e4cefa4ddca89fc24ad7f3

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:11 +0000 (18:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9

Change-Id: Id0e2056ac5c7ef52d8d2f844bb3ff5c660e27959

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 18:49:42 +0000 (10:49 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:43:44 +0000 (18:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0

Change-Id: I71ed720b5ec39dc9be62aa13d71f5d06f3bec0e3

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:43:37 +0000 (18:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57

Change-Id: I997246032f47b236724ae93f3fe4e0ba34053d66

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 18:43:10 +0000 (10:43 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:31:16 +0000 (18:31 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a

Change-Id: I717bb8adc24725ee2c219bb322520ec4d6ff3256

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.