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

Selim Cinek [Sun, 23 Jul 2017 13:13:25 +0000 (13:13 +0000)]

Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1 am: 3a82a4a0f2
am: 6900a54562

Change-Id: I5a84244ea8b70c57bf0a74b03d125f42994f5b5b

commit | commitdiff | tree

Selim Cinek [Sun, 23 Jul 2017 13:11:23 +0000 (13:11 +0000)]

Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1 am: 001956c626
am: 137123bdef

Change-Id: I8ecd74701db7e935cf20fb853e60d49594caf510

commit | commitdiff | tree

Selim Cinek [Sun, 23 Jul 2017 13:07:22 +0000 (13:07 +0000)]

Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1
am: 3a82a4a0f2

Change-Id: I2616a3ca94f30bac471f7d99b4503ac9bb8c577f

commit | commitdiff | tree

Selim Cinek [Sun, 23 Jul 2017 13:04:49 +0000 (13:04 +0000)]

Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1
am: 001956c626

Change-Id: Ic1c65063fce8cea01b01569cba6181f4465cd88e

commit | commitdiff | tree

Selim Cinek [Sun, 23 Jul 2017 12:57:20 +0000 (12:57 +0000)]

Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am: 8650c7c0f1

Change-Id: I4dd8cfab340c595181f52659d552bc03f51818ec

commit | commitdiff | tree

Selim Cinek [Sun, 23 Jul 2017 12:57:19 +0000 (12:57 +0000)]

Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am: 8650c7c0f1

Change-Id: I10d7ab191f47bf167a5be5e0d11d7698aae58cd1

commit | commitdiff | tree

TreeHugger Robot [Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)]

Merge "Removing contents hidden string for public notifications" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:28:22 +0000 (17:28 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours am: 85de7f20ab -s ours" into oc-mr1-dev-plus-aosp
am: e6eba20c15 -s ours

Change-Id: I459f59c35e70c0bbbb00a6a12c14204afc5af499

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:26:34 +0000 (17:26 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours" into oc-mr1-dev am: e3f6e69af1 -s ours
am: c6875184b6 -s ours

Change-Id: I86a2ccafeffab805caa0c4ff4d0cda2e7ac48d37

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:22:12 +0000 (17:22 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7c1b73eab7 -s ours
am: 0412212ef1 -s ours

Change-Id: Iad4bbdabecda86f3ba1420a8fcfa3c7b3e2a7752

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 17:20:10 +0000 (17:20 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours am: 85de7f20ab -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:18:52 +0000 (17:18 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours
am: 85de7f20ab -s ours

Change-Id: Idf7c4ff6a3fe6bb8ebc2c1a4bb8fac55b10c6d72

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:16:59 +0000 (17:16 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours" into oc-mr1-dev
am: e3f6e69af1 -s ours

Change-Id: Ib0bc3bdae13c6af93d0841744c60a49c8152f255

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:15:14 +0000 (17:15 +0000)]

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

Change-Id: I75374adc93f550c55e2d67e4464c304db95a8d7e

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:13:48 +0000 (17:13 +0000)]

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

Change-Id: I6d7564148031d30113e395f6f5ee05d7e2afa460

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:12:09 +0000 (17:12 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 27489df378 -s ours
am: 9a048d5b5b -s ours

Change-Id: Ibba586e4df27c31e221cc239e7b4874de8c743b9

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:10:47 +0000 (17:10 +0000)]

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

Change-Id: I53aee6f670b5d08d1572f5542ede9cf9ded2bf3e

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 17:10:31 +0000 (17:10 +0000)]

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:09:06 +0000 (17:09 +0000)]

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

Change-Id: I54774e5f20216a738ba315f5fdaaac6e6f89c60a

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 17:09:04 +0000 (17:09 +0000)]

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:05:31 +0000 (17:05 +0000)]

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

Change-Id: I2b5f30a86e62d6f8158da6d359dc27615f719e3d

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 17:02:45 +0000 (17:02 +0000)]

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 17:02:35 +0000 (17:02 +0000)]

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

