OSDN Git Service
Sundong Ahn [Wed, 2 Aug 2017 17:43:02 +0000 (17:43 +0000)]
Merge "Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp am:
a4fb234a4c" into oc-mr1-dev-plus-aosp
am:
577653628b
Change-Id: Iea878b7dd7873e5c818afd34b0a035b38cc44db9
Dake Gu [Wed, 2 Aug 2017 17:34:16 +0000 (17:34 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev am:
8eb3a3979f
am:
8701a3231b
Change-Id: Id7c933c23d472184ff7d8b91d1587bcb0853207e
Steven Moreland [Wed, 2 Aug 2017 17:32:43 +0000 (17:32 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp am:
3750937e70
am:
5a37624e4a
Change-Id: I9fef0f8d0f5cebb546f371ac533521d88759f352
Android Build Merger (Role) [Wed, 2 Aug 2017 17:32:08 +0000 (17:32 +0000)]
Merge "Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp am:
a4fb234a4c" into oc-mr1-dev-plus-aosp
Dake Gu [Wed, 2 Aug 2017 17:27:53 +0000 (17:27 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev
am:
8eb3a3979f
Change-Id: I85950ec6275c2d10bd0e9b7f030fa5ce2c66130c
Sundong Ahn [Wed, 2 Aug 2017 17:27:38 +0000 (17:27 +0000)]
Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp
am:
a4fb234a4c
Change-Id: I026ca8c33ef2fce7d40e2daec8db970d6b578f25
Steven Moreland [Wed, 2 Aug 2017 17:23:53 +0000 (17:23 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
am:
3750937e70
Change-Id: I58257cf8a3f97ffec4cfef3a58ab8b87194295ea
Stan Iliev [Wed, 2 Aug 2017 17:19:27 +0000 (17:19 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec am:
fb3f29b608 am:
ccd3121379
am:
18e6f9c8ee
Change-Id: Id564f185689b3b9cd023d9467c664796ba7522ec
Dake Gu [Wed, 2 Aug 2017 17:18:00 +0000 (17:18 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev
Android Build Merger (Role) [Wed, 2 Aug 2017 17:16:57 +0000 (17:16 +0000)]
Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp
Sundong Ahn [Wed, 2 Aug 2017 17:14:55 +0000 (17:14 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7
am:
2785be7572
Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22
TreeHugger Robot [Wed, 2 Aug 2017 17:14:31 +0000 (17:14 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
Stan Iliev [Wed, 2 Aug 2017 17:10:57 +0000 (17:10 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec am:
fb3f29b608
am:
ccd3121379
Change-Id: I4f96e688549840198dee57cd85c4362d23e564d8
Sundong Ahn [Wed, 2 Aug 2017 17:05:56 +0000 (17:05 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612
am:
811027ede7
Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf
Stan Iliev [Wed, 2 Aug 2017 17:01:17 +0000 (17:01 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec
am:
fb3f29b608
Change-Id: I29cbdb6b741f0e4d84a12269607cdd32c6a51a74
Sundong Ahn [Wed, 2 Aug 2017 16:57:50 +0000 (16:57 +0000)]
Merge "Add hwbinder library"
am:
49e2a9a612
Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
Stan Iliev [Wed, 2 Aug 2017 16:52:20 +0000 (16:52 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad
am:
98eaf41eec
Change-Id: I3760a36d915f495fe8d4e457982440ff61934a6b
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"
Stan Iliev [Wed, 2 Aug 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
am:
8c9e5c81ad
Change-Id: I5d696089e13dc68115451c223646ef5e0688b330
Felipe Leme [Wed, 2 Aug 2017 16:31:46 +0000 (16:31 +0000)]
Merge "Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp am:
e3e338ed08" into oc-mr1-dev-plus-aosp
am:
71aebd1b25
Change-Id: I336989ba5e3cd6a3bfe7da0ba624f368352731ad
Felipe Leme [Wed, 2 Aug 2017 16:29:47 +0000 (16:29 +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
am:
f547615eae
Change-Id: I4b1c21c469eac345281b07601aa053f7d5665b7a
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
Felipe Leme [Wed, 2 Aug 2017 16:27:30 +0000 (16:27 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
32d4e30778 am:
d25050e2a4
am:
7b6cdb061a
Change-Id: I6d63b4c98d1da0ca03aab3efde14d3ebba8ecf0c
Garry Boyer [Wed, 2 Aug 2017 16:25:34 +0000 (16:25 +0000)]
Merge "Revert multi-package APK flag to off."
TreeHugger Robot [Wed, 2 Aug 2017 16:24:55 +0000 (16:24 +0000)]
Merge "Make ellipsize retry if text doesn't fit"
Android Build Merger (Role) [Wed, 2 Aug 2017 16:22:16 +0000 (16:22 +0000)]
Merge "Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp am:
e3e338ed08" into oc-mr1-dev-plus-aosp
Felipe Leme [Wed, 2 Aug 2017 16:20:40 +0000 (16:20 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp
am:
e3e338ed08
Change-Id: Id8f0b1623ed9b268d3cd45521a5e9965b8e3feeb
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
Android Build Merger (Role) [Wed, 2 Aug 2017 16:11:30 +0000 (16:11 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp
Felipe Leme [Wed, 2 Aug 2017 16:09:58 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076
am:
6f9f17475d
Change-Id: Ic1c671be822007e3d0493385e5ceba60f921b607
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 16:00:39 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am:
c8f0fd7076
Change-Id: I3a2419aa6244f01a54211ab60558cc729c29249e
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:47:36 +0000 (15:47 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am:
7d7c269944 am:
81972a18e4 am:
795bcc5b75
am:
c64c642e14
Change-Id: I7815db015b05c148ec7b62783a4843e0a4c04e90
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:38:35 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
e5ae77c679 -s ours
am:
2ef5de5dda -s ours
Change-Id: Iebd1a2a9787104ffa33a0aaf06157f89655959f9
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
Todd Kennedy [Wed, 2 Aug 2017 15:27:06 +0000 (15:27 +0000)]
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev am:
a3735dc42e
am:
7a8c6a39f5
Change-Id: I1d9e4b8d4aec4f9a81d5a0a4d0d520327321f79f
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
Bill Yi [Wed, 2 Aug 2017 15:14:01 +0000 (15:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
9f38e0f5e7 -s ours
am:
d848c25c8d -s ours
Change-Id: I9f3e1aa8317c2fab5bca1b8af67e746ecc6fd7a4
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
Bill Yi [Wed, 2 Aug 2017 14:58:44 +0000 (14:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 2 Aug 2017 14:56:51 +0000 (14:56 +0000)]
Merge "Import translations. DO NOT MERGE"
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
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
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
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
Bill Yi [Wed, 2 Aug 2017 07:16:15 +0000 (00:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18b8424415b793d5ce72a08ab9d1a40c7e99f624
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
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
Delete dead code function SpotShadow::makeClockwise
Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.
Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit
fdb625a309755fb762c448dd8c2c4e3a7cc26021)
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
OSDN Git Service
