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

Bill Yi [Wed, 26 Jul 2017 20:16:18 +0000 (20:16 +0000)]

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

Change-Id: I7e91a70c32d7abb78eb8bff6aecb9ccb1f0c427b

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 20:11:36 +0000 (20:11 +0000)]

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

Change-Id: I4db0803ab5e2ecb96b72773123fe0db218200a1d

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 20:01:50 +0000 (20:01 +0000)]

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

commit | commitdiff | tree

Sungsoo Lim [Wed, 26 Jul 2017 20:00:40 +0000 (20:00 +0000)]

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev am: bba60fadc7
am: 5a3d561e2d

Change-Id: Ie2f4ccb46e0de6b177ff1f13ecc95fa7cabb04f9

commit | commitdiff | tree

Sungsoo [Wed, 26 Jul 2017 19:57:35 +0000 (19:57 +0000)]

Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev am: d7ff18dac8 -s ours
am: 2b123141b9

Change-Id: I4191528bca07d8f3062bbadfc6f99cf3dc13c622

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 19:57:22 +0000 (19:57 +0000)]

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

commit | commitdiff | tree

Sungsoo Lim [Wed, 26 Jul 2017 19:49:09 +0000 (19:49 +0000)]

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev am: bba60fadc7
am: 95baa7765c

Change-Id: I787abff50bc59bc2b93794b33f02e218a5c14b10

commit | commitdiff | tree

Sungsoo Lim [Wed, 26 Jul 2017 19:48:25 +0000 (19:48 +0000)]

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
am: bba60fadc7

Change-Id: Idd61a0034321755fd7e53deb6e452e7a14d0ba44

commit | commitdiff | tree

Sungsoo [Wed, 26 Jul 2017 19:45:04 +0000 (19:45 +0000)]

Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
am: d7ff18dac8 -s ours

Change-Id: I88874d4f445b4769e6f5222388b2620f1d2801c6

commit | commitdiff | tree

Sungsoo [Wed, 26 Jul 2017 19:45:01 +0000 (19:45 +0000)]

Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev am: d7ff18dac8
am: 96681b8f6b -s ours

Change-Id: I7191f06d4836ff606769ec3b9f0609512df499d3

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 19:28:52 +0000 (19:28 +0000)]

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

Change-Id: I118f5e788a1ad1fbf135a3ce499453d521e47745

commit | commitdiff | tree

Pavel Grafov [Wed, 26 Jul 2017 19:17:00 +0000 (19:17 +0000)]

Merge "Don't attribute incorrect unified challenge attempt to profile." into oc-mr1-dev
am: c58e47cfdc

Change-Id: Id634671d9068d3919c8a1cbcfb9fb411ba69022b

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 19:14:36 +0000 (19:14 +0000)]

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 19:06:15 +0000 (19:06 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b978569fce -s ours
am: 6cb150d094 -s ours

Change-Id: Id5b0e0588628c151b384107ecc0e4a6fe4236917

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:59:33 +0000 (18:59 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b978569fce -s ours
am: 60ebd52445 -s ours

Change-Id: I5821409e3e3123435dd37d370b28057c1476c755

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 18:59:13 +0000 (18:59 +0000)]

Merge "Don't attribute incorrect unified challenge attempt to profile." into oc-mr1-dev

commit | commitdiff | tree

Sungsoo Lim [Wed, 26 Jul 2017 18:54:19 +0000 (18:54 +0000)]

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
am: bba60fadc7

Change-Id: I28dbb73021ea5bfeec3fda3e35849ad446d65102

commit | commitdiff | tree

Sungsoo [Wed, 26 Jul 2017 18:51:16 +0000 (18:51 +0000)]

Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
am: d7ff18dac8

Change-Id: I52a17de61821c72e97336eb66f34a56444e13894

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:47:26 +0000 (18:47 +0000)]

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

Change-Id: I4f5887b8444b16dab976ba9cb9383f68bc2a9f59

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:47:25 +0000 (18:47 +0000)]

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

Change-Id: I5b78e73fc5fb303b739ef85788866f1c95c6195b

commit | commitdiff | tree

Felipe Leme [Wed, 26 Jul 2017 18:46:17 +0000 (18:46 +0000)]

Merge "DO NOT MERGE - Wraps custom save subtitle on ScrollView." into oc-mr1-dev
am: ebbea789f6