Change-Id: I910d4fbdc298dfeaab4dd72f65079375a117c71b

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 16:55:48 +0000 (16:55 +0000)]

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:55:23 +0000 (16:55 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c -s ours am: b1b04dddef -s ours" into oc-mr1-dev-plus-aosp
am: a051d64575 -s ours

Change-Id: I8b3a2901d0cc289347782f19983b15a4f8b72cb1

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 16:55:05 +0000 (16:55 +0000)]

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:53:35 +0000 (16:53 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c -s ours am: 3346da7da4 -s ours
am: 233d75bf96 -s ours

Change-Id: I73aaf49a337d250838e954e434c34d9a008d9c99

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 16:46:45 +0000 (16:46 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c -s ours am: b1b04dddef -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:45:20 +0000 (16:45 +0000)]

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

Change-Id: I52cfd424753db44826ff7b81cdbb85ffd4358152

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:45:10 +0000 (16:45 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c -s ours
am: 3346da7da4 -s ours

Change-Id: I18cc399f3c272ce09f484f31d6aa7affeba00f91

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:41:22 +0000 (16:41 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours am: fd00212302 -s ours" into oc-mr1-dev-plus-aosp
am: 1412b5d927 -s ours

Change-Id: Id05dd240eeae7088929bf4ee96fa6c03783da80d

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:39:09 +0000 (16:39 +0000)]

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

Change-Id: I9ee8162c0015297eee31e5254ee9347f92cbdc5c

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:39:08 +0000 (16:39 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours am: 4d681e127b -s ours
am: 418530d4f4 -s ours

Change-Id: I27b4242e46dd37ddf53fc43f7bd1aa1952fa703f

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:39:06 +0000 (16:39 +0000)]

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

Change-Id: I0e0cc787032a847d315fac6647e6dd2e9aa9b14f

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 16:34:52 +0000 (16:34 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours am: fd00212302 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:33:05 +0000 (16:33 +0000)]

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

Change-Id: I0c2e94e311da66ef58e6816ef20c9f8eb5020528

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:33:02 +0000 (16:33 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours
am: 4d681e127b -s ours

Change-Id: Ibf37f62606eb31b3dadde411d91a501203a79b3f

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 16:31:16 +0000 (16:31 +0000)]

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:27:38 +0000 (16:27 +0000)]

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

Change-Id: I44c91d899d1718557316d1f9bec1d87613d47fbd

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 16:27:36 +0000 (16:27 +0000)]

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

