OSDN Git Service
Seigo Nonaka [Thu, 13 Jul 2017 20:34:00 +0000 (13:34 -0700)]
Support font resource in TextAppearanceSpan
To be able to parcel/unparcel Typeface, keep it in static context.
Bug:
62850669
Test: Manually done
Test: bit CtsTextTestCases:android.text.style.cts.TextAppearanceSpanTest
Change-Id: I408cd33b98d8bb13776560231d1eeaac0a7c6bf8
Conrad Chen [Thu, 20 Jul 2017 17:40:30 +0000 (17:40 +0000)]
Merge "Media API: Using context's classloader in MediaBrowser"
TreeHugger Robot [Thu, 20 Jul 2017 17:07:29 +0000 (17:07 +0000)]
Merge "Fix xml loading for managed services"
John Reck [Thu, 20 Jul 2017 16:59:14 +0000 (16:59 +0000)]
Merge "Delete all ro.hwui.* props"
Adrian Roos [Thu, 20 Jul 2017 16:55:23 +0000 (16:55 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev am:
29119b6f5f am:
21929b83ac
am:
f3c5c21dab
Change-Id: I83ffc138f2e43822f6310758c1a7e19a73e5cee3
Geoffrey Pitsch [Thu, 20 Jul 2017 16:54:00 +0000 (16:54 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev am:
67c483fd12 am:
ea53021e18
am:
bede55c73d
Change-Id: I14625e5bb32c0d78e806ca948d0c34e56b940f89
Geoffrey Pitsch [Thu, 20 Jul 2017 16:52:46 +0000 (16:52 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev am:
3ca605e28c am:
4158c7a215 -s ours
am:
35a77b877f
Change-Id: Ieffb8352c2c0227ad8e33f865135126140db1e54
Adrian Roos [Thu, 20 Jul 2017 16:46:00 +0000 (16:46 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev am:
29119b6f5f
am:
21929b83ac
Change-Id: I3a6c265dedfd33c0706bcad9ed12d3a2b9e3ba1d
Geoffrey Pitsch [Thu, 20 Jul 2017 16:44:41 +0000 (16:44 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev am:
67c483fd12
am:
ea53021e18
Change-Id: I57f7795c24c101c3f55911ef42344daa926c7aff
Geoffrey Pitsch [Thu, 20 Jul 2017 16:43:17 +0000 (16:43 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev am:
3ca605e28c
am:
4158c7a215 -s ours
Change-Id: I97fb6e08e7047aeb2c10d02627e0f389b621dd93
Adrian Roos [Thu, 20 Jul 2017 16:26:14 +0000 (16:26 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev am:
29119b6f5f am:
747938ed61
am:
273e2a9e7a
Change-Id: I589833c02092c9c34250c2ea59ddd55e50167b59
Adrian Roos [Thu, 20 Jul 2017 16:18:38 +0000 (16:18 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev am:
29119b6f5f
am:
747938ed61
Change-Id: I42fa84171dbc77d973365040e026b7962e116475
Adrian Roos [Thu, 20 Jul 2017 16:12:21 +0000 (16:12 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
am:
29119b6f5f
Change-Id: I5deca2c8224d629eadc18a7f7742c6f8d43b133d
Geoffrey Pitsch [Thu, 20 Jul 2017 16:12:15 +0000 (16:12 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev am:
67c483fd12 am:
fef6d5cad6
am:
bc35e6ae58
Change-Id: I404027727e301d0b74c24c07769d100072c35e3b
Adrian Roos [Thu, 20 Jul 2017 16:12:11 +0000 (16:12 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
am:
29119b6f5f
Change-Id: I71d3235402fd23ea82542bbb0957a7516ef77a66
Geoffrey Pitsch [Thu, 20 Jul 2017 16:05:05 +0000 (16:05 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev am:
67c483fd12
am:
fef6d5cad6
Change-Id: I5ff20066ac0133923784154bcbf90c723f8bbc6b
Geoffrey Pitsch [Thu, 20 Jul 2017 16:05:04 +0000 (16:05 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev am:
3ca605e28c -s ours am:
b2541cdfa6
am:
85cd5e9011
Change-Id: Icda56462183717e74faf562efc561856909736a0
Adrian Roos [Thu, 20 Jul 2017 16:02:55 +0000 (16:02 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
Geoffrey Pitsch [Thu, 20 Jul 2017 15:58:15 +0000 (15:58 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev
am:
67c483fd12
Change-Id: I59bc4ac9f712da83df2ff31bc083f408949f727e
Geoffrey Pitsch [Thu, 20 Jul 2017 15:58:13 +0000 (15:58 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev
am:
67c483fd12
Change-Id: I0fd17dfaf70d07bf932b01d712e9cc94bf077660
Geoffrey Pitsch [Thu, 20 Jul 2017 15:58:06 +0000 (15:58 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev am:
3ca605e28c -s ours
am:
b2541cdfa6
Change-Id: I48675a66413664afef96451d4c2f0316ae91fe19
TreeHugger Robot [Thu, 20 Jul 2017 15:52:35 +0000 (15:52 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 15:52:01 +0000 (15:52 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev am:
6c5ce43b39 am:
1308367fd1
am:
a0227a5c49
Change-Id: I9ee55a65e44ff8485d292f7e00cc0b03a6e31a48
Geoffrey Pitsch [Thu, 20 Jul 2017 15:51:40 +0000 (15:51 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
am:
3ca605e28c -s ours
Change-Id: Iacd4376b1e1f665fb72ca6e4fd7b8cabff88dc7c
Android Build Merger (Role) [Thu, 20 Jul 2017 15:48:53 +0000 (15:48 +0000)]
Merge "Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev am:
6c5ce43b39 am:
6dfd8aa791 am:
aecf6d7791"
Andrii Kulian [Thu, 20 Jul 2017 15:48:26 +0000 (15:48 +0000)]
Merge changes from topic 'activity_view_v2'
* changes:
VirtualDisplay wrapper with input forwarding
ActivityView be gone!
Adrian Roos [Thu, 20 Jul 2017 15:48:06 +0000 (15:48 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev am:
6c5ce43b39 am:
6dfd8aa791
am:
aecf6d7791
Change-Id: I2d42093a1f129a4de1d537490cddfbe6ade8ca86
Adrian Roos [Thu, 20 Jul 2017 15:44:41 +0000 (15:44 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev am:
6c5ce43b39
am:
1308367fd1
Change-Id: I44e6610b137fbe4b13a980b15517b6303de51077
Geoffrey Pitsch [Thu, 20 Jul 2017 15:41:14 +0000 (15:41 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
am:
3ca605e28c
Change-Id: Ic4e1a653f38cf9e93f8262e55865a907dfbd2c83
Adrian Roos [Thu, 20 Jul 2017 15:41:09 +0000 (15:41 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev am:
6c5ce43b39
am:
6dfd8aa791
Change-Id: Ib04c87888bf7979f9c81ac730364307348676223
Adrian Roos [Thu, 20 Jul 2017 15:38:06 +0000 (15:38 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev
am:
6c5ce43b39
Change-Id: I8bf76bd42a41055ec7e7b9352dce5577a381540c
Adrian Roos [Thu, 20 Jul 2017 15:35:04 +0000 (15:35 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev
am:
6c5ce43b39
Change-Id: I50047721cfdc25cba10e0af1545b8f7ec0e4e2e2
Geoffrey Pitsch [Thu, 20 Jul 2017 15:33:41 +0000 (15:33 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
Julia Reynolds [Tue, 11 Jul 2017 14:39:58 +0000 (10:39 -0400)]
Fix xml loading for managed services
Noticed while adding a shell cmd to toggle notification assistants,
which is also included
Test: runtest systemui-notification
Change-Id: I9bc0ee857abb8b9f60ab18ad740ca0a3b7d754ff
TreeHugger Robot [Thu, 20 Jul 2017 15:28:05 +0000 (15:28 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev
Siyamed Sinir [Thu, 20 Jul 2017 15:26:51 +0000 (15:26 +0000)]
Merge "Update TextView ApiDoc for lineSpacing attributes"
Philip P. Moltmann [Thu, 20 Jul 2017 14:58:53 +0000 (14:58 +0000)]
Merge "Better translatable msgs for permission requests"
Benjamin Miller [Thu, 20 Jul 2017 14:38:53 +0000 (14:38 +0000)]
Merge "Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
9051bbf2cb am:
9ffdf2bc56" into oc-mr1-dev-plus-aosp
am:
90b9375ad4
Change-Id: I5579aaded77c4d47a07c1d3b56475b5d541972d7
Benjamin Miller [Thu, 20 Jul 2017 14:36:37 +0000 (14:36 +0000)]
Merge "Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
aeb503f7ca am:
97c8fea260" into oc-mr1-dev-plus-aosp
am:
107b4caff4
Change-Id: I148605573735ad130743e3082965a01aa459d01d
Benjamin Miller [Thu, 20 Jul 2017 14:35:08 +0000 (14:35 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
aeb503f7ca am:
ca4f0f98a2
am:
0215fad22c
Change-Id: I550c8da5e102f8103773edf3d671df255d4689a8
Adrian Roos [Thu, 20 Jul 2017 14:29:17 +0000 (14:29 +0000)]
Merge changes from topic 'am-
993c43530b0f4dacbb88b40a1b1760de' into oc-mr1-dev-plus-aosp
am:
836b9d1c7a
Change-Id: Ifad5e11ca05f2c6d53be99871d8b40ad1b791638
Adrian Roos [Thu, 20 Jul 2017 14:27:02 +0000 (14:27 +0000)]
Keyguard: only show after screen fully turned off am:
4757c8ccf8 am:
7f0c9be1cc
am:
67be3b034a
Change-Id: I2849184727c193b42c6e42a13cbb64973f8bc2f0
Adrian Roos [Thu, 20 Jul 2017 14:25:56 +0000 (14:25 +0000)]
StatusBar: Switch status bar to using the new lifecycles am:
731d4dfe60 am:
a91fb78a05
am:
7e9fae4d7a
Change-Id: Ia65746b6e8c3943e5ca96b2e87cecd33534651fa
Android Build Merger (Role) [Thu, 20 Jul 2017 14:22:36 +0000 (14:22 +0000)]
Merge "Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
9051bbf2cb am:
9ffdf2bc56" into oc-mr1-dev-plus-aosp
Benjamin Miller [Thu, 20 Jul 2017 14:21:14 +0000 (14:21 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
9051bbf2cb
am:
9ffdf2bc56
Change-Id: Iff44c7d7d6fa2adca84fcbca5ed14f9c92f784a2
Android Build Merger (Role) [Thu, 20 Jul 2017 14:20:35 +0000 (14:20 +0000)]
Merge "Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
aeb503f7ca am:
97c8fea260" into oc-mr1-dev-plus-aosp
Benjamin Miller [Thu, 20 Jul 2017 14:19:18 +0000 (14:19 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
aeb503f7ca
am:
97c8fea260
Change-Id: I8b8d9dca22fe021480a5c7f78555e55e9a0ce84b
Benjamin Miller [Thu, 20 Jul 2017 14:18:05 +0000 (14:18 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
aeb503f7ca
am:
ca4f0f98a2
Change-Id: I0be1fae85526b21dfafd14971035eb33af765da3
Android Build Merger (Role) [Thu, 20 Jul 2017 14:15:59 +0000 (14:15 +0000)]
Merge changes from topic 'am-
993c43530b0f4dacbb88b40a1b1760de' into oc-mr1-dev-plus-aosp
* changes:
Keyguard: only show after screen fully turned off am:
4757c8ccf8 am:
793e0eea6a
StatusBar: Switch status bar to using the new lifecycles am:
731d4dfe60 am:
be0f74979d
Clara Bayarri [Thu, 20 Jul 2017 14:15:30 +0000 (14:15 +0000)]
Merge "Make up/down movement of multilength lines remember position"
Adrian Roos [Thu, 20 Jul 2017 14:14:11 +0000 (14:14 +0000)]
Keyguard: only show after screen fully turned off am:
4757c8ccf8
am:
793e0eea6a
Change-Id: I6ba824429f752810730a715ceec03f0f68514af2
Adrian Roos [Thu, 20 Jul 2017 14:13:23 +0000 (14:13 +0000)]
Keyguard: only show after screen fully turned off am:
4757c8ccf8
am:
7f0c9be1cc
Change-Id: Id880b68be856501aab777f3613070c3d078f117b
Benjamin Miller [Thu, 20 Jul 2017 14:13:15 +0000 (14:13 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4
am:
9051bbf2cb
Change-Id: Ic770c60fc7407eae99e62e205a2ec55bac5a6980
Adrian Roos [Thu, 20 Jul 2017 14:13:14 +0000 (14:13 +0000)]
StatusBar: Switch status bar to using the new lifecycles am:
731d4dfe60
am:
be0f74979d
Change-Id: Icb0abf102d9a6f8ebc43e100d8f6ae7f879b5288
Adrian Roos [Thu, 20 Jul 2017 14:12:03 +0000 (14:12 +0000)]
StatusBar: Switch status bar to using the new lifecycles am:
731d4dfe60
am:
a91fb78a05
Change-Id: I1d665855a25b8da8093a213bbcea533652a853f8
Benjamin Miller [Thu, 20 Jul 2017 14:09:07 +0000 (14:09 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4
am:
aeb503f7ca
Change-Id: Iff0d3dbea379e2e90a2cf7fc82675eac2c088e11
Benjamin Miller [Thu, 20 Jul 2017 14:09:05 +0000 (14:09 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4
am:
aeb503f7ca
Change-Id: Id8a0ef9ecb0c4464da69a34f1d8a1fc2a1d41448
Benjamin Miller [Thu, 20 Jul 2017 14:05:31 +0000 (14:05 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
am:
baa85250d4
Change-Id: I553b5b775cbdb42020405dfcc1b18032d4777597
Benjamin Miller [Thu, 20 Jul 2017 14:05:31 +0000 (14:05 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
am:
baa85250d4
Change-Id: I9406e059aab1991209a234b6c4aa8767c25cda95
Adrian Roos [Thu, 20 Jul 2017 14:03:00 +0000 (14:03 +0000)]
Keyguard: only show after screen fully turned off
am:
4757c8ccf8
Change-Id: Iadb07f0e33b1de9d266a9cd91d606a72e94de704
Adrian Roos [Thu, 20 Jul 2017 14:02:54 +0000 (14:02 +0000)]
Keyguard: only show after screen fully turned off
am:
4757c8ccf8
Change-Id: Iceb62f7c112afec4ac65c4e283a395b8c8fa31da
Adrian Roos [Thu, 20 Jul 2017 14:02:05 +0000 (14:02 +0000)]
StatusBar: Switch status bar to using the new lifecycles
am:
731d4dfe60
Change-Id: Iad1cea70608c9b2a48bd5e6308ad2e135dc0f720
Adrian Roos [Thu, 20 Jul 2017 14:02:01 +0000 (14:02 +0000)]
StatusBar: Switch status bar to using the new lifecycles
am:
731d4dfe60
Change-Id: I787e486dbf3f0226d9eb96fec5d1162c4c984892
Benjamin Miller [Thu, 20 Jul 2017 13:58:15 +0000 (13:58 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
Adrian Roos [Wed, 19 Jul 2017 10:25:34 +0000 (12:25 +0200)]
AOD: Prevent animations and rotations while going to sleep
A recent change allowed animations while the screen is
turning on, but not fully turned on; this allows rotations
while the device is going to sleep though. To prevent that,
we now disallow animations if the device is going to sleep too.
In addition, we also prevent the rotation animation when the screen
is not fully on or non-interactive.
Change-Id: I9b84f68a02a07067e48b11c008bcaf4bcb7c41a0
Fixes:
63760853
Test: Turn phone to landscape on an app that can rotate. Press power button. Verify AOD shows without a rotation; go/wm-smoke
Adrian Roos [Thu, 20 Jul 2017 13:14:25 +0000 (15:14 +0200)]
AOD: Hide owner info on ambient display
Change-Id: Iea27b111b4025e2ad4b9cd0139f18f1653ca17dc
Fixes:
63800919
Test: Set a dark wallpaper, set owner info; go to AOD, verify that owner info is not visible.
Adrian Roos [Thu, 20 Jul 2017 11:52:36 +0000 (11:52 +0000)]
Merge "Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12 am:
41234fdc6c" into oc-mr1-dev-plus-aosp
am:
5d39df803d
Change-Id: Ie11d9ffac98f97b5a36934eb6d075e3e5c84c723
Adrian Roos [Thu, 20 Jul 2017 11:43:12 +0000 (11:43 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12 am:
520caf4a75
am:
90e78fd304
Change-Id: Ibd11cf8c7c84ebec034760f8e0fc44324617b9ee
Adrian Roos [Tue, 18 Jul 2017 13:50:41 +0000 (15:50 +0200)]
Keyguard: only show after screen fully turned off
Fixes an issue where the keyguard was displayed before the screen
was turned off fully, causing the AOD screen to briefly show during
the screen off animation.
Change-Id: Idc4621995bd67c1db255fab5a8de60d3aeef5d18
Fixes:
63526727
Test: Turn screen off. Make sure the AOD clock is not visible
Adrian Roos [Tue, 18 Jul 2017 13:10:39 +0000 (15:10 +0200)]
StatusBar: Switch status bar to using the new lifecycles
Also removes some now unneeded cruft from StatusBarKeyguardViewManager.
Bug:
62446740
Test: Try unlocking phone with fingerprint and regularly from all kinds of states (AOD1, AOD2, non-AOD ambient display)
Change-Id: I3560615ce77f0c2ad9944832baaa568c300af9bb
Android Build Merger (Role) [Thu, 20 Jul 2017 11:38:29 +0000 (11:38 +0000)]
Merge "Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12 am:
41234fdc6c" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 20 Jul 2017 11:36:00 +0000 (11:36 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12
am:
520caf4a75
Change-Id: I1dd6043af695b882612d17d8bbd7ca8195c960d4
Adrian Roos [Thu, 20 Jul 2017 11:36:00 +0000 (11:36 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12
am:
41234fdc6c
Change-Id: I65b7d753348403be479a556e6b0d201ea363a982
Adrian Roos [Thu, 20 Jul 2017 11:29:59 +0000 (11:29 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
am:
d3878b5e12
Change-Id: I11ddc51a8c71d22b5420def8a4c0f3f57954a081
Adrian Roos [Thu, 20 Jul 2017 11:29:58 +0000 (11:29 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
am:
d3878b5e12
Change-Id: Ibe7749ee616295426cdeae07deb9dc998c49e8e2
Adrian Roos [Thu, 20 Jul 2017 11:22:39 +0000 (11:22 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 10:44:42 +0000 (10:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
57c60d3b8c -s ours am:
3c7e41a6e9 -s ours
am:
fc337a7e29 -s ours
Change-Id: I32ad0f00121cbc01f976ebbb9b596757f044e951
Bill Yi [Thu, 20 Jul 2017 10:38:10 +0000 (10:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
57c60d3b8c -s ours
am:
3c7e41a6e9 -s ours
Change-Id: I2076be4bf62ef1b354e5e30ff001a80404ecc127
Bill Yi [Thu, 20 Jul 2017 10:38:10 +0000 (10:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
57c60d3b8c -s ours am:
ac2abee039 -s ours
am:
6a33a2a6d8 -s ours
Change-Id: I82a3af4d5a0b2f80f22b00bd281c38a695abfe8b
Bill Yi [Thu, 20 Jul 2017 10:31:42 +0000 (10:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
57c60d3b8c -s ours
am:
ac2abee039 -s ours
Change-Id: If0b55bb356eb9958d8b036ddb4ff70d178c64355
Bill Yi [Thu, 20 Jul 2017 10:31:32 +0000 (10:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
57c60d3b8c -s ours
Change-Id: I6bf7ec12c4e7d35322d4e53e8c0b6f60878e7b97
Bill Yi [Thu, 20 Jul 2017 10:25:13 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
57c60d3b8c -s ours
Change-Id: I60730d3e81bc72197f5582d203134e1b61711435
Bill Yi [Thu, 20 Jul 2017 10:23:00 +0000 (10:23 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours am:
612bc3c9b8 -s ours" into oc-mr1-dev-plus-aosp
am:
8a630470e8 -s ours
Change-Id: I69ea946a07754daf13f182250c5cc445796c7547
Bill Yi [Thu, 20 Jul 2017 10:21:32 +0000 (10:21 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours am:
3b79072040 -s ours" into oc-mr1-dev-plus-aosp
am:
1866df21f9 -s ours
Change-Id: Iafd3408ca1a7fd716ac22f7d7b2a33e053bc6b5c
TreeHugger Robot [Thu, 20 Jul 2017 10:20:21 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 10:20:11 +0000 (10:20 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours am:
dfd75c536f -s ours" into oc-mr1-dev-plus-aosp
am:
f9a0de0fa3 -s ours
Change-Id: Ic5cd6d5dde1610e7b17750b914826944a48c5f6f
Bill Yi [Thu, 20 Jul 2017 10:18:43 +0000 (10:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours am:
9b94308cec -s ours
am:
b2883febe9 -s ours
Change-Id: I95a980c05129c91f825adabb3415bd1bab455120
Android Build Merger (Role) [Thu, 20 Jul 2017 10:12:02 +0000 (10:12 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours am:
612bc3c9b8 -s ours" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 20 Jul 2017 10:11:43 +0000 (10:11 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours am:
3b79072040 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 20 Jul 2017 10:10:40 +0000 (10:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours
am:
612bc3c9b8 -s ours
Change-Id: I49ba3fcfb6851646fb344beadf05c11005452b2b
Bill Yi [Thu, 20 Jul 2017 10:10:15 +0000 (10:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours
am:
3b79072040 -s ours
Change-Id: I2355fc5b35b5fd65c04676336e77a7714e4c7925
Android Build Merger (Role) [Thu, 20 Jul 2017 10:10:12 +0000 (10:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours am:
dfd75c536f -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 20 Jul 2017 10:08:45 +0000 (10:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours
am:
dfd75c536f -s ours
Change-Id: If8ab0ac81b196e61796bb21d5294d2e30d5415a1
Bill Yi [Thu, 20 Jul 2017 10:08:42 +0000 (10:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours
am:
9b94308cec -s ours
Change-Id: If5e639d09b5d809a687a49181dfdddddcbb91f6d
Bill Yi [Thu, 20 Jul 2017 10:01:39 +0000 (10:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
3f9462d6a3 -s ours
Change-Id: I67cf707cf9eb5184865edfea8535b81d413e0807
Bill Yi [Thu, 20 Jul 2017 10:01:39 +0000 (10:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
3f9462d6a3 -s ours
Change-Id: I9801796f6d742693b880a924a134a33053ddbd5e
Bill Yi [Thu, 20 Jul 2017 09:59:43 +0000 (09:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6564d7d123 -s ours
Change-Id: Iac082addbf3aa178053f4eb27a91d0b842646898
Bill Yi [Thu, 20 Jul 2017 09:59:39 +0000 (09:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6564d7d123 -s ours
Change-Id: I9e082bc72af2033aa0fcb3d565f77cba619f090c
TreeHugger Robot [Thu, 20 Jul 2017 09:53:20 +0000 (09:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 09:48:53 +0000 (09:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
OSDN Git Service