Change-Id: Id9872fc279e2294bba7d43de9549524c45896c58

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 18:41:38 +0000 (18:41 +0000)]

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:41:27 +0000 (18:41 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 900d7157c0 -s ours
am: e07f357cb7 -s ours

Change-Id: I4b9b55cfdfc0969afb8ff55398e2cc30e77e249f

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 18:40:20 +0000 (18:40 +0000)]

Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 18:39:16 +0000 (18:39 +0000)]

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:36:02 +0000 (18:36 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 56b37be1c9 -s ours
am: 1b8c5efd89 -s ours

Change-Id: Ib684060ce289b3410ed2fa43f5c7fdd596e2c468

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:33:08 +0000 (18:33 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2a2845a483 -s ours
am: 29438768fb -s ours

Change-Id: I3075087b463da72ea33bd2a99972c32fcf27a34b

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 18:32:39 +0000 (18:32 +0000)]

Merge "DO NOT MERGE - Wraps custom save subtitle on ScrollView." into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:24:13 +0000 (18:24 +0000)]

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

Change-Id: I36c4d906aa15db83b8d199287413437b8c03fd3a

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:21:35 +0000 (18:21 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 900d7157c0 -s ours
am: 0608857af5 -s ours

Change-Id: I715058dfb29217a07a3a5f250d77626a84a1f0a7

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:20:30 +0000 (18:20 +0000)]

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

Change-Id: I8f3ff43e58be87e3f7fa8c303fac180c7fb74266

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:06:04 +0000 (18:06 +0000)]

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

Change-Id: Id4d5900551e15ae96cde2b63cf846aff7f80f6ea

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:54:54 +0000 (17:54 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 56b37be1c9 -s ours
am: 375ee4625d -s ours

Change-Id: I0001c99a227cc265a69ddd34b26f06d87cc5960c

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:52:38 +0000 (17:52 +0000)]

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

Change-Id: I755f5b84aa8444d48a7c1c34db9ae5d70a9b7aa9

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:48:42 +0000 (17:48 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2a2845a483 -s ours
am: a93169837a -s ours

Change-Id: Iec4ce94d01d5f516541e795ee2eb740a495357f7

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 17:42:15 +0000 (17:42 +0000)]

Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am: afda883f86
am: 2638216c83

Change-Id: I6f3dfc0bf046db21c5728f553202f3320070be00

commit | commitdiff | tree

Beverly [Wed, 26 Jul 2017 17:39:26 +0000 (17:39 +0000)]

Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev am: 382644aa74
am: deb56eb3f5

Change-Id: If56248e5b335edd5bea547fd503106664b26bad5

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:35:27 +0000 (17:35 +0000)]

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

Change-Id: Iae044e0aa00c834d4ba2a326eab390ff820bd907

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:31:35 +0000 (17:31 +0000)]

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

Change-Id: Icdcd43fdc8d15c24c38752005e6ef249913c3125

commit | commitdiff | tree

Geoffrey Pitsch [Wed, 26 Jul 2017 17:31:19 +0000 (17:31 +0000)]

Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev am: 0d5c1490ce
am: d691f1a200

Change-Id: Ie137cb0decb3ed96d0f3a8d71f04e49446726d7a

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 17:31:03 +0000 (17:31 +0000)]

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

commit | commitdiff | tree

Bryce Lee [Wed, 26 Jul 2017 17:24:22 +0000 (17:24 +0000)]

Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev am: 512e5d1b9b
am: d6a2ed194c

Change-Id: I8acdd035eaa935f1a86f76c814f4d6413adb37c8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 17:17:25 +0000 (17:17 +0000)]

Merge "Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am: afda883f86 am: 2168aff878" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 17:13:17 +0000 (17:13 +0000)]

Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev am: dd22dcbcdf
am: 147966d7ae

Change-Id: Ic14166198d1b44b87335f78bdab41b802fc23156

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 17:12:54 +0000 (17:12 +0000)]

Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am: afda883f86
am: 2168aff878

Change-Id: Ie3d6006ad5f9f63793b1bf7a73abc401d333e0ed

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 17:08:56 +0000 (17:08 +0000)]

Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev am: 1e74fdb684 -s ours
am: 31d0bcc321

Change-Id: I8b79fc3104b1f03b772376bf9fa02323a06e83c9

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:04:20 +0000 (17:04 +0000)]

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

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 16:59:16 +0000 (16:59 +0000)]

Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
am: afda883f86

