OSDN Git Service
Android Build Merger (Role) [Fri, 23 Jun 2017 15:32:57 +0000 (15:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours am:
53f4db5612 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 23 Jun 2017 15:30:56 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours
am:
53f4db5612 -s ours
Change-Id: I74facd707fb3203105b66d6853052bef461e4419
Bill Yi [Fri, 23 Jun 2017 15:30:52 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b39c08f9d7 -s ours
am:
3cd12a1ca7 -s ours
Change-Id: Ibf672901baeae0668e40f04c37b2ab56801b5864
Bill Yi [Fri, 23 Jun 2017 15:21:28 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: I32484f5c5715c17c439d5ff20fcd8e46b8061c18
Bill Yi [Fri, 23 Jun 2017 15:21:23 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
64465df428 -s ours
Change-Id: Iec197b243600ad21d9e58b272961d3d9ba167f42
Bill Yi [Fri, 23 Jun 2017 15:21:22 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: Ib2921d235716e858bddbbb2e3a9588b4133d9c84
TreeHugger Robot [Fri, 23 Jun 2017 15:12:07 +0000 (15:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 15:11:46 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 23 Jun 2017 15:11:07 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
ccaf50b6a7 -s ours
Change-Id: I95cc8323a6e20d4cdc604dafd0b268fcb42b66d9
TreeHugger Robot [Fri, 23 Jun 2017 15:01:06 +0000 (15:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Android Build Merger (Role) [Fri, 23 Jun 2017 12:58:59 +0000 (12:58 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours am:
8c311afb87 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 23 Jun 2017 12:58:10 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours
am:
8c311afb87 -s ours
Change-Id: Ic0d5736c5d040abc951562fdc984359f76e9e348
Bill Yi [Fri, 23 Jun 2017 12:56:45 +0000 (12:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d406f38d24 -s ours
am:
08947751fd -s ours
Change-Id: I62dfb3722c51f91adc59a568c6d92e0e608bbf50
Winson Chung [Fri, 23 Jun 2017 12:51:36 +0000 (12:51 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d" into oc-dr1-dev
am:
fda69197b1
Change-Id: Ib653a64b6b5d700ebad94cd07a0fb353080a0e8d
Bill Yi [Fri, 23 Jun 2017 12:49:16 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9c543b5a06 -s ours
Change-Id: I4a776102e1ecdfc0da70e0a6a91f0b49e5854edc
Bill Yi [Fri, 23 Jun 2017 12:49:12 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I898195fead15228c4e4fa5617dacbddfc90dc6e2
Bill Yi [Fri, 23 Jun 2017 12:49:11 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I45a76be2cec8829147d9ac4569da2087bf6722bd
Android Build Merger (Role) [Fri, 23 Jun 2017 12:46:05 +0000 (12:46 +0000)]
Merge "Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e am:
1b4b326128 am:
17bb92fe14" into oc-dr1-dev-plus-aosp
Vladimir Marko [Fri, 23 Jun 2017 12:45:17 +0000 (12:45 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e am:
1b4b326128
am:
17bb92fe14
Change-Id: I08ab885e0b4373074e5eba3d36dcbb73c87458dc
Android Build Merger (Role) [Fri, 23 Jun 2017 12:44:54 +0000 (12:44 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d am:
a8e14f2448" into oc-dr1-dev-plus-aosp
Winson Chung [Fri, 23 Jun 2017 12:44:01 +0000 (12:44 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d
am:
a8e14f2448
Change-Id: I2a53a421fbfc3d97309b8b4be1a1a7b215f0c3a1
Android Build Merger (Role) [Fri, 23 Jun 2017 12:43:32 +0000 (12:43 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7 am:
7a3df45483" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 23 Jun 2017 12:42:49 +0000 (12:42 +0000)]
Merge "Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev am:
72b2701fbb" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 23 Jun 2017 12:42:32 +0000 (12:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Roshan Pius [Fri, 23 Jun 2017 12:42:12 +0000 (12:42 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7
am:
7a3df45483
Change-Id: I9aad81e9015ac22d43c2864ec58213ccb22df54d
Android Build Merger (Role) [Fri, 23 Jun 2017 12:41:42 +0000 (12:41 +0000)]
Merge "Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 am:
ba12631bba -s ours" into oc-dr1-dev-plus-aosp
Roshan Pius [Fri, 23 Jun 2017 12:41:37 +0000 (12:41 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev
am:
72b2701fbb
Change-Id: I1ba02ea48136820e8e8efb77421849a1abb47266
Seigo Nonaka [Fri, 23 Jun 2017 12:41:01 +0000 (12:41 +0000)]
Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1
am:
ba12631bba -s ours
Change-Id: If5124a045069500c2cf3c52da2533603de5e4816
Neil Fuller [Fri, 23 Jun 2017 12:38:04 +0000 (12:38 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev
am:
1ef5cb531d -s ours
Change-Id: I1e4aa0af645bd9dc34e0ebd0ad9ab091d2049aee
Android Build Merger (Role) [Fri, 23 Jun 2017 12:37:23 +0000 (12:37 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 12:36:43 +0000 (12:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Winson Chung [Fri, 23 Jun 2017 12:35:23 +0000 (12:35 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
am:
cd73cc4c6d
Change-Id: I322cf9616694457762181657a2b51f8a3aff5911
Seigo Nonaka [Fri, 23 Jun 2017 12:35:19 +0000 (12:35 +0000)]
Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 -s ours
am:
2629b0c1a0 -s ours
Change-Id: Ie753fcbec56aab3a6718140a71a0d7e44e4a23dd
Android Build Merger (Role) [Fri, 23 Jun 2017 12:29:41 +0000 (12:29 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev
Neil Fuller [Fri, 23 Jun 2017 12:28:31 +0000 (12:28 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev
Roshan Pius [Fri, 23 Jun 2017 12:28:27 +0000 (12:28 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
am:
db11f55cb7
Change-Id: Id9cb3a6211cf516875c6ad4ac10058bb352ebd46
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit
6d6cd68660635d670b0cb17f348b7c1da13704b3)
Seigo Nonaka [Fri, 23 Jun 2017 12:23:36 +0000 (12:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1 -s ours
Change-Id: Ib6375fdfa9295add1e4d53f220f3b8d22f48b855
Vladimir Marko [Fri, 23 Jun 2017 10:55:48 +0000 (10:55 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e
am:
1b4b326128
Change-Id: I165243924444f89ee880072c55eba012ccf1d149
Vladimir Marko [Fri, 23 Jun 2017 10:45:32 +0000 (10:45 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()."
am:
a634b38c8e
Change-Id: I5d80b7a76f1d9b3d7bfc152994551f0cd6defaba
Vladimir Marko [Fri, 23 Jun 2017 10:36:00 +0000 (10:36 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()."
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit
6d6cd68660635d670b0cb17f348b7c1da13704b3)
Bill Yi [Fri, 23 Jun 2017 07:43:50 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib851156b7d64c1f1c3ea398dc1d80602219d2c0f
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 07:39:00 +0000 (00:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iadf46b732ac29fc836edaf04a53062fb554a3b6a
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 05:35:07 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I78bf0588f7daa39637f7e64922fad7081229d0a3
Auto-generated-cl: translation import
Winson Chung [Fri, 23 Jun 2017 05:24:01 +0000 (05:24 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
am:
cd73cc4c6d
Change-Id: I380e262ab207e06b8a07b210d47cbc1294ba26f0
TreeHugger Robot [Fri, 23 Jun 2017 05:16:08 +0000 (05:16 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
Roshan Pius [Fri, 23 Jun 2017 04:33:13 +0000 (04:33 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
am:
db11f55cb7
Change-Id: I9131d29ad8e192e7af7c596fb5d954e040adb968
Android Build Merger (Role) [Fri, 23 Jun 2017 04:31:45 +0000 (04:31 +0000)]
Merge "Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf am:
41b743d8ad" into oc-dr1-dev-plus-aosp
Daniel Nishi [Fri, 23 Jun 2017 04:28:41 +0000 (04:28 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf
am:
58ad534db8
Change-Id: Ibef96b005e6227cd20c834b238f3561f2d7e218f
Daniel Nishi [Fri, 23 Jun 2017 04:28:37 +0000 (04:28 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf
am:
41b743d8ad
Change-Id: Ie55bd4b478a3ca4ea475132ade37f03a0b9b4a00
TreeHugger Robot [Fri, 23 Jun 2017 04:26:45 +0000 (04:26 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
Seigo Nonaka [Fri, 23 Jun 2017 04:23:44 +0000 (04:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1
Change-Id: I5518dbd8b5d8a4548ea00bbfca0e3aee87880ee7
Daniel Nishi [Fri, 23 Jun 2017 04:19:13 +0000 (04:19 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
am:
f14c1e12cf
Change-Id: Ied7c80b4b9e58fa0d5b31e7a7bce33028e55337b
Daniel Nishi [Fri, 23 Jun 2017 04:19:10 +0000 (04:19 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
am:
f14c1e12cf
Change-Id: I48c0c952d4679304d1adcda238e93c6bdd133110
TreeHugger Robot [Fri, 23 Jun 2017 04:10:42 +0000 (04:10 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 04:09:32 +0000 (04:09 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
Bill Yi [Fri, 23 Jun 2017 03:47:22 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e7e2885713047eef21b2885aa82aec71a5f5aa8
Auto-generated-cl: translation import
Marie Janssen [Fri, 23 Jun 2017 03:47:09 +0000 (03:47 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse" am:
5a56873612 am:
3205ff1331
am:
f71b0bedcf
Change-Id: I615f8f2d16d2dd17fcbd5df20378766096631eeb
Marie Janssen [Fri, 23 Jun 2017 03:38:17 +0000 (03:38 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse" am:
5a56873612
am:
3205ff1331
Change-Id: I0cd44ad8d22da154d0bf666b9075a3fcbc655439
Bill Yi [Fri, 23 Jun 2017 03:30:02 +0000 (20:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7eaecd7d11d7c8d5779009e32885c93ad7e8e2f
Auto-generated-cl: translation import
Marie Janssen [Fri, 23 Jun 2017 03:28:34 +0000 (03:28 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse"
am:
5a56873612
Change-Id: Ie202361631f9268055a190c8606e07d89dc349d4
Marie Janssen [Fri, 23 Jun 2017 03:17:35 +0000 (03:17 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse"
Android Build Merger (Role) [Fri, 23 Jun 2017 02:29:25 +0000 (02:29 +0000)]
Merge "Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898 am:
13df994243" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Fri, 23 Jun 2017 02:27:28 +0000 (02:27 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898
am:
e30da86a46
Change-Id: Idad772522638c93a1d2a042aa374ec2cabf55167
Wale Ogunwale [Fri, 23 Jun 2017 02:27:23 +0000 (02:27 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898
am:
13df994243
Change-Id: Ia38529b06e7859884531f945fa32770017f11467
Wale Ogunwale [Fri, 23 Jun 2017 02:19:26 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I5b73df5e46d26d2008dba7a34345a0c37c099514
Wale Ogunwale [Fri, 23 Jun 2017 02:19:25 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I36a34d029f75195d4a865affef5257f1d4aa5d50
TreeHugger Robot [Fri, 23 Jun 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
Badhri Jagan Sridharan [Fri, 23 Jun 2017 02:07:57 +0000 (02:07 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
am:
025b07c38e
Change-Id: Icd1d42fd0fb301f68dae38a242760035c1f6dfec
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
This CL contains Iac2a6fb3d82ef23d5ca6ee33f4aaa9ed28455271 by manual
merging to handle repository split.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
TreeHugger Robot [Fri, 23 Jun 2017 01:58:19 +0000 (01:58 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
Daniel Nishi [Fri, 23 Jun 2017 01:53:03 +0000 (18:53 -0700)]
Add in the getCacheQuotaBytes method to wrapper.
Bug:
62623731
Test: Settings Unit Test
Change-Id: Ibd779c7d9e60c44440483489b231ba0715321bc1
Android Build Merger (Role) [Fri, 23 Jun 2017 00:48:12 +0000 (00:48 +0000)]
Merge "Improved documentation for AutofillService package: am:
2ef19c1d73 am:
91d763f1b5" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 23 Jun 2017 00:44:53 +0000 (00:44 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73
am:
91d763f1b5
Change-Id: Iecf6e6d7f5461f944b1f3e23e9f97ccca5029983
Felipe Leme [Fri, 23 Jun 2017 00:44:47 +0000 (00:44 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73
am:
472b4c834f
Change-Id: I9636c277b82569e6ffa684df26358a6a7c36d3c2
Felipe Leme [Fri, 23 Jun 2017 00:36:37 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: Iac283d34da149829a25313d0910f2564b347e332
Felipe Leme [Fri, 23 Jun 2017 00:36:35 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: I67d6649d4acb84ebb598c1ebceb3c3ed58cfd0c0
Charlie Wang [Thu, 22 Jun 2017 23:47:55 +0000 (23:47 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
am:
d43bc31eb7
Change-Id: I4a82f38e753d7ba61ec37b7ecd959e588eee21e3
Wale Ogunwale [Thu, 22 Jun 2017 23:43:53 +0000 (16:43 -0700)]
Dump user id in dumpsys activity starter
To help with ANR debugging.
Test: adb shell dumpsys activity starter
Bug:
38121026
Change-Id: I96d530662e6a362b817df3ca8410cb173a2c0dd4
Badhri Jagan Sridharan [Thu, 22 Jun 2017 23:39:47 +0000 (16:39 -0700)]
Log call to setPortRoles
Came of bunch of bugs, for instance b/
62912250 where some app is
forcing the port role. Logging which package is doing this
Change-Id: I234db3292326d247c82723989b46160fcbd59c10
Charlie Wang [Thu, 22 Jun 2017 23:35:20 +0000 (23:35 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
Ying Xu [Thu, 22 Jun 2017 23:29:50 +0000 (23:29 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
am:
9523a12b95 -s ours
Change-Id: I4b2f10eab109ef9e912fd0a6674fa3e7341b1e8d
Roshan Pius [Thu, 22 Jun 2017 18:36:53 +0000 (11:36 -0700)]
WifiEnterpriseConfig: New copy method to ignore masked password
To ignore the masked password sent by apps, add a new copy-constructor
equivalent method which will ignore the masked password.
Bug:
62893342
Test: Unit tests.
Test: Manual tests with the linked CL.
Test: Regression tests.
Change-Id: Ib208dcd94a888e07a9b3dc0442620233ea7791e5
Ying Xu [Thu, 22 Jun 2017 23:19:57 +0000 (23:19 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
Siddharth Ray [Thu, 22 Jun 2017 23:05:24 +0000 (23:05 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
am:
424e517d5d
Change-Id: I4d7c458c02e3de1d707c6314102bb8b00fe2bda6
TreeHugger Robot [Thu, 22 Jun 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
Stephen Chen [Thu, 22 Jun 2017 22:56:27 +0000 (22:56 +0000)]
Add strings for revamped Wi-Fi ONA notification.
am:
2e8351b308
Change-Id: I0ceb50c182c3ea023167915d28cf04d79f75d8eb
Alan Leung [Thu, 22 Jun 2017 22:50:42 +0000 (22:50 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
am:
643275b838
Change-Id: Idb669d7b381f8291fb44dcc5a4d1824d118319d9
Todd Kennedy [Thu, 22 Jun 2017 22:47:18 +0000 (22:47 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e
am:
921fc1426f
Change-Id: I322d7d8b576e00ad10d85d462873c10cce712951
Stephen Chen [Wed, 7 Jun 2017 22:49:13 +0000 (15:49 -0700)]
Add strings for revamped Wi-Fi ONA notification.
Bug:
37357441
Test: n/a
Change-Id: Ib32581f044db9827a700be8af1864af15f6dbb3e
Android Build Merger (Role) [Thu, 22 Jun 2017 22:37:54 +0000 (22:37 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 22:36:49 +0000 (22:36 +0000)]
Merge "Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
20fad610b9" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e
am:
20fad610b9
Change-Id: I6d6fd8f320fef01c2a89463ce0f72f0f880e1e45
Android Build Merger (Role) [Thu, 22 Jun 2017 22:34:52 +0000 (22:34 +0000)]
Merge "Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
9e391f9f86" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:06 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: I13cf0e00de235d0bbdb79aa553e04386c519975d
Alan Leung [Thu, 22 Jun 2017 22:34:29 +0000 (22:34 +0000)]
Merge "ASM Priority Boost Tool" am:
8ff8dd16cc
am:
8ac18ceb8a
Change-Id: I68f86f307368de6870a7d649118d1a0f8c744a88
Rob Carr [Thu, 22 Jun 2017 22:33:51 +0000 (22:33 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
9e391f9f86
Change-Id: I8566d935ec735b360af54998599a8ce185fcf9ee
Rob Carr [Thu, 22 Jun 2017 22:32:07 +0000 (22:32 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
874b6402af
Change-Id: I3db14694bc27e9fed16b5efec6aba99570b89675
Todd Kennedy [Thu, 22 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: Ia20de35097f3b5b139afc5ccee59d71584f59a3a
OSDN Git Service
