OSDN Git Service
Bill Yi [Wed, 2 Aug 2017 14:54:16 +0000 (14:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9ce641fd81 -s ours am:
5a4b06803d -s ours
am:
eaff05d66a -s ours
Change-Id: Ic9184bc02b04417c7b338e13bfc1ddddb723b49d
Bill Yi [Wed, 2 Aug 2017 14:52:34 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9ce641fd81 -s ours am:
0c411c32cd -s ours
am:
ff70153aa4 -s ours
Change-Id: I5e5581e6432da36638b2092c9dbef4f40ddc1c1b
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
Todd Kennedy [Wed, 2 Aug 2017 14:43:36 +0000 (14:43 +0000)]
Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev am:
5e049eb884
am:
a1cb029caf
Change-Id: I9454b85835e0deb8264f7371748aad90cf04a42d
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
Jorim Jaggi [Wed, 2 Aug 2017 12:42:52 +0000 (12:42 +0000)]
Merge "Merge "Refine condition for starting window skip" into oc-dr1-dev am:
612de053b8 am:
cf538b382a" into oc-mr1-dev-plus-aosp
am:
013027ce3d
Change-Id: Idf558d46f97e72d6f2056845390adb9e8ef13870
Jorim Jaggi [Wed, 2 Aug 2017 12:41:03 +0000 (12:41 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev am:
612de053b8 am:
7269de217e
am:
0c4d9deb7c
Change-Id: If81a3f68da4f8e9ac585e7e1cdc7b1fdc8421304
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
Benjamin Franz [Wed, 2 Aug 2017 11:26:48 +0000 (11:26 +0000)]
Merge "Add unit tests to ActivityStarterInterceptor"
TreeHugger Robot [Wed, 2 Aug 2017 09:13:31 +0000 (09:13 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
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
Tomoharu Hatano [Wed, 2 Aug 2017 06:23:32 +0000 (06:23 +0000)]
Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev am:
5af90f9fc6
am:
38b792bed6
Change-Id: Ie5b2854bd9c3081dbcd4e405f7733abe3767e12a
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:48:34 +0000 (02:48 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7 am:
7728849a39 am:
0fed7e3282 am:
96bfbcdcd4
am:
e022fa6aae
Change-Id: I1cf136e877afae4a6124559fad333a8227273ffc
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:24:18 +0000 (02:24 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
e971d933be am:
35120d33fe -s ours
am:
26d1efd203 -s ours
Change-Id: I93c97ee1e12b18ed3e11cb243fb3e35b4ab1dcb3
Jonathan Basseri [Wed, 2 Aug 2017 02:17:23 +0000 (02:17 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8 am:
02cc8151a6 am:
aaeca1e977 am:
89a2a41572
am:
ab7c6a22a9
Change-Id: I2068039632b86f24b00b733151741b324cf6d4c9
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.""
Tadashi G. Takaoka [Wed, 2 Aug 2017 01:36:33 +0000 (01:36 +0000)]
Merge "Add test for InputMethodSubtypePreference"
TreeHugger Robot [Wed, 2 Aug 2017 01:23:52 +0000 (01:23 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."
Felipe Leme [Wed, 2 Aug 2017 01:19:24 +0000 (01:19 +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
am:
1f583d65bf -s ours
Change-Id: I683b81238d8e6e25034f55bc0a126810e0057621
Phil Weaver [Wed, 2 Aug 2017 01:12:49 +0000 (01:12 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev am:
cdb70789d7
am:
256a31e25b
Change-Id: Ibf0a6b4f206978c48932c0d55a8dea9ac3bc1a60
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:02:14 +0000 (01:02 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2 -s ours am:
dd187f4a82 -s ours
am:
daa88a8287 -s ours
Change-Id: I65256881e1ddcd602f22ddd84b494c44e3c6ee39
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
Felipe Leme [Wed, 2 Aug 2017 00:59:22 +0000 (00:59 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2 am:
4e051d9da9 -s ours
am:
b2abf99244 -s ours
Change-Id: Id926a99ec7d6868f042b41b38fbf8dbbb4d6aa74
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
Seigo Nonaka [Wed, 2 Aug 2017 00:29:48 +0000 (00:29 +0000)]
Merge "Remove obsolete comment"
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
Sundeep Ghuman [Tue, 1 Aug 2017 23:29:55 +0000 (23:29 +0000)]
Merge "Merge "Fix broken robotests." into oc-dr1-dev am:
a048e3c03f am:
8bf1f86606" into oc-mr1-dev-plus-aosp
am:
5a85d6039c
Change-Id: I292ed821510027f87b01a21c7cffd8e427318e6b
Sundeep Ghuman [Tue, 1 Aug 2017 23:26:39 +0000 (23:26 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev am:
a048e3c03f am:
dbb97833c6
am:
4150fbacc8
Change-Id: I5098e205386b3f25e8bb573115fdec14654d9bdd
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
Siyamed Sinir [Tue, 1 Aug 2017 22:37:55 +0000 (22:37 +0000)]
Merge "Fix EditText cursor when line spacing is set"
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."
Selim Cinek [Tue, 1 Aug 2017 22:25:24 +0000 (22:25 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am:
bbd9264c46 am:
0bd1f34c47
am:
76f4dd767b
Change-Id: Ide7d5d3aedaf4284f7b16df1d07149cd7aec5a2d
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:18:27 +0000 (22:18 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am:
bbd9264c46 am:
61029fb091
am:
6359dcd7fb
Change-Id: Ic15d15ed1750fc85cdbd3176ba0e1bb087c66dde
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
Andrew Solovay [Tue, 1 Aug 2017 22:03:32 +0000 (22:03 +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
am:
97d49c65ad
Change-Id: Ic8c25df8a7686551100edde91df17b944983ded0
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:53:53 +0000 (21:53 +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
am:
7f218c3a7b
Change-Id: I597c714d81db2e8f51b9bf803a002d21fe7143c3
Andrew Solovay [Tue, 1 Aug 2017 21:48:14 +0000 (21:48 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc am:
6ff61dbc51
am:
49f6afe2f8
Change-Id: I0fd57ed371ae915ee33aa77e198b17eb9e9c8df9
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
Ruchi Kandoi [Tue, 1 Aug 2017 21:32:53 +0000 (21:32 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755 am:
1decea7847 am:
e6a08439b6 am:
49dc055ae6
am:
93339c9ab9
Change-Id: I096f4c1b232456b3ec5f311b366cd91d817c43dc
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
Seigo Nonaka [Tue, 1 Aug 2017 21:24:28 +0000 (14:24 -0700)]
Remove obsolete comment
Bug:
11750374
Test: N/A
Change-Id: I50a264f01ff04c87a4b86f80fb38ec69d30d3241
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
Lucas Dupin [Tue, 1 Aug 2017 21:16:36 +0000 (21:16 +0000)]
Merge "Volume slider content description" into oc-mr1-dev am:
34c949d2dc
am:
dbcd84452f
Change-Id: I6f21b047d32787af75d061e841e9bd9fbe7c8f7a
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
Previr Rangroo [Tue, 1 Aug 2017 21:07:50 +0000 (21:07 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev am:
2ca4449d6b
am:
20efa0bce6
Change-Id: I3394825fb00c3409142c10c88fe44d2a622ece6f
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
Love Khanna [Tue, 1 Aug 2017 21:01:49 +0000 (21:01 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am:
756d93964d am:
1ce17014ce
am:
c292478022
Change-Id: If59a66ad9a95c2fd8c3ff0ee9fb96c16db304778
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
Dianne Hackborn [Tue, 1 Aug 2017 20:58:43 +0000 (20:58 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()" into oc-mr1-dev am:
47e6cc34bb
am:
e4a04e87d1
Change-Id: I16ef18b31ad25254dd2009a04ffc7e532d5e2694
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)
OSDN Git Service
