OSDN Git Service
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
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
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
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
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
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
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
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
TreeHugger Robot [Sat, 22 Jul 2017 16:31:16 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
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
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
TreeHugger Robot [Sat, 22 Jul 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:11:59 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 22 Jul 2017 16:10:09 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 22 Jul 2017 16:04:48 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 22 Jul 2017 16:04:02 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE"
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Sat, 22 Jul 2017 04:46:19 +0000 (04:46 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Sat, 22 Jul 2017 02:23:52 +0000 (02:23 +0000)]
Merge "Make a helper method to post work to ui thread."
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
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
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
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
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
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
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
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
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
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
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
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
Love Khanna [Sat, 22 Jul 2017 00:59:17 +0000 (00:59 +0000)]
NFC DTA Integration
am:
b54567810f -s ours
Change-Id: I0a95d61bcc814a922453ebf024f4675367ec8bf0
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
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
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
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
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
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
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
TreeHugger Robot [Sat, 22 Jul 2017 00:45:24 +0000 (00:45 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
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
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
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
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
Wyatt Riley [Sat, 22 Jul 2017 00:37:30 +0000 (00:37 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am:
ec996b381d am:
0698972585
am:
434275e33c
Change-Id: Id6dc1070ef538773b4b0dbb1fe9f3a7b4381fac4
TreeHugger Robot [Sat, 22 Jul 2017 00:35:10 +0000 (00:35 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
Love Khanna [Sat, 22 Jul 2017 00:29:02 +0000 (00:29 +0000)]
NFC DTA Integration am:
276f9fe619 -s ours am:
2275fe2c53 -s ours
am:
8818423e4e -s ours
Change-Id: I364b07c5d7be8ec6bc58286aac4e82be6210287e
Android Build Merger (Role) [Sat, 22 Jul 2017 00:26:54 +0000 (00:26 +0000)]
Merge "Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am:
ec996b381d am:
07e2d89b35" into oc-mr1-dev-plus-aosp
Wyatt Riley [Sat, 22 Jul 2017 00:25:11 +0000 (00:25 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am:
ec996b381d
am:
07e2d89b35
Change-Id: If6be09131faf3b9956d6f20971be3b74d0f82f6e
Wyatt Riley [Sat, 22 Jul 2017 00:25:07 +0000 (00:25 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am:
ec996b381d
am:
0698972585
Change-Id: I4da098db8f5513dc172edef0c1b78508124d1243
Wyatt Riley [Sat, 22 Jul 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
am:
ec996b381d
Change-Id: I345871c43857d1d0e01377a50e9745ce3c598955
Love Khanna [Sat, 22 Jul 2017 00:18:48 +0000 (00:18 +0000)]
NFC DTA Integration am:
276f9fe619 -s ours
am:
2275fe2c53 -s ours
Change-Id: I15aa809c2fe9374dd569aac3e618acd2dd154414
Wyatt Riley [Sat, 22 Jul 2017 00:18:42 +0000 (00:18 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
am:
ec996b381d
Change-Id: Ifa49f58660363d78d79eaa3851fe818fb6b75763
David Friedman [Sat, 22 Jul 2017 00:16:24 +0000 (00:16 +0000)]
Merge "Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190 am:
93a1ab8ba1" into oc-mr1-dev-plus-aosp
am:
1857908a20
Change-Id: I8e92d815dd0c4fd3fd0a7ffa5f7578bba927c154
Fan Zhang [Sat, 22 Jul 2017 00:14:52 +0000 (00:14 +0000)]
Merge "Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d -s ours am:
e8fe97e09d" into oc-mr1-dev-plus-aosp
am:
60e031823b -s ours
Change-Id: I7bddc8662c33dcf858f673cc902b2b920baf28fe
Love Khanna [Sat, 22 Jul 2017 00:14:17 +0000 (00:14 +0000)]
NFC DTA Integration
am:
276f9fe619 -s ours
Change-Id: I34e2fa236f5e590f4f21dcc45e1fa8a045c37ade
TreeHugger Robot [Sat, 22 Jul 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
Steven Moreland [Sat, 22 Jul 2017 00:12:04 +0000 (00:12 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148 am:
d37f13603a am:
e3d7919730 am:
7865678ac4
am:
e380004683
Change-Id: I872887b899312dbe4698b923a9d634d303de404c
David Friedman [Sat, 22 Jul 2017 00:06:39 +0000 (00:06 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
cde37c8836 am:
f53a3c84e5
am:
ecf7d7bbcb
Change-Id: Idb72c783fa3c30d48a4429070b6b35bad804e000
Android Build Merger (Role) [Sat, 22 Jul 2017 00:06:08 +0000 (00:06 +0000)]
Merge "Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190 am:
93a1ab8ba1" into oc-mr1-dev-plus-aosp
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Fan Zhang [Fri, 21 Jul 2017 23:59:57 +0000 (16:59 -0700)]
Make a helper method to post work to ui thread.
Bug:
36131513
Bug:
63896139
Test: robotests
Change-Id: If7154f17926f86157816987221f449a48ae6fd4e
David Friedman [Sat, 22 Jul 2017 00:05:03 +0000 (00:05 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190 am:
ff160ae465
am:
bad118a0b4
Change-Id: I7ef10fb02fc2251123cafde32f83cacef0fce743
David Friedman [Sat, 22 Jul 2017 00:05:01 +0000 (00:05 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190
am:
93a1ab8ba1
Change-Id: I862a759acc9b8475c95c94ad53202812d5b01a72
Android Build Merger (Role) [Sat, 22 Jul 2017 00:04:28 +0000 (00:04 +0000)]
Merge "Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d -s ours am:
e8fe97e09d" into oc-mr1-dev-plus-aosp
Fan Zhang [Sat, 22 Jul 2017 00:02:55 +0000 (00:02 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d -s ours
am:
e8fe97e09d
Change-Id: Ie272b010c4fbb9da33f9832c8594846cebfaaf16
Fan Zhang [Sat, 22 Jul 2017 00:02:52 +0000 (00:02 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d am:
82388cda78 -s ours
am:
07b05cf1e3 -s ours
Change-Id: Ifc962d6891311aad026db7fe254d24ab0329e6b5
Steven Moreland [Sat, 22 Jul 2017 00:02:06 +0000 (00:02 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148 am:
d37f13603a am:
e3d7919730
am:
7865678ac4
Change-Id: Ia5ee160327adff153f2fb81b73af26528a83e87d
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
David Friedman [Fri, 21 Jul 2017 23:58:43 +0000 (23:58 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
cde37c8836
am:
f53a3c84e5
Change-Id: I42870687ca444600d82f8f5cbbee8418fa2ee11b
David Friedman [Fri, 21 Jul 2017 23:57:18 +0000 (23:57 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190
am:
ff160ae465
Change-Id: I38aa24b225827f7a280f5fcd85c08a0424d10b06
David Friedman [Fri, 21 Jul 2017 23:57:01 +0000 (23:57 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334
am:
f20c492190
Change-Id: I57da50e47d3fdfefa245baffdeaf16322b28fa30
Fan Zhang [Fri, 21 Jul 2017 23:55:48 +0000 (23:55 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d
am:
82388cda78 -s ours
Change-Id: Id77630e986146853377916f1551ea48d7ad904bf
Fan Zhang [Fri, 21 Jul 2017 23:55:17 +0000 (23:55 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
am:
689359914d -s ours
Change-Id: I0193cc14eecb868b4bc4f47fe10d07aa4e787a5c
Steven Moreland [Fri, 21 Jul 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148 am:
d37f13603a
am:
e3d7919730
Change-Id: Idfa23e4e3498b1e65738a79f291008d96974a32e
TreeHugger Robot [Fri, 21 Jul 2017 23:39:08 +0000 (23:39 +0000)]
Merge "Add all battery related tests to BatteryStatsTests suite."
Steven Moreland [Fri, 21 Jul 2017 23:34:17 +0000 (23:34 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148
am:
d37f13603a
Change-Id: Ib0d843954f0a4854b6cea5ef3a4e0ad1ed4f29cb
OSDN Git Service