Change-Id: I343ee531e2bf5f658ba0693c7e0e402b395dc282

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 16:57:06 +0000 (16:57 +0000)]

Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
am: afda883f86

Change-Id: Ifc073571a999d5c99a2f4b364691b15e070bf95f

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 16:56:39 +0000 (16:56 +0000)]

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

commit | commitdiff | tree

Beverly [Wed, 26 Jul 2017 16:40:41 +0000 (16:40 +0000)]

Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
am: 382644aa74

Change-Id: I7c8bfab80e82d2841f43a75ce7fddc0b03cacc70

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 16:39:56 +0000 (16:39 +0000)]

Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev

commit | commitdiff | tree

Beverly [Wed, 26 Jul 2017 16:33:26 +0000 (16:33 +0000)]

Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev am: 382644aa74
am: 0f29b29513

Change-Id: If9cdb4d701462ffb843bb071811e2dc3d227c9a2

commit | commitdiff | tree

Geoffrey Pitsch [Wed, 26 Jul 2017 16:30:46 +0000 (16:30 +0000)]

Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev am: 0d5c1490ce
am: b65450e135

Change-Id: I204c5d4080ceb4f87b2c3477f0eff4b7ee749eff

commit | commitdiff | tree

Geoffrey Pitsch [Wed, 26 Jul 2017 16:29:01 +0000 (16:29 +0000)]

Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
am: 0d5c1490ce

Change-Id: I130816097bc68d1978b035cb2cfb0a3c678f9291

commit | commitdiff | tree

Bryce Lee [Wed, 26 Jul 2017 16:25:40 +0000 (16:25 +0000)]

Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
am: 512e5d1b9b

Change-Id: If5c2ce81a92d751c3481d7613611b9373060f78a

commit | commitdiff | tree

Bryce Lee [Wed, 26 Jul 2017 16:25:01 +0000 (16:25 +0000)]

Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev am: 512e5d1b9b
am: a9ba9c3ed6

Change-Id: Iaa194f131f171d01854afdf4b07d7648c4f14964

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 16:22:52 +0000 (16:22 +0000)]

Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am: dd22dcbcdf

Change-Id: I50d98b16eb4ce43a555a0136a74421e891754786

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 16:22:51 +0000 (16:22 +0000)]

Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev am: dd22dcbcdf
am: 6b46beea25

Change-Id: I98a42a909b011b7a888a6b6dc52caa18e95340d3

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 16:18:51 +0000 (16:18 +0000)]

Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev am: 1e74fdb684
am: 9975186ae5 -s ours

Change-Id: Ie3b841afe7b8729775ac3ec2be79eaa171cc8571

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 16:18:33 +0000 (16:18 +0000)]

Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am: 1e74fdb684 -s ours

Change-Id: I489efc8ca8d93cd94ac71e2ea65f45e888a9a138

commit | commitdiff | tree

Beverly [Wed, 26 Jul 2017 15:43:34 +0000 (15:43 +0000)]

Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
am: 382644aa74

Change-Id: I024b10373afa5dfd7255d0dccddb1bb653d496b4

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 15:34:32 +0000 (15:34 +0000)]

Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 15:05:55 +0000 (08:05 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ia56580662240b965d77ec102ea91a8b0ea5a8bab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 15:03:02 +0000 (08:03 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie143437207858ada42d95895b235e72f6ac8926f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 15:00:54 +0000 (08:00 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic35926e27018d65db6f2972f183cb7242687a483
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Geoffrey Pitsch [Wed, 26 Jul 2017 14:39:17 +0000 (14:39 +0000)]

Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
am: 0d5c1490ce

Change-Id: Iff93082f1d38becfc498fd7ba0d417ed88955c25

commit | commitdiff | tree

Geoffrey Pitsch [Wed, 26 Jul 2017 14:31:23 +0000 (14:31 +0000)]

Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:30:33 +0000 (07:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ia3879f9882a8fde1edcc669f31b4cb5125786ea5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:27:44 +0000 (07:27 -0700)]

Import translations. DO NOT MERGE

Change-Id: I76674f28e858f631f43f88f041ce0b6798b30def
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Geoffrey Pitsch [Mon, 24 Jul 2017 15:24:21 +0000 (11:24 -0400)]

Remove ability to downgrade importance of existing channel.

Test: runtest systemui-notification
Bug: 63920384
Change-Id: Ic9f5c50c3d2a36ccd4ba9686dad1eb415b559215

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:26:35 +0000 (07:26 -0700)]

Import translations. DO NOT MERGE

Change-Id: I5232ba3964ba77e81d70d325f34630a153d2b22d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bryce Lee [Wed, 26 Jul 2017 14:26:18 +0000 (14:26 +0000)]

Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
am: 512e5d1b9b

Change-Id: I2853f3545e7250d2d6f0a17399e4073c83d431a7

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:25:10 +0000 (07:25 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iddda7b19049b1fc773e56eada5c4100ae14b39da
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bryce Lee [Wed, 26 Jul 2017 14:20:31 +0000 (14:20 +0000)]

Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 11:53:34 +0000 (11:53 +0000)]

Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am: dd22dcbcdf

Change-Id: I2760a5efce65ba88fcb49589eec9071fc052ddc9

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 11:47:01 +0000 (11:47 +0000)]

Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 11:02:16 +0000 (11:02 +0000)]

Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am: 1e74fdb684