Change-Id: I10c9bfb5e9e22e565b29a1a6b6eda86c8c08f31e

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 16:21:57 +0000 (16:21 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 16:11:59 +0000 (16:11 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 16:10:09 +0000 (16:10 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 16:04:48 +0000 (16:04 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 16:04:02 +0000 (16:04 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 09:47:35 +0000 (02:47 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 09:42:31 +0000 (02:42 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 09:36:03 +0000 (02:36 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 06:43:49 +0000 (23:43 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 06:28:53 +0000 (23:28 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 06:04:28 +0000 (23:04 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Lucas Dupin [Sat, 22 Jul 2017 05:12:30 +0000 (05:12 +0000)]

Merge "Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575ff9 am: 90ad7d538f" into oc-mr1-dev-plus-aosp
am: f5ba3d0321

Change-Id: Icb17b9a7944f3785c2de3e4ec5d5ad50869184ef

commit | commitdiff | tree

Lucas Dupin [Sat, 22 Jul 2017 05:08:23 +0000 (05:08 +0000)]

Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575ff9 am: 902ba7bab5
am: b7a24c817a

Change-Id: Id80dfe2f14adf3fdfa25f51cd229b8c988ce9ba2

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 05:02:27 +0000 (05:02 +0000)]

Merge "Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575ff9 am: 90ad7d538f" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Lucas Dupin [Sat, 22 Jul 2017 05:00:18 +0000 (05:00 +0000)]

Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575ff9
am: 902ba7bab5

Change-Id: Icd8f2b020170e16134947dfd5fdeb4291e9f231c

commit | commitdiff | tree

Lucas Dupin [Sat, 22 Jul 2017 05:00:17 +0000 (05:00 +0000)]

Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575ff9
am: 90ad7d538f

Change-Id: I524cc9f1c547b85dff3e726082aba52e255e9ccc

commit | commitdiff | tree

Lucas Dupin [Sat, 22 Jul 2017 04:52:31 +0000 (04:52 +0000)]

Merge "Fix jank when switching themes" into oc-dr1-dev
am: a74f575ff9

Change-Id: Ibc8fa59cfa6139b03aa7fb08361eb43331484be5

commit | commitdiff | tree

Lucas Dupin [Sat, 22 Jul 2017 04:52:29 +0000 (04:52 +0000)]

Merge "Fix jank when switching themes" into oc-dr1-dev
am: a74f575ff9

Change-Id: Ia9a05c0fe59c2677029fcfc95b1cd648c091d23f

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 04:46:24 +0000 (21:46 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 04:46:19 +0000 (04:46 +0000)]

Merge "Fix jank when switching themes" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 03:58:50 +0000 (20:58 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Matthew Fritze [Sat, 22 Jul 2017 03:54:25 +0000 (03:54 +0000)]

Merge "Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773 am: 5e4b071704" into oc-mr1-dev-plus-aosp
am: e4d122215b

Change-Id: I23d70ae92ca4fbb661f33339963c349b4b512eb5

commit | commitdiff | tree

Matthew Fritze [Sat, 22 Jul 2017 03:50:53 +0000 (03:50 +0000)]

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773 am: 1986c25da7
am: 0e7fc49139

Change-Id: I45ce0a0dbe7605eca86344e507042d7badc96059

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 03:46:31 +0000 (03:46 +0000)]

Merge "Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773 am: 5e4b071704" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Matthew Fritze [Sat, 22 Jul 2017 03:44:10 +0000 (03:44 +0000)]

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773
am: 1986c25da7

Change-Id: I7ddd29766ecb6a4315ab635b16b2f480cc4915a8

commit | commitdiff | tree

Matthew Fritze [Sat, 22 Jul 2017 03:43:42 +0000 (03:43 +0000)]

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773
am: 5e4b071704

Change-Id: Id2768c7fbe12ce572dd53e60bb81026fe69e8ba3

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 03:42:48 +0000 (20:42 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Matthew Fritze [Sat, 22 Jul 2017 03:37:47 +0000 (03:37 +0000)]

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am: 1cc73a5773

Change-Id: I7bba78003073c79aaf692a01f0f6980b40e45598

commit | commitdiff | tree

Matthew Fritze [Sat, 22 Jul 2017 03:37:46 +0000 (03:37 +0000)]

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am: 1cc73a5773

Change-Id: Iebb70bf9db4c3eabf0aecd07a0ecf9178ff8944b

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 03:31:53 +0000 (03:31 +0000)]

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Sat, 22 Jul 2017 03:18:50 +0000 (20:18 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Romain Guy [Sat, 22 Jul 2017 03:14:31 +0000 (03:14 +0000)]

Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: 572cb5242d
am: 99a05a108d

Change-Id: Iafc5ad4561d432257c286932c5c8ce74910bbef0

commit | commitdiff | tree

Romain Guy [Sat, 22 Jul 2017 03:08:29 +0000 (03:08 +0000)]

Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
am: 572cb5242d

Change-Id: I7b79b055f7ffd9a62a741dfe98c71b9fa079b645

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 03:01:02 +0000 (03:01 +0000)]

Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 02:23:52 +0000 (02:23 +0000)]

Merge "Make a helper method to post work to ui thread."

commit | commitdiff | tree

Love Khanna [Sat, 22 Jul 2017 01:24:23 +0000 (01:24 +0000)]

Merge "NFC DTA Integration am: b54567810f -s ours am: 3cf0b6926f -s ours am: 58a611b3a2 -s ours" into oc-mr1-dev-plus-aosp
am: 07fa7b4603 -s ours

Change-Id: I6da6be57576ad6aeb0a315879a95e82aa79f2b06

commit | commitdiff | tree

Fan Zhang [Sat, 22 Jul 2017 01:21:24 +0000 (01:21 +0000)]

Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev am: b975b333af
am: 38b86cfc5a

Change-Id: I4b65da98806f395e80ca8a661998f0afdb57c76e

commit | commitdiff | tree

Makoto Onuki [Sat, 22 Jul 2017 01:16:15 +0000 (01:16 +0000)]

Merge "Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715 am: d9a8191ad6" into oc-mr1-dev-plus-aosp
am: 1d1204b1c5

Change-Id: Icdc388101cd21f46d42e96cc4e72f9c9457f10e7

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 01:13:50 +0000 (01:13 +0000)]

Merge "NFC DTA Integration am: b54567810f -s ours am: 3cf0b6926f -s ours am: 58a611b3a2 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Love Khanna [Sat, 22 Jul 2017 01:12:44 +0000 (01:12 +0000)]

NFC DTA Integration am: b54567810f -s ours am: 3cf0b6926f -s ours
am: 58a611b3a2 -s ours

Change-Id: I65ce382057bc7aaf1df09d7652a710b6e36a978a

commit | commitdiff | tree

Fan Zhang [Sat, 22 Jul 2017 01:12:17 +0000 (01:12 +0000)]

Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev
am: b975b333af

Change-Id: Icdde985be117189f1445bc78f3c94da236fec0df

commit | commitdiff | tree

Makoto Onuki [Sat, 22 Jul 2017 01:10:26 +0000 (01:10 +0000)]

Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715 am: 5eb5ec71fa
am: 6098a153e2

Change-Id: Ibe5deaaae3ccafef77eb8b1120222458d638bd5e

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 01:07:36 +0000 (01:07 +0000)]

Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 01:06:43 +0000 (01:06 +0000)]

Merge "Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715 am: d9a8191ad6" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Love Khanna [Sat, 22 Jul 2017 01:05:46 +0000 (01:05 +0000)]

NFC DTA Integration am: b54567810f -s ours
am: 3cf0b6926f -s ours

Change-Id: I4b06a5031f7a69ce88871a0600abe80174e21e23

commit | commitdiff | tree

Makoto Onuki [Sat, 22 Jul 2017 01:05:37 +0000 (01:05 +0000)]

Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715
am: d9a8191ad6

Change-Id: I3d0febcb4f3fea230b928ef067a5a36c14741ad6

commit | commitdiff | tree

Makoto Onuki [Sat, 22 Jul 2017 01:03:39 +0000 (01:03 +0000)]

Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715
am: 5eb5ec71fa

Change-Id: I17b1d21e5b7dd5f22a773aa201e0ca42e5038fa6

commit | commitdiff | tree

Love Khanna [Sat, 22 Jul 2017 00:59:17 +0000 (00:59 +0000)]

NFC DTA Integration
am: b54567810f -s ours

Change-Id: I0a95d61bcc814a922453ebf024f4675367ec8bf0

commit | commitdiff | tree

Makoto Onuki [Sat, 22 Jul 2017 00:58:01 +0000 (00:58 +0000)]

Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am: 5bbf44e715

Change-Id: I0ca842e1a2c2986c0b6fa9d7eca162cb2cb737af

commit | commitdiff | tree

Makoto Onuki [Sat, 22 Jul 2017 00:57:59 +0000 (00:57 +0000)]

Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am: 5bbf44e715

Change-Id: Icb54710f8a76f674c75c79e9992eb03264ff3142

commit | commitdiff | tree

Bookatz [Sat, 22 Jul 2017 00:57:23 +0000 (00:57 +0000)]

Merge "Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84 am: 9de5dc9ba8" into oc-mr1-dev-plus-aosp
am: 66521c2a93

Change-Id: Ia441570a0c46510dfdbcdfb3bfaf19c90838750f

commit | commitdiff | tree

Bookatz [Sat, 22 Jul 2017 00:52:53 +0000 (00:52 +0000)]

Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84 am: 63959bae98
am: 7cb4094e81

Change-Id: I2485a5dddd8ca224debac609ecbd8f91eaecb2c4

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 22 Jul 2017 00:49:22 +0000 (00:49 +0000)]

Merge "Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84 am: 9de5dc9ba8" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bookatz [Sat, 22 Jul 2017 00:47:47 +0000 (00:47 +0000)]

Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84
am: 9de5dc9ba8

Change-Id: I75cafc7f4eac5a8e77b2491cc85f183866f11546

commit | commitdiff | tree

Bookatz [Sat, 22 Jul 2017 00:47:40 +0000 (00:47 +0000)]

Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84
am: 63959bae98

Change-Id: I0f2c802fb797541f9a4431f1d798ea9f0f1332c0

commit | commitdiff | tree

TreeHugger Robot [Sat, 22 Jul 2017 00:45:24 +0000 (00:45 +0000)]

Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev

commit | commitdiff | tree

Bookatz [Sat, 22 Jul 2017 00:41:57 +0000 (00:41 +0000)]

Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am: 2337b3ba84

Change-Id: Ie29e6ddb7ab37977130adbf566fac18c4dc5c26b

commit | commitdiff | tree

Bookatz [Sat, 22 Jul 2017 00:41:54 +0000 (00:41 +0000)]

Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am: 2337b3ba84

Change-Id: I9d0a3c1ac05f9583fe98b169037e008cc36315b3

commit | commitdiff | tree

Matthew Fritze [Sat, 22 Jul 2017 00:33:00 +0000 (17:33 -0700)]

Move icon resources into SettingsLib for phone buddy

The external settings api needs to pass icons for
corresponding settings. The following signals didn't have
icons in Settings.
- Night display
- Location

Bug: 62706782
Test: make RunSettingsGoogleRoboTests
Change-Id: Ia2feaa9cfea7dbce165545e5b7d96ad0798b8e07

commit | commitdiff | tree

Wyatt Riley [Sat, 22 Jul 2017 00:38:49 +0000 (00:38 +0000)]

Merge "Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am: ec996b381d am: 07e2d89b35" into oc-mr1-dev-plus-aosp
am: c170cb9044

Change-Id: If33d937cdfe0a8fdc1289aaf45e5e988a59f10af