OSDN Git Service
Android Build Merger (Role) [Wed, 2 Aug 2017 16:20:03 +0000 (16:20 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
32d4e30778 am:
23123ece60" into oc-mr1-dev-plus-aosp
Felipe Leme [Wed, 2 Aug 2017 16:17:40 +0000 (16:17 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
32d4e30778
am:
23123ece60
Change-Id: I57fc9c13849c9e8ed8960fddbac888a19ad40924
Felipe Leme [Wed, 2 Aug 2017 16:17:39 +0000 (16:17 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
32d4e30778
am:
d25050e2a4
Change-Id: I46463fe043ce8e008a4587bba80c2a48c029fed9
Felipe Leme [Wed, 2 Aug 2017 16:09:20 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076
am:
32d4e30778
Change-Id: I5e3eff32fe5224d69bb41c4c4c48b880bc701c4b
Felipe Leme [Wed, 2 Aug 2017 16:09:13 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076
am:
32d4e30778
Change-Id: I8de50b81273e89298a6276d8b17100c90361380e
Felipe Leme [Wed, 2 Aug 2017 16:00:41 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am:
c8f0fd7076
Change-Id: Ida9652bb511ea0aa180e649992a9e5fa6409b2be
Felipe Leme [Wed, 2 Aug 2017 15:52:05 +0000 (15:52 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
Steven Moreland [Wed, 2 Aug 2017 15:38:40 +0000 (15:38 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am:
7d7c269944 am:
81972a18e4
am:
795bcc5b75
Change-Id: I6ef4e3b5c44272f5f0a8d585afea15a901178d2a
Bill Yi [Wed, 2 Aug 2017 15:30:44 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
e5ae77c679 -s ours
Change-Id: I40363a8dfa67eeb76bcef16a239a753582e94edd
Steven Moreland [Wed, 2 Aug 2017 15:30:37 +0000 (15:30 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am:
7d7c269944
am:
81972a18e4
Change-Id: Id008ba3508c972d8d27eebca22009b4823e387e0
Steven Moreland [Wed, 2 Aug 2017 15:22:09 +0000 (15:22 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
am:
7d7c269944
Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d
TreeHugger Robot [Wed, 2 Aug 2017 15:20:57 +0000 (15:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Todd Kennedy [Wed, 2 Aug 2017 15:16:23 +0000 (15:16 +0000)]
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
am:
a3735dc42e
Change-Id: I9698b051ffd874692476419bfd7a4bb115ec6ef7
TreeHugger Robot [Wed, 2 Aug 2017 15:08:37 +0000 (15:08 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
Bill Yi [Wed, 2 Aug 2017 15:04:55 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9f38e0f5e7 -s ours
Change-Id: I63a334e79ffeff50a02e1a428cfa8b9c6ceae4fa
Todd Kennedy [Wed, 2 Aug 2017 14:59:19 +0000 (14:59 +0000)]
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 14:49:10 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 2 Aug 2017 14:46:00 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9ce641fd81 -s ours
am:
5a4b06803d -s ours
Change-Id: I00ea5acfa526d81275424043bccb3455fd0d0d1b
Bill Yi [Wed, 2 Aug 2017 14:41:02 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9ce641fd81 -s ours
am:
0c411c32cd -s ours
Change-Id: Icb98d17a57ee254b3a5d3df7b4eee7332e14c35f
Bill Yi [Wed, 2 Aug 2017 14:36:03 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9ce641fd81 -s ours
Change-Id: I35fdc137ba9f079e4d632d2e62c5aacbb83e9ec4
Bill Yi [Wed, 2 Aug 2017 14:35:59 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9ce641fd81 -s ours
Change-Id: I1dff9545bf7cc357ef8d3bac8954d59c0c23b5c4
Todd Kennedy [Wed, 2 Aug 2017 14:33:09 +0000 (14:33 +0000)]
Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev
am:
5e049eb884
Change-Id: I27542404b197a9d11d611d95f271660856271d40
TreeHugger Robot [Wed, 2 Aug 2017 14:25:24 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Todd Kennedy [Wed, 2 Aug 2017 14:23:16 +0000 (14:23 +0000)]
Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev
Android Build Merger (Role) [Wed, 2 Aug 2017 12:34:29 +0000 (12:34 +0000)]
Merge "Merge "Refine condition for starting window skip" into oc-dr1-dev am:
612de053b8 am:
cf538b382a" into oc-mr1-dev-plus-aosp
Jorim Jaggi [Wed, 2 Aug 2017 12:32:27 +0000 (12:32 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev am:
612de053b8
am:
cf538b382a
Change-Id: Ia7c5f062b34475630817fefe5fc7ab68f4e0cdaf
Jorim Jaggi [Wed, 2 Aug 2017 12:32:24 +0000 (12:32 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev am:
612de053b8
am:
7269de217e
Change-Id: I1b5517489afa3da6c767bea99122a7c7fa05c3a1
Jorim Jaggi [Wed, 2 Aug 2017 12:23:06 +0000 (12:23 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
am:
612de053b8
Change-Id: I9147082d4776b451b487c74785af9df9e2590ca3
Jorim Jaggi [Wed, 2 Aug 2017 12:22:58 +0000 (12:22 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
am:
612de053b8
Change-Id: I687dad0a2177c8235e0a2acfd574a92a2a5cd6bb
Jorim Jaggi [Wed, 2 Aug 2017 12:15:40 +0000 (12:15 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
Bill Yi [Wed, 2 Aug 2017 07:57:25 +0000 (00:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d58d6708464b7254857c5fca1680bbf4f0212b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 2 Aug 2017 07:37:29 +0000 (00:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic83f9d7c74d8562b3d2637b6aca331ad7e3b2f0a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Tomoharu Hatano [Wed, 2 Aug 2017 06:08:07 +0000 (06:08 +0000)]
Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev
am:
5af90f9fc6
Change-Id: I1cb9fabb9d3308312962305b6eb5d22314eb49a5
TreeHugger Robot [Wed, 2 Aug 2017 06:01:04 +0000 (06:01 +0000)]
Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev
Jonathan Basseri [Wed, 2 Aug 2017 02:37:46 +0000 (02:37 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7 am:
7728849a39 am:
0fed7e3282
am:
96bfbcdcd4
Change-Id: I918dc3e55ca50416d6a92341e1f8b8eef33415fd
Jonathan Basseri [Wed, 2 Aug 2017 02:27:55 +0000 (02:27 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7 am:
7728849a39
am:
0fed7e3282
Change-Id: If811c7aa40c5be4b0ffcfa5addef8c4b147a1c71
Felipe Leme [Wed, 2 Aug 2017 02:10:35 +0000 (02:10 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
e971d933be
am:
35120d33fe -s ours
Change-Id: I3a921cd3ad150516480c181e305edeb0747ac922
Jonathan Basseri [Wed, 2 Aug 2017 02:07:20 +0000 (02:07 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8 am:
02cc8151a6 am:
aaeca1e977
am:
89a2a41572
Change-Id: I55d117ed2e61cd54b9e64034b0e5df8be00ce9e6
Jonathan Basseri [Wed, 2 Aug 2017 02:06:55 +0000 (02:06 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7
am:
7728849a39
Change-Id: Id7f000e7a67c53c8c3d26482a7d1697255943bf7
Jonathan Basseri [Wed, 2 Aug 2017 01:58:18 +0000 (01:58 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am:
85a215bae7
Change-Id: I30dddd90e5984519219865752f563a45962be593
Felipe Leme [Wed, 2 Aug 2017 01:57:16 +0000 (01:57 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
e971d933be
Change-Id: Id05a08413742ef94a426738fd0e82243c0553942
Jonathan Basseri [Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8 am:
02cc8151a6
am:
aaeca1e977
Change-Id: I9935e8825683fb23fc03e38a93380add8fe4408a
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit
6f4657363cac93ddcc718d9716e3b138f770f2e2.
Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
Felipe Leme [Wed, 2 Aug 2017 01:00:22 +0000 (01:00 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2 -s ours" into oc-mr1-dev
am:
0a0bc5f89d -s ours
Change-Id: I9285c5fd38a0ecd532e69d20baa29e54e18ec93e
Phil Weaver [Wed, 2 Aug 2017 00:55:44 +0000 (00:55 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev
am:
cdb70789d7
Change-Id: I9e53821d1cc2666187fd28f05203742c5325381e
Felipe Leme [Wed, 2 Aug 2017 00:51:45 +0000 (00:51 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2 -s ours
am:
dd187f4a82 -s ours
Change-Id: I66774912fda7acd0259644b45c40fd8d94086626
Android Build Merger (Role) [Wed, 2 Aug 2017 00:47:17 +0000 (00:47 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2 -s ours" into oc-mr1-dev
Felipe Leme [Wed, 2 Aug 2017 00:44:17 +0000 (00:44 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2
am:
4e051d9da9 -s ours
Change-Id: I31751578bdf17a66f0abae25375b14ce22a8cddb
Felipe Leme [Wed, 2 Aug 2017 00:44:00 +0000 (00:44 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
27eb322ed2 -s ours
Change-Id: I44079cc5dec0f7c513370ae9effdcd93180da38c
TreeHugger Robot [Wed, 2 Aug 2017 00:43:41 +0000 (00:43 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev
Felipe Leme [Wed, 2 Aug 2017 00:35:45 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
27eb322ed2 -s ours
Change-Id: I4e65c04b63813ef95ec8bb99e783dfe223ca7a5a
Felipe Leme [Wed, 2 Aug 2017 00:35:44 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
27eb322ed2
Change-Id: Ib78f7d5d690eff9a7b6c424600e1f0a300417b16
Felipe Leme [Wed, 2 Aug 2017 00:26:39 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am:
6829a1dace
Change-Id: I00eed7ae9679f117296ad1f7162e057720e69aab
Felipe Leme [Wed, 2 Aug 2017 00:26:37 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am:
6829a1dace
Change-Id: I41dec3cb31e6b523927717950f827f45dadabd8b
TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
Bill Yi [Tue, 1 Aug 2017 23:55:49 +0000 (16:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2c6419d6531613745bd3911f59bec65c2cbcbf51
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Tue, 1 Aug 2017 23:21:07 +0000 (23:21 +0000)]
Merge "Merge "Fix broken robotests." into oc-dr1-dev am:
a048e3c03f am:
8bf1f86606" into oc-mr1-dev-plus-aosp
Sundeep Ghuman [Tue, 1 Aug 2017 23:16:10 +0000 (23:16 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev am:
a048e3c03f
am:
8bf1f86606
Change-Id: I62028bca21ddcb1cdd2f9574615490c795a8cbd3
Sundeep Ghuman [Tue, 1 Aug 2017 23:15:30 +0000 (23:15 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev am:
a048e3c03f
am:
dbb97833c6
Change-Id: I46bbc7f6d9d4f4238a2d528abc88d2a87fd25f74
Sundeep Ghuman [Tue, 1 Aug 2017 22:47:07 +0000 (22:47 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
am:
a048e3c03f
Change-Id: If07fc6d27b94cd515f2b205ab2cd77bd84302942
Sundeep Ghuman [Tue, 1 Aug 2017 22:47:04 +0000 (22:47 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
am:
a048e3c03f
Change-Id: I35b3b811fed79b3aafef063df907dddcdc736ecd
Jonathan Basseri [Tue, 1 Aug 2017 22:44:01 +0000 (22:44 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8
am:
02cc8151a6
Change-Id: Ie3ef6584785cf976cd14fd9143bcf83c20506500
TreeHugger Robot [Tue, 1 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
Jonathan Basseri [Tue, 1 Aug 2017 22:34:44 +0000 (22:34 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
am:
58bbef15d8
Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
Selim Cinek [Tue, 1 Aug 2017 22:13:44 +0000 (22:13 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am:
bbd9264c46
am:
0bd1f34c47
Change-Id: Iffdde7a0d291a3eac2d7442273b8bf1b2b7e0346
Selim Cinek [Tue, 1 Aug 2017 22:06:10 +0000 (22:06 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am:
bbd9264c46
am:
61029fb091
Change-Id: I360bce398225ee78979a50e8a89c71f7e9506b82
Selim Cinek [Tue, 1 Aug 2017 21:58:35 +0000 (21:58 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am:
bbd9264c46
Change-Id: I7794e3dc60fb6379b1c3c3c7400be61e45c9a301
Selim Cinek [Tue, 1 Aug 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am:
bbd9264c46
Change-Id: I0e0d6fac50335a93b5ee15af75096d7db0389a70
Andrew Solovay [Tue, 1 Aug 2017 21:46:46 +0000 (21:46 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc" into oc-dr1-dev-plus-aosp
am:
ce4d45e399
Change-Id: I64fd78a2730cdb2565c56bdf75938029f4c3df75
Android Build Merger (Role) [Tue, 1 Aug 2017 21:43:41 +0000 (21:43 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
d4b1a0985b am:
517927fa1a" into oc-mr1-dev-plus-aosp
Andrew Solovay [Tue, 1 Aug 2017 21:39:34 +0000 (21:39 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
d4b1a0985b
am:
517927fa1a
Change-Id: I0c4515a1abd0d58b81fd0d4090a609507436ee4c
Andrew Solovay [Tue, 1 Aug 2017 21:39:26 +0000 (21:39 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc
am:
6ff61dbc51
Change-Id: I641281f7430fe2d9c168bf2eddbdcba6803dff96
TreeHugger Robot [Tue, 1 Aug 2017 21:37:00 +0000 (21:37 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 21:35:01 +0000 (21:35 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc" into oc-dr1-dev-plus-aosp
Andrew Solovay [Tue, 1 Aug 2017 21:32:05 +0000 (21:32 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
9e1b7759dc
Change-Id: Ief80079e0cda4aca334f513409c43feae3d34b28
Andrew Solovay [Tue, 1 Aug 2017 21:31:59 +0000 (21:31 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
9e1b7759dc
Change-Id: I9b6e9c02f2237c48fdac4fd6f0c4afc4eb8b03cd
Andrew Solovay [Tue, 1 Aug 2017 21:31:58 +0000 (21:31 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
d4b1a0985b
Change-Id: I18839e2c5c1f64639a7920d64f3271cd2d6dc1a4
Andrew Solovay [Tue, 1 Aug 2017 21:21:58 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: I8130d71136078d17196e198db6ff36f7f8489a5c
Andrew Solovay [Tue, 1 Aug 2017 21:21:01 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: Ifc47ddab2329814e39022b51510f4264937a3c04
Ruchi Kandoi [Tue, 1 Aug 2017 21:14:12 +0000 (21:14 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755 am:
1decea7847 am:
e6a08439b6
am:
49dc055ae6
Change-Id: I7ea323c190ee7535575b5dde82ebdc7a8234b0db
Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Lucas Dupin [Tue, 1 Aug 2017 21:04:39 +0000 (21:04 +0000)]
Merge "Volume slider content description" into oc-mr1-dev
am:
34c949d2dc
Change-Id: I2acce419f4fb34a0b2d9ae46680c4acbbad60668
Ruchi Kandoi [Tue, 1 Aug 2017 20:59:14 +0000 (20:59 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755 am:
1decea7847
am:
e6a08439b6
Change-Id: I80df7df67afa1e9a7dd4071d3005ef2e1ed0c004
Phil Weaver [Fri, 28 Jul 2017 19:58:15 +0000 (12:58 -0700)]
Make a11y shortcut dialog themeable
Bug:
64145430
Test: Brought up dialog. It's now blue.
Change-Id: Ib830734da43001260628133c05f3f3faee9c1563
(cherry picked from commit
5351872f4f033badbb176b273e38afb5d33b35b8)
Ruchi Kandoi [Tue, 1 Aug 2017 20:51:30 +0000 (20:51 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755
am:
1decea7847
Change-Id: Ic1548d625c7a3e025af95cd329dd9d4e5f69caef
Lucas Dupin [Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Volume slider content description" into oc-mr1-dev
Previr Rangroo [Tue, 1 Aug 2017 20:49:18 +0000 (20:49 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev
am:
2ca4449d6b
Change-Id: I164e07c43d0538835759e734cea871503431ceb9
Ruchi Kandoi [Tue, 1 Aug 2017 20:40:33 +0000 (20:40 +0000)]
Merge "Set default value for T3T_PMM."
am:
7770adf755
Change-Id: I31da06276b222d597b3834b4b912f4e0930ee6bc
Love Khanna [Tue, 1 Aug 2017 20:36:06 +0000 (20:36 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am:
756d93964d
am:
1ce17014ce
Change-Id: I2171884ee232c3a94e9f764a516dcb1e302789fc
Dianne Hackborn [Tue, 1 Aug 2017 20:32:19 +0000 (20:32 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()" into oc-mr1-dev
am:
47e6cc34bb
Change-Id: I8777f2dc71392fadfce534b1323e0f8ec8601427
TreeHugger Robot [Tue, 1 Aug 2017 20:31:01 +0000 (20:31 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev
Ruchi Kandoi [Tue, 1 Aug 2017 20:30:50 +0000 (20:30 +0000)]
Merge "Set default value for T3T_PMM."
Adam Cohen [Tue, 1 Aug 2017 20:27:07 +0000 (20:27 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am:
0151c395b5
am:
537c9c407e
Change-Id: Icf80d49a1541f57afcf77d4e7a59771f485ad47b
Love Khanna [Tue, 1 Aug 2017 20:22:09 +0000 (20:22 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am:
756d93964d
am:
7d8f6ab8e1
Change-Id: Ibb31cfee564cb74b23fdd2fd613829209e600500
Android Build Merger (Role) [Tue, 1 Aug 2017 20:16:06 +0000 (20:16 +0000)]
Merge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am:
7d08ca6e4d am:
d789b7b99f" into oc-mr1-dev-plus-aosp
Jason Monk [Tue, 1 Aug 2017 20:12:44 +0000 (20:12 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am:
7d08ca6e4d
am:
d789b7b99f
Change-Id: I1797d5fb9806f403ca113774382ed94d28f78f5d
Adam Cohen [Tue, 1 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am:
0151c395b5
am:
06a108c297
Change-Id: I45139ffa0da676ed80147f474d757600b725f585
OSDN Git Service