Change-Id: I0ccabd7441257ae1631ad8b362b64be37cf1a386

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 10:53:34 +0000 (10:53 +0000)]

Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:40:56 +0000 (08:40 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 4d00a9512a -s ours am: a6eed85c8b -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:39:04 +0000 (08:39 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 4d00a9512a -s ours
am: a6eed85c8b -s ours

Change-Id: I166a966d6e8f5a12431cff29072af05e31f5e2cb

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:38:59 +0000 (08:38 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 4d00a9512a -s ours
am: 059137469b -s ours

Change-Id: I58e641654abe46a6c3fcc53bf17138d341b8a393

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:35:43 +0000 (08:35 +0000)]

Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp am: eb5a73f4ec -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:33:51 +0000 (08:33 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp
am: eb5a73f4ec -s ours

Change-Id: I48e9216bc9bf710e0fc0483d80b62387da1191df

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:33:23 +0000 (08:33 +0000)]

Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 799144a18b -s ours" into oc-dr1-dev-plus-aosp am: 8f148cdce4 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:31:39 +0000 (08:31 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 799144a18b -s ours" into oc-dr1-dev-plus-aosp
am: 8f148cdce4 -s ours

Change-Id: Iedac6d64df4cb01b070abc9b277a2be66f4d2c80

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:31:07 +0000 (08:31 +0000)]

Merge "Import translations. DO NOT MERGE am: 7c2b27f26f -s ours am: 090feca7b5 -s ours am: 816a4d38de -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:30:34 +0000 (08:30 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours am: 101cf38a40 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:29:10 +0000 (08:29 +0000)]

Import translations. DO NOT MERGE am: 7c2b27f26f -s ours am: 090feca7b5 -s ours
am: 816a4d38de -s ours

Change-Id: I2ec52f9136d4a821a88211a1a8263d37098a9b22

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:28:43 +0000 (08:28 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours
am: 101cf38a40 -s ours

Change-Id: I58d52127fe0103931071c261742186e1d2ca70ab

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:28:16 +0000 (08:28 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 5bbc5fe521 -s ours am: b4b0c6acb4 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:26:17 +0000 (08:26 +0000)]

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

Change-Id: I194fa29eb575b6bdd91a167c6d7826c4fda7df69

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:25:13 +0000 (08:25 +0000)]

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

Change-Id: I30da215979e10c5ea3ad63cc24c46dfe1a0a9ceb

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:25:13 +0000 (08:25 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 5bbc5fe521 -s ours
am: b4b0c6acb4 -s ours

Change-Id: I3cc6305086fb24b1d732288d2c8d7880dbd5a0ec

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:25:11 +0000 (08:25 +0000)]

Import translations. DO NOT MERGE am: 7c2b27f26f -s ours am: 090feca7b5 -s ours
am: b56bbb9dcb -s ours

Change-Id: Ia861a78a5d71eea2afdddb4a4329383a2e2b3080

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:21:12 +0000 (08:21 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:20:16 +0000 (08:20 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 799144a18b -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:19:41 +0000 (08:19 +0000)]

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

Change-Id: I95efa84b8030ee19fd38e900466dadf0348cb309

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:18:47 +0000 (08:18 +0000)]

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

Change-Id: I01e221dcc0d669bc37882e5b15bfcd0c305725c5

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:18:42 +0000 (08:18 +0000)]

Import translations. DO NOT MERGE am: 7c2b27f26f -s ours am: dcb5e77673 -s ours
am: af65d78745 -s ours

Change-Id: I2576170517dac2e196691edf3b8c7a6a55dcd79d