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

OSDN Git Service

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

commit | commitdiff | tree

Chong Zhang [Wed, 7 Mar 2018 22:59:15 +0000 (22:59 +0000)]

Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]

Merge changes from topic "am-d9c6be77-633d-4f98-8eb7-b9106af9ba0f" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c9f5891a7f skipped: 0a1d5cc852
  [automerger skipped] Import translations. DO NOT MERGE skipped: c9f5891a7f
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)]

Merge changes from topic "am-6f0d1125-8060-4e8b-afe5-8e18597ac90b" into oc-dev

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:28:36 +0000 (05:28 +0000)]

Merge changes from topic "am-9b4b0f8c-4823-4712-936a-f4aafe519eff" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)]

Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:27:27 +0000 (05:27 +0000)]

Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:08 +0000 (00:44 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60

Change-Id: I634172b202c3401d476668f1173ab8fede42bc0b

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:01 +0000 (00:44 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973

Change-Id: If3964293aa4ce9c51ecb353ef8c2ee817d14e460

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 00:43:41 +0000 (16:43 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:39:54 +0000 (23:39 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724

Change-Id: Icea7f683d6428ed86d7446071fd85547127ee9dc

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:39:48 +0000 (23:39 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6

Change-Id: Ic29200b8737f5718d33791faa5f7f12f3eeb9d76

commit | commitdiff | tree

Bill Yi [Fri, 2 Mar 2018 23:39:30 +0000 (15:39 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:34:03 +0000 (23:34 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e

Change-Id: I334a5d4006779caa60b3459cf73aca3b086b06e3

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:33:58 +0000 (23:33 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed

Change-Id: I2ce2dd84a3c87c575059a2f33f99dd7d6f43bef5

commit | commitdiff | tree

Bill Yi [Fri, 2 Mar 2018 23:33:37 +0000 (15:33 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:02:09 +0000 (23:02 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: dfffd1a532 skipped: b8f08e00fd

Change-Id: I5115053a7f801215fea81c8f23bbb275aab0e0fd

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:02:04 +0000 (23:02 +0000)]

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

Change-Id: Id9175caf6dec27c84c1046d0f972ff82d56248a7

commit | commitdiff | tree

Bill Yi [Fri, 2 Mar 2018 23:01:39 +0000 (15:01 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 22:40:22 +0000 (22:40 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad

Change-Id: I3eabd9c7e638ba1b860759c07fb27360a91d8ab3

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 22:40:15 +0000 (22:40 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905

Change-Id: I6b298dd7d2c471c2ec860b0760b97fd06a360d81

commit | commitdiff | tree

Bill Yi [Fri, 2 Mar 2018 22:39:55 +0000 (14:39 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 22:34:16 +0000 (22:34 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c9f5891a7f skipped: 0a1d5cc852

Change-Id: I17e5d935ea4442a8f14b503536bbfaa30bb5b0e7

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 22:34:09 +0000 (22:34 +0000)]

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

Change-Id: Ib96b1dcb7c24fd19e8012847185aceeb966c1c81

commit | commitdiff | tree

Bill Yi [Fri, 2 Mar 2018 22:33:43 +0000 (14:33 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Chong Zhang [Tue, 13 Feb 2018 19:09:42 +0000 (11:09 -0800)]

Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE

bug: 73085795
Change-Id: I19a3a4934d5e26a54f8875b8b517b5889c689b96

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]

Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]

Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]

Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc
  [automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]

Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into nyc-mr2-dev

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:18 +0000 (17:17 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc

Change-Id: Ie880a7487ed875a62e4fab4974da4a35d3c6b8b4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:12 +0000 (17:17 +0000)]

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

Change-Id: I70b8b1c9fab0c7ae88a9a5f839ee411b28fd4f19

commit | commitdiff | tree

Bill Yi [Mon, 19 Feb 2018 17:16:47 +0000 (09:16 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:26 +0000 (16:08 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653

Change-Id: Ie898f10574d4deb9d465e70803b1b6f24e69e867

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:19 +0000 (16:08 +0000)]

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

Change-Id: Ib38e6fcc936beb2c72afb46b6e302b4ca261ce14

commit | commitdiff | tree

Bill Yi [Mon, 19 Feb 2018 16:07:44 +0000 (08:07 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:11 +0000 (15:09 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639

Change-Id: I0ed2f3e40aeaaff5acfbbef02155450747169397

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:03 +0000 (15:09 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2

Change-Id: I89781e9b815f8fdee167b1427aec4dee233f5530

commit | commitdiff | tree

Bill Yi [Mon, 19 Feb 2018 15:08:29 +0000 (07:08 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:21 +0000 (00:06 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60 skipped: aa9c801f89

Change-Id: I0d1636b652adf1db5ebd67eb9bb467d3abd84b26

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:16 +0000 (00:06 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60

Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:11 +0000 (00:06 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f

Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:07 +0000 (00:06 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4

Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:02 +0000 (00:06 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761

Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:54 +0000 (00:05 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35

Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0

Change-Id: I80463ee5315c2672e812659192b227c8271e9113

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a

Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3

Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 01:07:32 +0000 (01:07 +0000)]

[automerger] Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev am: 9e5c21243c am: 5a590c68df

Change-Id: Iad2f6bbb0783083c5e5a3845843b6ac92b1560d8

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 01:06:47 +0000 (01:06 +0000)]

Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev
am: 9e5c21243c

Change-Id: Iff594c5c0a8e258528d6c0a8399a2df057f90633

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:27:17 +0000 (00:27 +0000)]

Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:26:40 +0000 (00:26 +0000)]

[automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3 am: 3979121a99

Change-Id: Ie81fae7db0592bbe435f2809aa0d93b58e581e06

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:26:34 +0000 (00:26 +0000)]

[automerger] Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767 am: 1aab54a3a3

Change-Id: I83429de2ddef2fe856fb40035204791aa66796f8

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 00:26:07 +0000 (00:26 +0000)]

Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
am: 50d4e94767

Change-Id: I05fe6580c2bf6a44f5fadda55fa5b2d944d9be9e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:53 +0000 (00:16 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e am: d2428ebae4

Change-Id: I6463a678c01ec630fb348fa6661beb681078fe4c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:48 +0000 (00:16 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a am: 0c8b40873e

Change-Id: If54c2a5deeede4eb51b48c18365229928e3db763

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:33 +0000 (00:16 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a

Change-Id: Idafe9ec60693bf6ffaa3aa7833869261a416d4c1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:09 +0000 (00:16 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10

Change-Id: I75f04f568669d0a09e7b492cc2cbcad8bd80389b

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 00:15:28 +0000 (00:15 +0000)]

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev
am: fa72a625cc

Change-Id: I99bcbd911edac1d5089e510b888c665f02dc881c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:15:26 +0000 (00:15 +0000)]

Merge "Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am: 39e6bc7495" into oc-dev

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 00:14:51 +0000 (00:14 +0000)]

Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev
am: 39e6bc7495

Change-Id: I9bce38d411fa55aed455a3de2dba9d16cca4db6d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:07:43 +0000 (00:07 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d am: 7f4440640b

Change-Id: Ia78647742f44c9dc51d030d984b0dc9332139044

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Feb 2018 00:07:36 +0000 (00:07 +0000)]

[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d

Change-Id: Iafbde79d1e7d4342b305726fd7b6e58984d98972

commit | commitdiff | tree

Etan Cohen [Thu, 8 Feb 2018 00:07:01 +0000 (00:07 +0000)]

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev
am: bd629f69ed

Change-Id: I23b5db36cb5d4d72a23894e75e36ad483ad23338

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:50:21 +0000 (23:50 +0000)]

Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957 am: 457e8440d7
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:50:21 +0000 (23:50 +0000)]

Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into nyc-mr2-dev

* changes:
[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:50:21 +0000 (23:50 +0000)]

Merge "Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]

Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]

Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]

Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into cw-f-dev

* changes:
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:48:28 +0000 (23:48 +0000)]

[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957 am: 457e8440d7

Change-Id: I01f6d3b238bc1da87df6f6d46ae79cd1d679c72a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:48:16 +0000 (23:48 +0000)]

[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058 am: 3ba85c8957

Change-Id: I0ec788c5d0429b15f4e5819e157f4374f413c517

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:47:23 +0000 (23:47 +0000)]

Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev
am: f4ea18a058

Change-Id: I98fb6d1b1d7020d7ed057454754d1f1f6000fec6

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:47:13 +0000 (23:47 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d am: 024efb4645

Change-Id: I1fa6812361ebad2e2772577afd1924d52716e1cc

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]

Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev

* changes:
[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1
Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]

Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f" into nyc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]

Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr2-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]

Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into cw-f-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]

Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev

* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d am: f6d4304e95
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:47 +0000 (23:46 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0 am: 651db1820d

Change-Id: I0b1823b4bc6a9120469245accf83d8ac9ba80029

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:33 +0000 (23:46 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0

Change-Id: Iee5a04cf07d706faad6ea0a987d48feb10c504f1

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:45:55 +0000 (23:45 +0000)]

Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev
am: 4feca3b99f

Change-Id: Id02665871c6b93b03fa1294278e3cb8513811b5e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:34 +0000 (23:45 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d am: f6d4304e95

Change-Id: Id6d44fa2c822c4e887929a3260512dd9038574e8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:29 +0000 (23:45 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2 am: 5e30c39b3d

Change-Id: I0205a5b671a946a63ef0acc1d45cc3dfff6469c1

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:24 +0000 (23:45 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2

Change-Id: I719bed29c66b873461642fbd3815a993d59720f2

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev

* changes:
[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dr1-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr2-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa am: 247b4d5372
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into cw-f-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa am: 247b4d5372 am: 91d4d3db33
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa am: 247b4d5372
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:07 +0000 (23:45 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1

Change-Id: Ie3405b9e4ff95c8974e9a7f08ca949112b161002

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:44:04 +0000 (23:44 +0000)]

Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev
am: 47f4b8411f

Change-Id: Idb749103a54c357be2b17081c52265ca54426677

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:42:17 +0000 (23:42 +0000)]

[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa am: 247b4d5372 am: 91d4d3db33

Change-Id: Idc336aa0746cd886f0e93de86d40313b423587c2

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:42:05 +0000 (23:42 +0000)]

[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa am: 247b4d5372

Change-Id: Ic244a64ac6083757425460c2140db1ff3f1927fa

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:42:03 +0000 (23:42 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb am: c290ad3333 am: b26a010054

Change-Id: I846745fe866b2411c4ebd846086cc3bdcb408b7b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:41:52 +0000 (23:41 +0000)]

[automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa

Change-Id: I6f4b93c8eefa4d406eca1467f6e6883028aa6c99

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:41:48 +0000 (23:41 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb am: c290ad3333

Change-Id: I02699a89d6be88700268e82b31aa459b72c78607

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:41:42 +0000 (23:41 +0000)]

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb

Change-Id: Ia902911c856ee0c6c5b6fa51527071f3b469775f

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help