OSDN Git Service
Todd Kennedy [Tue, 26 Jul 2016 22:39:33 +0000 (15:39 -0700)]
Fix tests
These have been broken for a long time [not sure how long]. Also take
the opportunity to convert these to JUnit4 tests.
Change-Id: Ie80207f905868a0cc1a73cb1f540828d11b21d11
Todd Kennedy [Fri, 22 Jul 2016 22:29:15 +0000 (22:29 +0000)]
Merge "Implement new ephemeral resolver design"
Justin Klaassen [Fri, 22 Jul 2016 22:22:45 +0000 (22:22 +0000)]
Merge \\"Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS\\" into nyc-mr1-dev am:
c8c60f5930
am:
e01d3f57a6
Change-Id: I99634a9420a8d82672c0270a8c01e2529b9a7040
Justin Klaassen [Fri, 22 Jul 2016 22:22:42 +0000 (22:22 +0000)]
Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS am:
06c0cb7acd
am:
194b3c49cb
Change-Id: Ic9a2a904d8ccb0a8ec807c045efca82bf525f6d9
Justin Klaassen [Fri, 22 Jul 2016 22:13:30 +0000 (22:13 +0000)]
Merge \"Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS\" into nyc-mr1-dev
am:
c8c60f5930
Change-Id: Idea9e5fdc4b54cb287ce1d82fdac75ef4bb95750
Justin Klaassen [Fri, 22 Jul 2016 22:13:23 +0000 (22:13 +0000)]
Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS
am:
06c0cb7acd
Change-Id: I7ea6ce28be43d519144ec9311e15334d35e2702f
Eino-Ville Talvala [Fri, 22 Jul 2016 22:07:21 +0000 (22:07 +0000)]
Merge \\"ImageReader: Add discardFreeBuffers method\\" into nyc-mr1-dev am:
b417eb176f
am:
7d0f82e7e1
Change-Id: I3b622f67b5c17c9026fdf7a0c708dd737575d33f
Eino-Ville Talvala [Fri, 22 Jul 2016 22:07:18 +0000 (22:07 +0000)]
ImageReader: Add discardFreeBuffers method am:
2e2aaf6e04
am:
bc20c106df
Change-Id: I215c711f13531821907cd442b2aca707f46bd87d
Justin Klaassen [Fri, 22 Jul 2016 21:55:58 +0000 (21:55 +0000)]
Merge "Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into nyc-mr1-dev
Eino-Ville Talvala [Fri, 22 Jul 2016 21:53:00 +0000 (21:53 +0000)]
Merge \"ImageReader: Add discardFreeBuffers method\" into nyc-mr1-dev
am:
b417eb176f
Change-Id: I599785ee3e6d4ae576b5897ff0f62303c1746a79
Eino-Ville Talvala [Fri, 22 Jul 2016 21:52:51 +0000 (21:52 +0000)]
ImageReader: Add discardFreeBuffers method
am:
2e2aaf6e04
Change-Id: I142f1b011a045aa0f5af7c33eb76b059eb67e30d
Eino-Ville Talvala [Fri, 22 Jul 2016 21:42:36 +0000 (21:42 +0000)]
Merge "ImageReader: Add discardFreeBuffers method" into nyc-mr1-dev
Alan Viverette [Fri, 22 Jul 2016 21:25:15 +0000 (21:25 +0000)]
Merge \\"Ensure forwarding listener target is long-clickable\\" into nyc-mr1-dev am:
48c5f38b34
am:
0ff1dc6b44
Change-Id: Ia55c91e52a824572b103e829622d5d47be38037e
Alan Viverette [Fri, 22 Jul 2016 21:25:11 +0000 (21:25 +0000)]
Ensure forwarding listener target is long-clickable am:
11ace9eedb
am:
1f53395128
Change-Id: I9fea1c41ac935157235f97fb33b6a0bd7f2612b7
Alan Viverette [Fri, 22 Jul 2016 21:18:48 +0000 (21:18 +0000)]
Merge \"Ensure forwarding listener target is long-clickable\" into nyc-mr1-dev
am:
48c5f38b34
Change-Id: I40fd45addb421ea8e817f5e48e18f1d4286c9917
Alan Viverette [Fri, 22 Jul 2016 21:18:43 +0000 (21:18 +0000)]
Ensure forwarding listener target is long-clickable
am:
11ace9eedb
Change-Id: I182f933b35aef0da062bf6e7d4c485d681d50258
Ben Lin [Fri, 22 Jul 2016 21:16:42 +0000 (21:16 +0000)]
Merge "Allow drag-n-drop to auto-scroll when near top/bottom of dirlist."
Alan Viverette [Fri, 22 Jul 2016 21:10:15 +0000 (21:10 +0000)]
Merge "Clean up annotations and docs for TabHost"
Alan Viverette [Fri, 22 Jul 2016 21:09:35 +0000 (21:09 +0000)]
Merge "Ensure forwarding listener target is long-clickable" into nyc-mr1-dev
Chet Haase [Fri, 22 Jul 2016 20:59:18 +0000 (20:59 +0000)]
Merge \\"Fix NPE in JobPackageTracker\\" into nyc-mr1-dev am:
12fae936db
am:
1250ae5811
Change-Id: I9cfb26a1782415f3ae566bc7b9132216f1c4ef65
Chet Haase [Fri, 22 Jul 2016 20:59:11 +0000 (20:59 +0000)]
Fix NPE in JobPackageTracker am:
86b300c374
am:
60c30cf416
Change-Id: I2980a489f6fe8925163df97dc9c542f39f4b0577
Makoto Onuki [Fri, 22 Jul 2016 20:53:00 +0000 (20:53 +0000)]
Merge changes I916c680d,I55e7c86c into nyc-mr1-dev-plus-aosp
am:
ba838fd7c9
Change-Id: I1e0570b493e61fdefa47bf8a089e084d10923685
Makoto Onuki [Fri, 22 Jul 2016 20:52:56 +0000 (20:52 +0000)]
Merge \\"Fix intent flags\\" into nyc-mr1-dev am:
85e086248d
am:
b6f88caea3
Change-Id: I36b43f70e5ee4adb16db8b73fad8061cdcd398ab
Makoto Onuki [Fri, 22 Jul 2016 20:52:49 +0000 (20:52 +0000)]
Fix intent flags am:
7e5c3e8542
am:
bada0535d5
Change-Id: Iefd569a147aea40118be645bbfe55456ecced810
Andrew Solovay [Fri, 22 Jul 2016 20:52:41 +0000 (20:52 +0000)]
Merge \"docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d am:
659f6f7017\" into nyc-mr1-dev-plus-aosp
am:
0c7ca99ff6
Change-Id: Id50af18d0a515cf184a0eb21cbd0091f9a590f01
Andrew Solovay [Fri, 22 Jul 2016 20:52:37 +0000 (20:52 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d am:
659f6f7017
am:
dbf10525a8
Change-Id: Id6f547e871153f6f5a3b6fbb520aca9be46926f8
Chet Haase [Fri, 22 Jul 2016 20:52:34 +0000 (20:52 +0000)]
Merge \"Fix NPE in JobPackageTracker\" into nyc-mr1-dev
am:
12fae936db
Change-Id: If4dde3752f6ddb268dc5ca2b9ce81e5e82fccb89
Chet Haase [Fri, 22 Jul 2016 20:52:30 +0000 (20:52 +0000)]
Fix NPE in JobPackageTracker
am:
86b300c374
Change-Id: Ifd67d6595bf7b7f677270be5516612267587884d
Andrew Solovay [Fri, 22 Jul 2016 20:52:28 +0000 (20:52 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d am:
03453b98d8
am:
c14e391918
Change-Id: I989dee2d4380bea2967ca595dc0abd0ca8afc455
Chet Haase [Fri, 22 Jul 2016 20:45:49 +0000 (20:45 +0000)]
Merge "Fix NPE in JobPackageTracker" into nyc-mr1-dev
Eric Laurent [Fri, 22 Jul 2016 20:42:42 +0000 (20:42 +0000)]
Merge \\"bootanimation: fix glitchy playback\\" into nyc-mr1-dev am:
acf0e702f2
am:
ed6348d0e3
Change-Id: Ifa751851b6d572490bfcc1ea5fe5e0ac3b100380
Eric Laurent [Fri, 22 Jul 2016 20:42:32 +0000 (20:42 +0000)]
bootanimation: fix glitchy playback am:
197e47979a
am:
88e23db1ee
Change-Id: Id402ff19c495e0813dd32cb4897033760daead0e
Android Build Merger (Role) [Fri, 22 Jul 2016 20:42:12 +0000 (20:42 +0000)]
Merge changes I916c680d,I55e7c86c into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Fix intent flags\" into nyc-mr1-dev am:
85e086248d
Fix intent flags am:
7e5c3e8542
Android Build Merger (Role) [Fri, 22 Jul 2016 20:41:52 +0000 (20:41 +0000)]
Merge "docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d am:
659f6f7017" into nyc-mr1-dev-plus-aosp
Makoto Onuki [Fri, 22 Jul 2016 20:41:17 +0000 (20:41 +0000)]
Merge \"Fix intent flags\" into nyc-mr1-dev
am:
85e086248d
Change-Id: I916c680de263edaa7422b5c82da428b161de1338
Makoto Onuki [Fri, 22 Jul 2016 20:41:13 +0000 (20:41 +0000)]
Fix intent flags
am:
7e5c3e8542
Change-Id: I55e7c86c3bcd421b04c8ddb4c2734833fb8b3585
Andrew Solovay [Fri, 22 Jul 2016 20:41:08 +0000 (20:41 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d
am:
659f6f7017
Change-Id: Ie3a15507ebf04bf3f92cd6b35f2b2dfa99bc0a08
Andrew Solovay [Fri, 22 Jul 2016 20:40:52 +0000 (20:40 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d
am:
03453b98d8
Change-Id: I9ad2ca0e97ef89f181b2f61cbcd4dad4a286d798
Adrian Roos [Fri, 22 Jul 2016 20:36:13 +0000 (20:36 +0000)]
Merge \\"Notification icons: Correctly apply color filter for DrawableContainers\\" into nyc-mr1-dev am:
db56fb36a6
am:
8e17c1b593
Change-Id: I1216fce1f258b3cada5ed501ee173ece72ebe968
Adrian Roos [Fri, 22 Jul 2016 20:36:10 +0000 (20:36 +0000)]
Notification icons: Correctly apply color filter for DrawableContainers am:
4aad455280
am:
e6008ed8da
Change-Id: I90257c1cef215ad39b18a2ae9ffad15e65f25548
TreeHugger Robot [Fri, 22 Jul 2016 20:34:43 +0000 (20:34 +0000)]
Merge "Fix intent flags" into nyc-mr1-dev
Eric Laurent [Fri, 22 Jul 2016 20:33:37 +0000 (20:33 +0000)]
Merge \"bootanimation: fix glitchy playback\" into nyc-mr1-dev
am:
acf0e702f2
Change-Id: I4065891467fe4b37bf1968f8e54ccedba713813b
Eric Laurent [Fri, 22 Jul 2016 20:33:34 +0000 (20:33 +0000)]
bootanimation: fix glitchy playback
am:
197e47979a
Change-Id: Idbde31bfa48916f829bc3a1f934bd894c3303fcc
Andrew Solovay [Fri, 22 Jul 2016 20:30:08 +0000 (20:30 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b
am:
6a2782548d
Change-Id: I14ce3e45b87eef0401d4429e26f7b2a7af96343f
Andrew Solovay [Fri, 22 Jul 2016 20:30:01 +0000 (20:30 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b
am:
6a2782548d
Change-Id: Id4496ca42ca6d3d9989bbbee2a71b01af23086a0
Eric Laurent [Fri, 22 Jul 2016 20:23:56 +0000 (20:23 +0000)]
Merge "bootanimation: fix glitchy playback" into nyc-mr1-dev
Adrian Roos [Fri, 22 Jul 2016 20:19:10 +0000 (20:19 +0000)]
Merge \"Notification icons: Correctly apply color filter for DrawableContainers\" into nyc-mr1-dev
am:
db56fb36a6
Change-Id: Ic66714c31c3328b4560a093082e0bdee553be497
Adrian Roos [Fri, 22 Jul 2016 20:19:06 +0000 (20:19 +0000)]
Notification icons: Correctly apply color filter for DrawableContainers
am:
4aad455280
Change-Id: Iec4e932b0c7f2cb1674eb8c617730c2376e47d6f
Andrew Solovay [Fri, 22 Jul 2016 20:14:57 +0000 (20:14 +0000)]
docs: Updated support library revision history for 24.1.1
am:
0b80531b5b
Change-Id: I26c19728affe538d49282d9966fa5d87e55ba076
Adrian Roos [Fri, 22 Jul 2016 20:12:19 +0000 (20:12 +0000)]
Merge "Notification icons: Correctly apply color filter for DrawableContainers" into nyc-mr1-dev
Selim Cinek [Fri, 22 Jul 2016 19:38:02 +0000 (19:38 +0000)]
Merge changes Idd0b38b4,I511356a8 into nyc-mr1-dev am:
0ff47b64cd
am:
fc5b901a09
Change-Id: I5b17d81b636ce0356539fba4a4bb51a65f97ca9c
Selim Cinek [Fri, 22 Jul 2016 19:37:55 +0000 (19:37 +0000)]
Fixed a bug where the fade in from dark would not work properly am:
7baaa9e82b
am:
223b854ac5
Change-Id: I8f929f80264f7a08fb113b0c13e99836ad75e732
Selim Cinek [Fri, 22 Jul 2016 19:37:48 +0000 (19:37 +0000)]
Changed the appearance of fullscreen intent notifications again am:
981962e6ad
am:
3f769aba2a
Change-Id: I40a477fc28fb0205d40aa352c5b720835d4bf4f8
Selim Cinek [Fri, 22 Jul 2016 19:30:12 +0000 (19:30 +0000)]
Merge changes Idd0b38b4,I511356a8 into nyc-mr1-dev
am:
0ff47b64cd
Change-Id: I6a7e46b4c10ecce4cd038aa90ec4536fed61d3ae
Selim Cinek [Fri, 22 Jul 2016 19:30:04 +0000 (19:30 +0000)]
Fixed a bug where the fade in from dark would not work properly
am:
7baaa9e82b
Change-Id: I28983239557395c52e33dff4f610731c5f0bc8e4
Selim Cinek [Fri, 22 Jul 2016 19:29:52 +0000 (19:29 +0000)]
Changed the appearance of fullscreen intent notifications again
am:
981962e6ad
Change-Id: Ib26d711e48aaff99a4e64e86feb67dbf987d67e2
TreeHugger Robot [Fri, 22 Jul 2016 19:20:48 +0000 (19:20 +0000)]
Merge changes Idd0b38b4,I511356a8 into nyc-mr1-dev
* changes:
Fixed a bug where the fade in from dark would not work properly
Changed the appearance of fullscreen intent notifications again
Selim Cinek [Fri, 22 Jul 2016 00:21:09 +0000 (17:21 -0700)]
Fixed a bug where the fade in from dark would not work properly
Change-Id: Idd0b38b40b06806c727d8e033847a0da0b51f55e
Fixes:
30224123
Selim Cinek [Thu, 21 Jul 2016 03:41:58 +0000 (20:41 -0700)]
Changed the appearance of fullscreen intent notifications again
Change-Id: I511356a8dc0fe253541c625fb7b43ed0c7bafaca
Fixes:
28269355
Makoto Onuki [Fri, 22 Jul 2016 18:57:05 +0000 (11:57 -0700)]
Fix intent flags
Bug
30307198
Change-Id: If127001320dcabdc53ee73860dbb9983cb25b611
Andrew Solovay [Fri, 22 Jul 2016 18:35:04 +0000 (11:35 -0700)]
docs: Updated support library revision history for 24.1.1
See first comment for doc stage location.
bug:
30302654
Change-Id: Icb9a171963b6bf7feec69b6dd36aa6513055bb05
Eric Laurent [Fri, 22 Jul 2016 01:17:15 +0000 (18:17 -0700)]
bootanimation: fix glitchy playback
Do not use low latency playback mode to be more
robust against scheduling problems during boot phase.
Also:
- remove unused reverb on output mix
- fix WAV file parser.
Bug:
30277818
Change-Id: I1e15d3003a25c93d4995006885b32a754d17343f
Andrii Kulian [Fri, 22 Jul 2016 18:28:06 +0000 (18:28 +0000)]
Merge \\"Make sure to apply latest configuration to resources\\" into nyc-mr1-dev am:
8fcd8f1fb9
am:
76129f588a
Change-Id: Ic033f212e02a33e9414e284a1f6068ef7c4b0134
Andrii Kulian [Fri, 22 Jul 2016 18:28:02 +0000 (18:28 +0000)]
Make sure to apply latest configuration to resources am:
3b3c914e62
am:
466b790f5f
Change-Id: If78e2eb11c4558924835f37d7e89420b86e38e96
Andrii Kulian [Fri, 22 Jul 2016 18:20:36 +0000 (18:20 +0000)]
Merge \"Make sure to apply latest configuration to resources\" into nyc-mr1-dev
am:
8fcd8f1fb9
Change-Id: I994329624e4312c1e6eb018793d08fe0a041c4b1
Andrii Kulian [Fri, 22 Jul 2016 18:20:32 +0000 (18:20 +0000)]
Make sure to apply latest configuration to resources
am:
3b3c914e62
Change-Id: I5dc1d3518b1568bd8c52c947e7425563553bcf9d
Andrii Kulian [Fri, 22 Jul 2016 18:16:34 +0000 (18:16 +0000)]
Merge "Make sure to apply latest configuration to resources" into nyc-mr1-dev
Etan Cohen [Fri, 22 Jul 2016 18:10:17 +0000 (18:10 +0000)]
[NAN] Add LV utilities (TLV with T size of 0).
am:
009b1fcb85
Change-Id: I8cac5a1f9a6d57da82e4a99af496bff2d699774f
TreeHugger Robot [Fri, 22 Jul 2016 17:57:05 +0000 (17:57 +0000)]
Merge "Fix AM.revokeUriPermissionFromOwner for prefix mode."
TreeHugger Robot [Fri, 22 Jul 2016 17:56:23 +0000 (17:56 +0000)]
Merge "Revoke drag and drop related grants on client crash"
Chong Zhang [Fri, 22 Jul 2016 17:26:19 +0000 (17:26 +0000)]
Merge \\"Clean up surfaces when app is resumed without being stopped.\\" into nyc-mr1-dev am:
e86da3bc62
am:
dc6241cdc5
Change-Id: Id39c7a57ee2d6f71ec5655dcb0b80346724ae632
Chong Zhang [Fri, 22 Jul 2016 17:26:15 +0000 (17:26 +0000)]
Clean up surfaces when app is resumed without being stopped. am:
45e6d2dc8b
am:
b76adc5117
Change-Id: I35c39c4fc49a953262b5b6ab4cbc2dca2ddf0b8f
Adrian Roos [Fri, 22 Jul 2016 17:26:11 +0000 (17:26 +0000)]
Merge \\"ServiceConnection: Properly serialize events\\" into nyc-mr1-dev am:
1dcda85414
am:
a0450f6557
Change-Id: Id1dad00aaa52c0a9ebb9709d51f4515bc58bc425
Adrian Roos [Fri, 22 Jul 2016 17:26:09 +0000 (17:26 +0000)]
ServiceConnection: Properly serialize events am:
a9b43182c6
am:
36705ec204
Change-Id: Ieff75981994c5a2d354e525e795453a2de32a6db
Etan Cohen [Mon, 18 Jul 2016 20:43:17 +0000 (13:43 -0700)]
[NAN] Add LV utilities (TLV with T size of 0).
NAN uses LV (not TLV). Expose an LV variant of TLV to make API
cleaner.
Bug:
30096512
Change-Id: I74b4c514d50f1df5750b521bd68a5e2d832d92c3
Chong Zhang [Fri, 22 Jul 2016 17:17:30 +0000 (17:17 +0000)]
Merge \"Clean up surfaces when app is resumed without being stopped.\" into nyc-mr1-dev
am:
e86da3bc62
Change-Id: Ifae55b72ab9d1310a9647ef8a0c3ee2c4e49b055
Chong Zhang [Fri, 22 Jul 2016 17:17:26 +0000 (17:17 +0000)]
Clean up surfaces when app is resumed without being stopped.
am:
45e6d2dc8b
Change-Id: I9ae5c2a9c6a93246338221252cf943db6763e1c4
Adrian Roos [Fri, 22 Jul 2016 17:17:21 +0000 (17:17 +0000)]
Merge \"ServiceConnection: Properly serialize events\" into nyc-mr1-dev
am:
1dcda85414
Change-Id: I8dd496db509da805a22ad59dbc8e98df0c1052d5
Adrian Roos [Fri, 22 Jul 2016 17:17:18 +0000 (17:17 +0000)]
ServiceConnection: Properly serialize events
am:
a9b43182c6
Change-Id: I3571754de4d659aaf6b4a61fa14ae8256ca29f7a
TreeHugger Robot [Fri, 22 Jul 2016 17:09:27 +0000 (17:09 +0000)]
Merge "Track KEY_PERMISSION_CHANGED rename to KEY_ACCESS_CHANGED"
Chong Zhang [Fri, 22 Jul 2016 17:07:44 +0000 (17:07 +0000)]
Merge "Clean up surfaces when app is resumed without being stopped." into nyc-mr1-dev
Rob Carr [Fri, 22 Jul 2016 17:06:45 +0000 (17:06 +0000)]
Merge "Fit all non base windows to display instead of just children."
Rob Carr [Fri, 22 Jul 2016 17:04:52 +0000 (17:04 +0000)]
Merge "Fix swapped toast timeouts."
Adrian Roos [Fri, 22 Jul 2016 17:03:42 +0000 (17:03 +0000)]
Merge "ServiceConnection: Properly serialize events" into nyc-mr1-dev
Ben Lin [Thu, 14 Jul 2016 01:16:36 +0000 (18:16 -0700)]
Allow drag-n-drop to auto-scroll when near top/bottom of dirlist.
Couple of things this CL did:
1. Refactored ViewScroller to a separate file, renamed to
"ViewAutoScroller"
2. New interfaces called UIDelegate and CalculationDelegate such that
classes can provide necessary information for smooth scrolling
3. DirectoryDragListener implementation of #2's interface in order to
have auto scrolling when user's cursor is near top/bottom of screen
Currently since the status bar, action bar, and menu bar don't have a
drag listener, we don't get a callback on them, and thus we lose the
ability to get positions/scroll if user flings too quickly to those
areas. There might be some way to circumvent this since hovering over
these areas get a DRAG_EXIT event, but that should be 1) a separate
discussion and 2) a separate CL in my opinion.
Bug:
28696867
Change-Id: I61eba93aa60efd1638b3c0cd79db3f0d083b5e6d
(cherry picked from commit
ad3a323585e43d06f632d85759beaf670f541997)
Chong Zhang [Fri, 22 Jul 2016 16:54:16 +0000 (16:54 +0000)]
Merge "Call completeResumeLocked after activity is resume-relaunched"
Todd Kennedy [Fri, 22 Jul 2016 14:37:25 +0000 (14:37 +0000)]
Merge "Add more tracing"
Robin Lee [Fri, 22 Jul 2016 13:25:00 +0000 (14:25 +0100)]
Track KEY_PERMISSION_CHANGED rename to KEY_ACCESS_CHANGED
Bug:
30298085
Change-Id: I290a7f9c23827f5c9adb55429bd6680a7b751393
Benjamin Franz [Fri, 22 Jul 2016 09:01:36 +0000 (09:01 +0000)]
Merge \"Merge \\\"Block user from setting safe boot setting via adb\\\" into nyc-dev am:
f97faada5d am:
6b69f6597e\" into nyc-mr1-dev-plus-aosp
am:
2b74cb0fca
Change-Id: I064088228c8469d9cecebe0049513916697a2321
Benjamin Franz [Fri, 22 Jul 2016 09:01:25 +0000 (09:01 +0000)]
Merge \\\"Block user from setting safe boot setting via adb\\\" into nyc-dev am:
f97faada5d am:
6b69f6597e
am:
23606db8d3
Change-Id: Ice507575ac74d6ad14cf397cc73dcf9824097a9f
Benjamin Franz [Fri, 22 Jul 2016 09:01:05 +0000 (09:01 +0000)]
Merge \"Block user from setting safe boot setting via adb am:
0ff13fce6f am:
36eb7a1370\" into nyc-mr1-dev-plus-aosp
am:
50e2c2cf36
Change-Id: Idb3e45de97201bf0936724161f8b958397d66629
Benjamin Franz [Fri, 22 Jul 2016 09:00:58 +0000 (09:00 +0000)]
Block user from setting safe boot setting via adb am:
0ff13fce6f am:
36eb7a1370
am:
4b6401f166
Change-Id: I98ba86600e08903aa71cfd5cad7c77a4ae93698f
Benjamin Franz [Fri, 22 Jul 2016 09:00:49 +0000 (09:00 +0000)]
Merge \\\"Block user from setting safe boot setting via adb\\\" into nyc-dev am:
f97faada5d am:
e84d37f1ee
am:
54255611e4
Change-Id: Iadf0c57ec6c47787568ea6cb61bee429b2b13f66
Benjamin Franz [Fri, 22 Jul 2016 09:00:46 +0000 (09:00 +0000)]
Block user from setting safe boot setting via adb am:
0ff13fce6f am:
c86e8c3442
am:
428b3bdca8
Change-Id: I42419b8a5cf69e512d9cd536056c0767ef8aa39e
Android Build Merger (Role) [Fri, 22 Jul 2016 08:55:28 +0000 (08:55 +0000)]
Merge "Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am:
f97faada5d am:
6b69f6597e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 22 Jul 2016 08:55:09 +0000 (08:55 +0000)]
Merge "Block user from setting safe boot setting via adb am:
0ff13fce6f am:
36eb7a1370" into nyc-mr1-dev-plus-aosp
Benjamin Franz [Fri, 22 Jul 2016 08:54:35 +0000 (08:54 +0000)]
Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am:
f97faada5d
am:
6b69f6597e
Change-Id: I2e3d13a01d8d2443c522a6b611b8c1068aebd5f6
Benjamin Franz [Fri, 22 Jul 2016 08:54:31 +0000 (08:54 +0000)]
Block user from setting safe boot setting via adb am:
0ff13fce6f
am:
36eb7a1370
Change-Id: I63ad7dc4f3acbfd3e3d5dd7f236721df9c80b950
Benjamin Franz [Fri, 22 Jul 2016 08:54:24 +0000 (08:54 +0000)]
Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am:
f97faada5d
am:
e84d37f1ee
Change-Id: Iecce325f92455edfac8065a843dacf2f938bb560
Benjamin Franz [Fri, 22 Jul 2016 08:54:21 +0000 (08:54 +0000)]
Block user from setting safe boot setting via adb am:
0ff13fce6f
am:
c86e8c3442
Change-Id: Ie9e1f4d447dd61ef7f5ef191d1309377fbbf4559
OSDN Git Service
