OSDN Git Service
Manu Cornet [Wed, 18 Jan 2017 23:45:56 +0000 (23:45 +0000)]
2D Recents: to and from home, animate task views as a block am:
45c8048f4f
am:
7c80558c6c
Change-Id: I85f98e34528cb810ae27f423ec999605af70957e
TreeHugger Robot [Wed, 18 Jan 2017 23:42:52 +0000 (23:42 +0000)]
Merge "Have requestRecommendation return a CompletableFuture."
Christine Franks [Wed, 18 Jan 2017 23:41:43 +0000 (23:41 +0000)]
Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev am:
64a16be2ba
am:
1ee8470c0a -s ours
Change-Id: If308100e44ef4e8cc7324a66d6a73db0378bde50
Christine Franks [Wed, 18 Jan 2017 23:40:51 +0000 (23:40 +0000)]
DO NOT MERGE - Fix demo mode reset notification am:
b189aa6cf8
am:
38d2c0e6bc -s ours
Change-Id: I9dd5281575fe82795dbe4d8b1fa51e9b9f021d7d
Daichi Hirono [Wed, 18 Jan 2017 23:39:56 +0000 (23:39 +0000)]
Merge "Add isChildDocument to MtpDocumentsProvider." into nyc-mr2-dev am:
32a16bada4
am:
69cfdbf176
Change-Id: I4e9e00b63ac49946408cf6eae9cf6ff4d786cb2f
Daichi Hirono [Wed, 18 Jan 2017 23:39:01 +0000 (23:39 +0000)]
Add isChildDocument to MtpDocumentsProvider. am:
ef161dd6ef
am:
45988ba2ba -s ours
Change-Id: I5196b2d34f94842250a52bab470b9c98898d6222
Manu Cornet [Wed, 18 Jan 2017 23:37:34 +0000 (23:37 +0000)]
2D Recents: to and from home, animate task views as a block
am:
45c8048f4f
Change-Id: If1ac217e5ee00ead66f87c5031203a7a95f8122d
TreeHugger Robot [Wed, 18 Jan 2017 23:35:24 +0000 (23:35 +0000)]
Merge "Revert "MediaBrowserService: Add a constant for suggestion keywords""
Christine Franks [Wed, 18 Jan 2017 23:30:08 +0000 (23:30 +0000)]
Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev
am:
64a16be2ba
Change-Id: I27a89bac34e54f8ed06a8a7c7952348d7aa64da1
Christine Franks [Wed, 18 Jan 2017 23:30:04 +0000 (23:30 +0000)]
DO NOT MERGE - Fix demo mode reset notification
am:
b189aa6cf8
Change-Id: I0a96270ba9f8c52339af500b7fe4d8df0e7f4254
Christine Franks [Wed, 18 Jan 2017 23:24:44 +0000 (23:24 +0000)]
Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev
Jorim Jaggi [Wed, 18 Jan 2017 23:23:08 +0000 (23:23 +0000)]
Merge "Add null-check when adding starting window"
Jorim Jaggi [Wed, 18 Jan 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Make sure to release surface"
Daichi Hirono [Wed, 18 Jan 2017 23:17:40 +0000 (23:17 +0000)]
Merge "Add isChildDocument to MtpDocumentsProvider." into nyc-mr2-dev
am:
32a16bada4
Change-Id: I982f95023ac5e8208a4916781333b1182eb888fc
Daichi Hirono [Wed, 18 Jan 2017 23:17:35 +0000 (23:17 +0000)]
Add isChildDocument to MtpDocumentsProvider.
am:
ef161dd6ef
Change-Id: I4e3ff0f01f9355f3884365007743702bc58fe336
TreeHugger Robot [Wed, 18 Jan 2017 23:09:38 +0000 (23:09 +0000)]
Merge "Add isChildDocument to MtpDocumentsProvider." into nyc-mr2-dev
Daichi Hirono [Wed, 18 Jan 2017 23:09:28 +0000 (23:09 +0000)]
Merge "Not create document under the device." into nyc-mr2-dev am:
4b2542315f
am:
ebdb09f2c9
Change-Id: Iead7e364394e05df41840513084ff7dfa3d30d2d
Daichi Hirono [Wed, 18 Jan 2017 23:08:17 +0000 (23:08 +0000)]
Not create document under the device. am:
d909f805a2
am:
b322c42594
Change-Id: I4d64a1a731e5fadb7fa4137ec95764a3ec18bbef
TreeHugger Robot [Wed, 18 Jan 2017 23:06:31 +0000 (23:06 +0000)]
Merge "Notifications: Clear animation start visible type when not animating"
Daichi Hirono [Wed, 18 Jan 2017 23:02:12 +0000 (23:02 +0000)]
Merge "Not create document under the device." into nyc-mr2-dev
am:
4b2542315f
Change-Id: Ifb0f7a8814fec42d6919f8aebaccc1c06a315dd0
Daichi Hirono [Wed, 18 Jan 2017 23:02:05 +0000 (23:02 +0000)]
Not create document under the device.
am:
d909f805a2
Change-Id: Iabbe29ef5d97c8539449cc97a4e7260468f995da
TreeHugger Robot [Wed, 18 Jan 2017 22:56:25 +0000 (22:56 +0000)]
Merge "Add primaryContentAlpha attribute"
TreeHugger Robot [Wed, 18 Jan 2017 22:54:36 +0000 (22:54 +0000)]
Merge "Not create document under the device." into nyc-mr2-dev
Android Build Merger (Role) [Wed, 18 Jan 2017 22:51:46 +0000 (22:51 +0000)]
Merge "Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev am:
2a147464f6 am:
1ca4f25052"
Jiaquan He [Wed, 18 Jan 2017 22:51:02 +0000 (22:51 +0000)]
Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev am:
2a147464f6
am:
1ca4f25052
Change-Id: I71e7aebdb910a98c9125cd00787f60526b158d39
Android Build Merger (Role) [Wed, 18 Jan 2017 22:50:33 +0000 (22:50 +0000)]
Merge "Add keyboard support to Grid-based Recents. am:
21f495f07b am:
de934359ef"
Jiaquan He [Wed, 18 Jan 2017 22:49:35 +0000 (22:49 +0000)]
Add keyboard support to Grid-based Recents. am:
21f495f07b
am:
de934359ef
Change-Id: I224b4576c4ebf1e200003d554916b52a1319a387
Android Build Merger (Role) [Wed, 18 Jan 2017 22:49:15 +0000 (22:49 +0000)]
Merge "Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev am:
a88749fb51 am:
bcbd0231a4"
Jiaquan He [Wed, 18 Jan 2017 22:48:24 +0000 (22:48 +0000)]
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev am:
a88749fb51
am:
bcbd0231a4
Change-Id: I8f5b7641a681b5e10cc1ace6a87a7d70ecf61f75
Android Build Merger (Role) [Wed, 18 Jan 2017 22:48:03 +0000 (22:48 +0000)]
Merge "2D Recents: Fix issue with undocking only one task am:
244bac6c8b am:
9e844c125b"
Jiaquan He [Wed, 18 Jan 2017 22:47:15 +0000 (22:47 +0000)]
2D Recents: Fix issue with undocking only one task am:
244bac6c8b
am:
9e844c125b
Change-Id: I37d36de574885fab286ad9f46f1289ead3bde603
Android Build Merger (Role) [Wed, 18 Jan 2017 22:46:52 +0000 (22:46 +0000)]
Merge "Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
b6973a8c82 -s ours" into nyc-mr2-dev-plus-aosp am:
d45dd11045 -s ours"
Android Build Merger (Role) [Wed, 18 Jan 2017 22:46:31 +0000 (22:46 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
b6973a8c82 -s ours am:
5688955071 -s ours"
Jorim Jaggi [Wed, 18 Jan 2017 22:46:20 +0000 (22:46 +0000)]
Merge "Follow-up for I01e81b9cd11886da734da671c68d5732aa51009f"
Svet Ganov [Wed, 18 Jan 2017 22:45:32 +0000 (22:45 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
b6973a8c82 -s ours" into nyc-mr2-dev-plus-aosp
am:
d45dd11045 -s ours
Change-Id: Iba346d5c9fa3efccb3c482b446b26704ff8677be
Svet Ganov [Wed, 18 Jan 2017 22:45:28 +0000 (22:45 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
b6973a8c82 -s ours
am:
5688955071 -s ours
Change-Id: Ifeaa8323e41a1ad765f3e33e1c7cf99faa344d77
Android Build Merger (Role) [Wed, 18 Jan 2017 22:44:59 +0000 (22:44 +0000)]
Merge "Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
f102bc4a2f -s ours" into nyc-mr2-dev-plus-aosp am:
24ff5a0472 -s ours"
Android Build Merger (Role) [Wed, 18 Jan 2017 22:44:40 +0000 (22:44 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
f102bc4a2f -s ours am:
d415065f17 -s ours"
Svet Ganov [Wed, 18 Jan 2017 22:43:58 +0000 (22:43 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
f102bc4a2f -s ours" into nyc-mr2-dev-plus-aosp
am:
24ff5a0472 -s ours
Change-Id: I4baab1d33d2188b788b52e79f6eb15a1cd1df1a9
Svet Ganov [Wed, 18 Jan 2017 22:43:53 +0000 (22:43 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
f102bc4a2f -s ours
am:
d415065f17 -s ours
Change-Id: I78ff05082d3068f3e7b3073576fd78a3c04b2424
Android Build Merger (Role) [Wed, 18 Jan 2017 22:43:26 +0000 (22:43 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours am:
cf7b579868 -s ours" into nyc-mr2-dev-plus-aosp am:
ba182c0b0c -s ours"
Android Build Merger (Role) [Wed, 18 Jan 2017 22:43:09 +0000 (22:43 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours am:
cf7b579868 -s ours am:
f7426c4280 -s ours"
Fyodor Kupolov [Wed, 18 Jan 2017 22:42:42 +0000 (22:42 +0000)]
Merge "Updated platform privileged permissions"
Svet Ganov [Wed, 18 Jan 2017 22:42:24 +0000 (22:42 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours am:
cf7b579868 -s ours" into nyc-mr2-dev-plus-aosp
am:
ba182c0b0c -s ours
Change-Id: I7bb988eb29b52dec6de9eab29d41f9b6f761416a
Svet Ganov [Wed, 18 Jan 2017 22:42:20 +0000 (22:42 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours am:
cf7b579868 -s ours
am:
f7426c4280 -s ours
Change-Id: Ib42b9b7131bc021e6038922e2d70b4835db5a23c
Svet Ganov [Wed, 18 Jan 2017 22:41:24 +0000 (22:41 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours am:
79b20c88e2 -s ours
am:
e9838d9feb -s ours
Change-Id: I8352ee1a2396d483674dd3997b30e5772ad44f4e
Pavlin Radoslavov [Wed, 18 Jan 2017 22:40:03 +0000 (22:40 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34 am:
fd2f4bbcca am:
14e9d1c33f
am:
6878dd5dec
Change-Id: I6cc8135406d49cfd1035e4744b24733682d63f66
Tamas Berghammer [Wed, 18 Jan 2017 22:38:58 +0000 (22:38 +0000)]
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp am:
a553354e84
am:
c6e0e75534 -s ours
Change-Id: Iac5d3bde4481bc509ab21fe0979be0f1f2064110
Tamas Berghammer [Wed, 18 Jan 2017 22:38:09 +0000 (22:38 +0000)]
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am:
b4050d8042
am:
d331d57dc6 -s ours
Change-Id: Ie697d5efaea39e1522e947ac1a8f38f1443a1964
TreeHugger Robot [Wed, 18 Jan 2017 22:32:46 +0000 (22:32 +0000)]
Merge "Fixed check for generated ids on onProvideStructureForAssistOrAutoFill()."
TreeHugger Robot [Wed, 18 Jan 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Enable background restrictions"
Android Build Merger (Role) [Wed, 18 Jan 2017 22:27:50 +0000 (22:27 +0000)]
Merge changes from topic 'am-
4c35a7750ff942229896a20b4a9f05ce'
* changes:
DO NOT MERGE: Revert "Fix build" am:
a0a908f5d6 am:
0a1a0e6e61 -s ours
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am:
24d8553316 -s ours am:
572dfccfc1 -s ours
Jeremy Joslin [Wed, 18 Jan 2017 22:21:56 +0000 (14:21 -0800)]
Have requestRecommendation return a CompletableFuture.
Reworked the new requestRecommendation call to return a
CompletableFuture instead of using a custom callback.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
33784158
Change-Id: If24a94eb6289cb1952052b2cc3bc7856ce2192a5
Jiaquan He [Wed, 18 Jan 2017 22:19:40 +0000 (22:19 +0000)]
Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev
am:
2a147464f6
Change-Id: I24436e76caa536f1d2e873b544fc12a2c1478f36
Jiaquan He [Wed, 18 Jan 2017 22:19:32 +0000 (22:19 +0000)]
Add keyboard support to Grid-based Recents.
am:
21f495f07b
Change-Id: I5b2f1bb2e6c8a84e1bc14fa428a1c00af3abe31f
TreeHugger Robot [Wed, 18 Jan 2017 22:14:20 +0000 (22:14 +0000)]
Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev
Tamas Berghammer [Wed, 18 Jan 2017 22:13:02 +0000 (22:13 +0000)]
DO NOT MERGE: Revert "Fix build" am:
a0a908f5d6
am:
0a1a0e6e61 -s ours
Change-Id: I9d4ecca39800413fa9eb483715bf810028d61334
Tamas Berghammer [Wed, 18 Jan 2017 22:12:04 +0000 (22:12 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am:
24d8553316 -s ours
am:
572dfccfc1 -s ours
Change-Id: I17090081cb6721124d3ba513f8d59f1982764cb8
Jiaquan He [Wed, 18 Jan 2017 22:10:42 +0000 (22:10 +0000)]
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev
am:
a88749fb51
Change-Id: I12837318cf0f4baa595155f02c6fd9324f7ee55b
Jiaquan He [Wed, 18 Jan 2017 22:10:35 +0000 (22:10 +0000)]
2D Recents: Fix issue with undocking only one task
am:
244bac6c8b
Change-Id: I3038a85bb5b351a4a753fa9fd31a205c1dd1f2aa
Android Build Merger (Role) [Wed, 18 Jan 2017 22:10:14 +0000 (22:10 +0000)]
Merge "Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4 am:
d2f5fd3c42 am:
878fcfaa22 am:
424650dd52 -s ours"
Glen Kuhne [Wed, 18 Jan 2017 22:07:58 +0000 (22:07 +0000)]
Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4 am:
d2f5fd3c42 am:
878fcfaa22
am:
424650dd52 -s ours
Change-Id: I44bdf1deca8ef5daa4e7994d4ade884a94bb0178
Android Build Merger (Role) [Wed, 18 Jan 2017 22:07:20 +0000 (22:07 +0000)]
Merge "Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864 am:
c8a6eb1382 am:
7ede74bb06"
Kenny Guy [Wed, 18 Jan 2017 22:06:34 +0000 (22:06 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864 am:
c8a6eb1382
am:
7ede74bb06
Change-Id: Ifcace51e08196fdce59ebcc375136215b1e91079
TreeHugger Robot [Wed, 18 Jan 2017 22:06:20 +0000 (22:06 +0000)]
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 18 Jan 2017 22:06:11 +0000 (22:06 +0000)]
Merge "svc nfc should support watches too am:
1876583bfb am:
baa26e2d3d am:
9ece7d4509"
Tucker Sylvestro [Wed, 18 Jan 2017 22:05:20 +0000 (22:05 +0000)]
svc nfc should support watches too am:
1876583bfb am:
baa26e2d3d
am:
9ece7d4509
Change-Id: Ife740a3873073ae7b8a347983af2a986fbf9c83f
Android Build Merger (Role) [Wed, 18 Jan 2017 22:04:56 +0000 (22:04 +0000)]
Merge "Merge "Notify user switch event to NetworkController" am:
1aa24246cf am:
4ab0e9f824 am:
3f326e7011 am:
bddba11564"
Jay [Wed, 18 Jan 2017 22:04:22 +0000 (22:04 +0000)]
Merge "Notify user switch event to NetworkController" am:
1aa24246cf am:
4ab0e9f824 am:
3f326e7011
am:
bddba11564
Change-Id: Ibc3aa5c5c7217cdb67dc31d1f9417df48b55127c
Android Build Merger (Role) [Wed, 18 Jan 2017 22:03:56 +0000 (22:03 +0000)]
Merge "Fix build am:
005055c070 am:
655c5066c7"
Jason Monk [Wed, 18 Jan 2017 22:03:19 +0000 (22:03 +0000)]
Fix build am:
005055c070
am:
655c5066c7
Change-Id: Ibe49185028e33b0553928347b1d546404f09063f
Jason Monk [Wed, 18 Jan 2017 15:04:51 +0000 (10:04 -0500)]
Fix build
Test: treehugger
Change-Id: Ic33d5ff2d7845bf4edd81d3e966fce3f0e5956bb
(cherry picked from commit
005055c070a4e174a493fe585e467c0e711b96e9)
Jason Monk [Wed, 18 Jan 2017 22:00:03 +0000 (22:00 +0000)]
Merge "resolve merge conflicts of
8cff199b09d6 to master"
Jason Monk [Thu, 5 Jan 2017 20:12:04 +0000 (15:12 -0500)]
Add primaryContentAlpha attribute
And create a generic primary text selector that can be used for all
themes.
Test: Manual
Change-Id: I274da909209188d7a8f4924ee8c64eff7011b7e2
Makoto Onuki [Wed, 18 Jan 2017 21:30:17 +0000 (21:30 +0000)]
Merge "Support protofied dumpsys for NetStats"
Adrian Roos [Tue, 17 Jan 2017 23:22:49 +0000 (15:22 -0800)]
Notifications: Clear animation start visible type when not animating
Fixes an issue where the animation start visible type could
be stale if the animation was cancelled.
Bug:
30876804
Test: runtest systemui
Change-Id: I8e6ac6ba0bcd785f980b22529d83ba86da744f00
Android Build Merger (Role) [Wed, 18 Jan 2017 21:15:55 +0000 (21:15 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
b6973a8c82 -s ours" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 18 Jan 2017 21:15:31 +0000 (21:15 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
f102bc4a2f -s ours" into nyc-mr2-dev-plus-aosp
Svet Ganov [Wed, 18 Jan 2017 21:15:03 +0000 (21:15 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours
am:
b6973a8c82 -s ours
Change-Id: I3d3bf6c25475a8fb773d6298ddf648d0bd2a5846
Svet Ganov [Wed, 18 Jan 2017 21:14:50 +0000 (21:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours
am:
f102bc4a2f -s ours
Change-Id: Icc0f74b69806d22e218fc221aadd37194f8aa994
Android Build Merger (Role) [Wed, 18 Jan 2017 21:14:43 +0000 (21:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours am:
cf7b579868 -s ours" into nyc-mr2-dev-plus-aosp
Svet Ganov [Wed, 18 Jan 2017 21:13:52 +0000 (21:13 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours
am:
cf7b579868 -s ours
Change-Id: I1201d0f79dfb06868112dcbebd9dc637cd107871
Svet Ganov [Wed, 18 Jan 2017 21:13:48 +0000 (21:13 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours
am:
79b20c88e2 -s ours
Change-Id: I065da31e12dd71dc2ab8b8304a73cba7271568d3
Svet Ganov [Wed, 18 Jan 2017 21:04:24 +0000 (21:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
am:
b8c8b67789 -s ours
Change-Id: Iae2e5a94b21db8f35a67466bc039966315c73f46
Svet Ganov [Wed, 18 Jan 2017 21:04:21 +0000 (21:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
am:
b8c8b67789 -s ours
Change-Id: I502a61cc0c1c6caaf18a7d0c03aa558541b3c17f
Svet Ganov [Wed, 18 Jan 2017 21:04:21 +0000 (21:04 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am:
4a601f972a -s ours
Change-Id: I8798244ed83cab82094aed1705d719cf5c2188e4
Svet Ganov [Wed, 18 Jan 2017 21:04:19 +0000 (21:04 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am:
4a601f972a -s ours
Change-Id: Id66c49cfa6010ab327f46e85a6940bd52102eeea
TreeHugger Robot [Wed, 18 Jan 2017 20:57:07 +0000 (20:57 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
Pavlin Radoslavov [Wed, 18 Jan 2017 20:42:33 +0000 (20:42 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34 am:
fd2f4bbcca
am:
14e9d1c33f
Change-Id: I243082e8553c97aa3b28d6e3e72e988136d305cc
Tamas Berghammer [Wed, 18 Jan 2017 20:33:44 +0000 (20:33 +0000)]
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
am:
a553354e84
Change-Id: I7e969a4988bdc01f21f09137cfe2f8e692101a3c
Tamas Berghammer [Wed, 18 Jan 2017 20:32:44 +0000 (20:32 +0000)]
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
am:
b4050d8042
Change-Id: I9d5789a9c4f12c12c5cc13eb8f92d3084a818440
Pavlin Radoslavov [Wed, 18 Jan 2017 20:30:44 +0000 (20:30 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34
am:
fd2f4bbcca
Change-Id: I3c253b5ee444f23fc81dc607dcc85e95b2aa3226
TreeHugger Robot [Wed, 18 Jan 2017 20:30:15 +0000 (20:30 +0000)]
Merge "Fix tooltip handling for invisible and overlapping views"
TreeHugger Robot [Wed, 18 Jan 2017 20:29:41 +0000 (20:29 +0000)]
Merge "Fix pointer icon handling for invisible and overlapping views"
TreeHugger Robot [Wed, 18 Jan 2017 20:27:44 +0000 (20:27 +0000)]
Merge "Tron metrics for special permissions"
Pavlin Radoslavov [Wed, 18 Jan 2017 20:26:52 +0000 (20:26 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am:
5fd543ec34
Change-Id: I69c8396f015dc926c135a0284a347c6d6d8ca870
TreeHugger Robot [Wed, 18 Jan 2017 20:26:17 +0000 (20:26 +0000)]
Merge "Protect use of onFindViewById for Fragment Transitions."
Tamas Berghammer [Wed, 18 Jan 2017 20:23:54 +0000 (20:23 +0000)]
DO NOT MERGE: Revert "Fix build"
am:
a0a908f5d6
Change-Id: I3ba66290b49fbe184eff424f5e70b8f32ed6fb3e
Tamas Berghammer [Wed, 18 Jan 2017 20:22:57 +0000 (20:22 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am:
24d8553316 -s ours
Change-Id: I09a58385e10e135af06dff346624dcbc9eb76a4f
Treehugger Robot [Wed, 18 Jan 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
OSDN Git Service
