OSDN Git Service
Michael Wright [Mon, 24 Jul 2017 13:01:33 +0000 (13:01 +0000)]
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am:
149ff697ff
am:
d487520e4c
Change-Id: I5769c233212c941e3f1356b01695680a44d2986a
Michael Wright [Mon, 24 Jul 2017 12:52:43 +0000 (12:52 +0000)]
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
am:
149ff697ff
Change-Id: Ie8964116ffb3dccd6b683f0fff764d128107ac4f
TreeHugger Robot [Mon, 24 Jul 2017 12:46:25 +0000 (12:46 +0000)]
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
Hugo Benichi [Mon, 24 Jul 2017 12:01:17 +0000 (12:01 +0000)]
Merge "CaptivePortalLoginActivity: improve logging" am:
c0a4f5357e am:
d5174ac63d am:
d394285fdc
am:
d1a0599537
Change-Id: I8090a26efa655ac9c753a0826ed2f053a5d7d27e
Hugo Benichi [Mon, 24 Jul 2017 11:52:45 +0000 (11:52 +0000)]
Merge "CaptivePortalLoginActivity: improve logging" am:
c0a4f5357e am:
d5174ac63d
am:
d394285fdc
Change-Id: I68cced9b81569a6338d0e55062691d87288e8aff
Hugo Benichi [Mon, 24 Jul 2017 11:43:12 +0000 (11:43 +0000)]
Merge "CaptivePortalLoginActivity: improve logging" am:
c0a4f5357e
am:
d5174ac63d
Change-Id: Ia8a9105404399901ca633a8f883ffa5be8f9548b
Hugo Benichi [Mon, 24 Jul 2017 11:34:40 +0000 (11:34 +0000)]
Merge "CaptivePortalLoginActivity: improve logging"
am:
c0a4f5357e
Change-Id: I475b58f1a6146f0faf4ddf90f44e032ee6c3120f
Treehugger Robot [Mon, 24 Jul 2017 11:21:21 +0000 (11:21 +0000)]
Merge "CaptivePortalLoginActivity: improve logging"
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Sat, 22 Jul 2017 17:09:04 +0000 (17:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
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
TreeHugger Robot [Sat, 22 Jul 2017 17:02:45 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
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
TreeHugger Robot [Sat, 22 Jul 2017 16:55:48 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:55:05 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
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
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
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:39:09 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
69e41a4e9c -s ours
Change-Id: I9ee8162c0015297eee31e5254ee9347f92cbdc5c
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
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: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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Sat, 22 Jul 2017 00:35:10 +0000 (00:35 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
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
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
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
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
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
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
Steven Moreland [Fri, 21 Jul 2017 23:27:27 +0000 (23:27 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
am:
e8341b6148
Change-Id: I1337a9b40fdf762cc0150983536981f0a163750a
OSDN Git Service
