OSDN Git Service
Erik Kline [Wed, 10 Aug 2016 02:49:08 +0000 (02:49 +0000)]
Fix up some comments in IPv6 tethering code. am:
d1dcbefe06
am:
dba85b451f
Change-Id: I7dc90247a957ccd30ad593a6f8c6f29575069d95
Suprabh Shukla [Wed, 10 Aug 2016 02:48:59 +0000 (02:48 +0000)]
Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev am:
521e27d652
am:
78223aa37c
Change-Id: Ibcd5967decd1b694d31b2a2fecc59e4c6ae87409
Suprabh Shukla [Wed, 10 Aug 2016 02:48:51 +0000 (02:48 +0000)]
Fixing admins not being removed from DpmMockContext am:
3cb2b49f44
am:
b133a72f8b
Change-Id: I9987b02cc0353b4bad45198c8bc00c1a2086b0ab
Erik Kline [Wed, 10 Aug 2016 02:39:05 +0000 (02:39 +0000)]
Fix up some comments in IPv6 tethering code.
am:
d1dcbefe06
Change-Id: Icb77a16f14591aa54cc0302b8a7bd9b377ec5eea
Suprabh Shukla [Wed, 10 Aug 2016 02:39:02 +0000 (02:39 +0000)]
Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev
am:
521e27d652
Change-Id: Id595e024e1c899c2014feb0c39bb1ca15a1fe70c
Suprabh Shukla [Wed, 10 Aug 2016 02:39:00 +0000 (02:39 +0000)]
Fixing admins not being removed from DpmMockContext
am:
3cb2b49f44
Change-Id: I9baefc5e069a2b8d37fa2b6c1e55d9eaebd02f26
TreeHugger Robot [Wed, 10 Aug 2016 02:23:53 +0000 (02:23 +0000)]
Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev
Ruben Brunk [Wed, 10 Aug 2016 01:24:37 +0000 (01:24 +0000)]
Merge "Fix setVrThread's exception handling." into nyc-mr1-dev am:
8d84bc861f
am:
0837aa4070
Change-Id: I4c8cb0515fce44ed594e4a92362e0a267a31495a
Ruben Brunk [Wed, 10 Aug 2016 01:24:33 +0000 (01:24 +0000)]
Fix setVrThread's exception handling. am:
83ea55a9c6
am:
b25be4bd37
Change-Id: I659f75876581fb97359dc516bd7d1bd31cf52485
Ruben Brunk [Wed, 10 Aug 2016 01:16:00 +0000 (01:16 +0000)]
Merge "Fix setVrThread's exception handling." into nyc-mr1-dev
am:
8d84bc861f
Change-Id: Ie52a81999359574e2c0cff826ae62bc3b7dc247f
Ruben Brunk [Wed, 10 Aug 2016 01:15:58 +0000 (01:15 +0000)]
Fix setVrThread's exception handling.
am:
83ea55a9c6
Change-Id: Ib2c9df68c2352efe21ebb9d8f2d6997afadd492f
Erik Kline [Wed, 10 Aug 2016 01:15:40 +0000 (01:15 +0000)]
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev am:
c14748b366
am:
876a98e5ff
Change-Id: Ic82a1715c7bd31b149a326f6fc56818879e76f1a
Erik Kline [Wed, 10 Aug 2016 01:15:36 +0000 (01:15 +0000)]
Handle setting and deprecating local DNS IPv6 addresses am:
fa37b2f613
am:
5fe2c0379f
Change-Id: I1bb62c8b1233187d209d65fbcf07c4ce289c72c5
Dianne Hackborn [Wed, 10 Aug 2016 01:15:31 +0000 (01:15 +0000)]
Merge "Fix issue #
30766518: Document what targeting N does" into nyc-mr1-dev am:
75cdd5f68f
am:
9248b200f7
Change-Id: I4aeb23693a40f27d0e28d00b6b489a6db741cfd6
Dianne Hackborn [Wed, 10 Aug 2016 01:15:25 +0000 (01:15 +0000)]
Fix issue #
30766518: Document what targeting N does am:
b34cbedb4e
am:
3a585b86be
Change-Id: I72821636543c9c31da4c6a8ac6d77a8de5d78d1f
Erik Kline [Wed, 10 Aug 2016 01:00:32 +0000 (10:00 +0900)]
Fix up some comments in IPv6 tethering code.
Bug:
30298058
Change-Id: Icc99e772898b8303d8f2f8521784e2cb5c2afacc
Ruben Brunk [Wed, 10 Aug 2016 00:59:26 +0000 (00:59 +0000)]
Merge "Fix setVrThread's exception handling." into nyc-mr1-dev
Erik Kline [Wed, 10 Aug 2016 00:58:03 +0000 (00:58 +0000)]
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev
am:
c14748b366
Change-Id: I43a8576a8aabc30f447caa062c3730b2160aec6b
Erik Kline [Wed, 10 Aug 2016 00:58:01 +0000 (00:58 +0000)]
Handle setting and deprecating local DNS IPv6 addresses
am:
fa37b2f613
Change-Id: I36b01b7b0fbed07b4279c7f35af20592248cf11d
Dianne Hackborn [Wed, 10 Aug 2016 00:57:58 +0000 (00:57 +0000)]
Merge "Fix issue #
30766518: Document what targeting N does" into nyc-mr1-dev
am:
75cdd5f68f
Change-Id: I721ca6ee9471b53c6857609241f2f55d7c11e8ee
Dianne Hackborn [Wed, 10 Aug 2016 00:57:54 +0000 (00:57 +0000)]
Fix issue #
30766518: Document what targeting N does
am:
b34cbedb4e
Change-Id: I2d2c45ef1dc9528b2b84778532edebac8a9e7712
Suprabh Shukla [Wed, 10 Aug 2016 00:20:57 +0000 (17:20 -0700)]
Fixing admins not being removed from DpmMockContext
We were not calling setActiveAdmin before calling setDeviceOwner or
setProfileOwner in these tests. They were passing because the admins
were not being properly removed in the first place. The admin is
actually removed from the admin list inside onReceive of the receiver
passed in sendOrderedBroadcastForUser, which was not overridden to call
onReceive in DpmMockContext.
Bug:
30726135
Change-Id: I08cab5821228738196b229a8f885f7488aaafa34
Erik Kline [Wed, 10 Aug 2016 00:47:56 +0000 (00:47 +0000)]
Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev
Dianne Hackborn [Wed, 10 Aug 2016 00:45:54 +0000 (00:45 +0000)]
Merge "Fix issue #
30766518: Document what targeting N does" into nyc-mr1-dev
Ruben Brunk [Wed, 10 Aug 2016 00:30:13 +0000 (17:30 -0700)]
Fix setVrThread's exception handling.
Bug:
30746129
Change-Id: I49ee29f12b52c9f9f5f061508c5cc8c89fd1cd11
Jim Miller [Wed, 10 Aug 2016 00:06:19 +0000 (00:06 +0000)]
Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev am:
e11059694a
am:
a39117959d
Change-Id: I49dfe17253201e29f2ab8380a4cbbb5bc073f0e1
Jim Miller [Wed, 10 Aug 2016 00:06:16 +0000 (00:06 +0000)]
Bind fingerprint when we start authentication am:
837fa7e56d
am:
3871272fc6
Change-Id: I950703c466265ec5e164f6e75772800745579d34
Selim Cinek [Tue, 9 Aug 2016 23:59:27 +0000 (23:59 +0000)]
Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev am:
00a6c2979b
am:
cb140ad8dd
Change-Id: Icfe7bcdbcfc5d4799b505182674c38845ae10faf
Selim Cinek [Tue, 9 Aug 2016 23:59:18 +0000 (23:59 +0000)]
Put the affordance launch animation back on the renderthread am:
4ae263c87c
am:
4677240e4f
Change-Id: Ifeb8a03fd0b7fdf05218080cd00b5d00fbb33c73
Jim Miller [Tue, 9 Aug 2016 23:58:13 +0000 (23:58 +0000)]
Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev
am:
e11059694a
Change-Id: I2aaaecd00927ea1dd00ad9a493f5c58a3bc4ddf6
Jim Miller [Tue, 9 Aug 2016 23:58:11 +0000 (23:58 +0000)]
Bind fingerprint when we start authentication
am:
837fa7e56d
Change-Id: Id2e84b60102653598e6d459e83835739b57ef404
Selim Cinek [Tue, 9 Aug 2016 23:52:29 +0000 (23:52 +0000)]
Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev
am:
00a6c2979b
Change-Id: I2430bd0bee50ed7087c59b1ebce873e3094d5451
Selim Cinek [Tue, 9 Aug 2016 23:52:27 +0000 (23:52 +0000)]
Put the affordance launch animation back on the renderthread
am:
4ae263c87c
Change-Id: I675c8a8a4403de9f735e39b03bf185678a601c3c
TreeHugger Robot [Tue, 9 Aug 2016 23:50:40 +0000 (23:50 +0000)]
Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev
Selim Cinek [Tue, 9 Aug 2016 23:41:35 +0000 (23:41 +0000)]
Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev
Makoto Onuki [Tue, 9 Aug 2016 23:39:39 +0000 (23:39 +0000)]
Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev am:
a63469076e
am:
dabb164cc2
Change-Id: I7c41066da3f8a39269329729652127499402cdd9
Makoto Onuki [Tue, 9 Aug 2016 23:39:32 +0000 (23:39 +0000)]
Rescan apps after restore and re-publish manifest shortcuts am:
377b7970ad
am:
51aec5dce5
Change-Id: I02d66c041639a4a9b7fa982c36fcc90d83ecc27e
Makoto Onuki [Tue, 9 Aug 2016 23:34:02 +0000 (23:34 +0000)]
Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev
am:
a63469076e
Change-Id: Icd75a843474dd613412cbc3cc083908f96fb54d0
Makoto Onuki [Tue, 9 Aug 2016 23:33:59 +0000 (23:33 +0000)]
Rescan apps after restore and re-publish manifest shortcuts
am:
377b7970ad
Change-Id: I2da62270e106408a7fec91d7442c239457be3d04
TreeHugger Robot [Tue, 9 Aug 2016 23:22:40 +0000 (23:22 +0000)]
Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev
Erik Wolsheimer [Tue, 9 Aug 2016 22:04:15 +0000 (22:04 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev am:
002dd29764
am:
c327afa0df
Change-Id: I80cb7201377288d43ff9d02367f8e6917de3639f
Erik Wolsheimer [Tue, 9 Aug 2016 22:04:12 +0000 (22:04 +0000)]
Add missing null check to AppErrors#handleAppCrashLocked am:
b2b3b64417
am:
d491a974c1
Change-Id: I0cd3ae219ef819e02782deeb762b902fc89cc64c
Erik Wolsheimer [Tue, 9 Aug 2016 21:55:27 +0000 (21:55 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev
am:
002dd29764
Change-Id: I9ae51ec34a606904c027cc8f987db29160cb3b78
Erik Wolsheimer [Tue, 9 Aug 2016 21:55:25 +0000 (21:55 +0000)]
Add missing null check to AppErrors#handleAppCrashLocked
am:
b2b3b64417
Change-Id: I52ae2660aa36dccd8bb28d189999d4d842834497
TreeHugger Robot [Tue, 9 Aug 2016 21:48:06 +0000 (21:48 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev
Makoto Onuki [Tue, 9 Aug 2016 21:43:55 +0000 (14:43 -0700)]
Rescan apps after restore and re-publish manifest shortcuts
Originally when I wrote backup & restore for ShortcutManager,
there was no manifest shortcuts, so there was no need to
handle preintalled apps specially.
However, now we have manifest shortcuts, which are published
when the user is unlocked, by the time restore happens preinstalled
apps may already have manifest shortcuts, which will be overwritten
by the restored shortcuts.
So we need to re-publish manifest shortcuts after restore.
Bug
30746028
Change-Id: I6afbae7790c9ed38483637f33c381ecb6f854677
Jorim Jaggi [Tue, 9 Aug 2016 21:42:32 +0000 (21:42 +0000)]
Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev am:
529319d81d
am:
2dbb93e41d
Change-Id: I72969ee42d7e0d50a87d9c8829d9f96f0ab8a91f
Jorim Jaggi [Tue, 9 Aug 2016 21:42:25 +0000 (21:42 +0000)]
Fix navigation bar in seascape in BackdropFrameRenderer am:
9a7d0a5f84
am:
cbd845adff
Change-Id: I21133f8441ec3ba6ef6a664dd382570ab95f9a1e
Jorim Jaggi [Tue, 9 Aug 2016 21:37:29 +0000 (21:37 +0000)]
Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev
am:
529319d81d
Change-Id: I5f6e8d98188b829592357570cef8d4cebd045ca3
Jorim Jaggi [Tue, 9 Aug 2016 21:37:24 +0000 (21:37 +0000)]
Fix navigation bar in seascape in BackdropFrameRenderer
am:
9a7d0a5f84
Change-Id: If63b339fd838172fb084ccf664b7d90dce5d2254
TreeHugger Robot [Tue, 9 Aug 2016 21:29:03 +0000 (21:29 +0000)]
Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev
Hemal Patel [Tue, 9 Aug 2016 21:26:05 +0000 (21:26 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09 am:
4e79fcdc0a
am:
a32049ce57
Change-Id: I702a08b75978f8269d83d12c2a6e62b05edbb0e0
Hemal Patel [Tue, 9 Aug 2016 21:25:56 +0000 (21:25 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b am:
f8c0a138fb
am:
5f573a891e
Change-Id: I8268f0c6279598df56ab5acfd311f867b8409524
Hemal Patel [Tue, 9 Aug 2016 21:25:48 +0000 (21:25 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761 am:
ee3c5b3cd5
am:
ae5f7e27a0
Change-Id: Ib219ce2fbf9ebf1a97c49696c2f3b2b7df8828f9
Hemal Patel [Tue, 9 Aug 2016 21:25:41 +0000 (21:25 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3 am:
ed51cf2c85
am:
3026c87001
Change-Id: I7eb61c40226aeac16785edb7b56197fb7699ce9c
Hemal Patel [Tue, 9 Aug 2016 21:19:52 +0000 (21:19 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09
am:
cae34dc577
Change-Id: I2ff827a50cb429cdc18b6b2a0fe2275693ebaf20
Hemal Patel [Tue, 9 Aug 2016 21:19:50 +0000 (21:19 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b
am:
3547fd0642
Change-Id: I325c16b92f193be2ff701da64e3896979441d6e7
Hemal Patel [Tue, 9 Aug 2016 21:19:47 +0000 (21:19 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761
am:
57d3e1c9e1
Change-Id: I5913262cbc44ace40d084a608322658f2d3cd010
Hemal Patel [Tue, 9 Aug 2016 21:19:44 +0000 (21:19 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3
am:
fbbb95ffbf
Change-Id: I0297e686573b191cb16049caf762b20a710eb53c
Hemal Patel [Tue, 9 Aug 2016 21:18:58 +0000 (21:18 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09
am:
4e79fcdc0a
Change-Id: Ifc74e8b7c208ef070ce2aaf3d5113245cf1d1273
Hemal Patel [Tue, 9 Aug 2016 21:18:56 +0000 (21:18 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b
am:
f8c0a138fb
Change-Id: Ica3e6f96b4e55991dd946fd3d73ac725c477d03e
Hemal Patel [Tue, 9 Aug 2016 21:18:54 +0000 (21:18 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761
am:
ee3c5b3cd5
Change-Id: I9005ea88dbf6a3c257b9c50bebae5b6f2b0ca77a
Hemal Patel [Tue, 9 Aug 2016 21:18:37 +0000 (21:18 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3
am:
ed51cf2c85
Change-Id: Iaf5a7aef73e22b9a536a62966567f93c86c6f2a9
Hemal Patel [Tue, 9 Aug 2016 21:10:42 +0000 (21:10 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6
am:
b6962dee09
Change-Id: I5145db9e35199969ada9c38a6c5c972725af178b
Hemal Patel [Tue, 9 Aug 2016 21:10:40 +0000 (21:10 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6
am:
dabee01e9b
Change-Id: I6a17d73c3dab8980c57e9f6c9617bb465c48f1a5
Hemal Patel [Tue, 9 Aug 2016 21:10:37 +0000 (21:10 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6
am:
b6962dee09
Change-Id: Ifa4bcea1c47cfdfe00a36d8ad11c5aeaeeb71175
Hemal Patel [Tue, 9 Aug 2016 21:10:37 +0000 (21:10 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77
am:
3c49a4b761
Change-Id: Ib00803734137a0a4c3a704e45c45c66e246e586b
Hemal Patel [Tue, 9 Aug 2016 21:10:35 +0000 (21:10 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753
am:
ca17f5b8e3
Change-Id: Ief6d2b58e26b4510b00ecb07a5efba180276cd37
Hemal Patel [Tue, 9 Aug 2016 21:10:34 +0000 (21:10 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6
am:
dabee01e9b
Change-Id: I6e3156f2990ddfd73b34015be8a09c972729d26e
Hemal Patel [Tue, 9 Aug 2016 21:10:28 +0000 (21:10 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77
am:
3c49a4b761
Change-Id: I81d45c0ddc35a34da756808ccfb89017b286f261
Hemal Patel [Tue, 9 Aug 2016 21:10:24 +0000 (21:10 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753
am:
ca17f5b8e3
Change-Id: Ic306fd462773e6b6b457a0f8c1ee4a5bd931be22
Hemal Patel [Tue, 9 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
am:
5ca44906c6
Change-Id: I4286b4a8e0766f7c3ca2d7e5ebd5c9f2b296fbb9
Hemal Patel [Tue, 9 Aug 2016 21:03:13 +0000 (21:03 +0000)]
Docs: Fixed the link that loads Fragments guide
am:
a8e1c75bf6
Change-Id: I26ea32ff32067d86fb5390103eec737b293ac031
Hemal Patel [Tue, 9 Aug 2016 21:03:06 +0000 (21:03 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
am:
a70c722c77
Change-Id: I6e1d0d70d5d4b89b083cb74272f064bebf6a273a
Hemal Patel [Tue, 9 Aug 2016 21:03:00 +0000 (21:03 +0000)]
Docs: Changed custom_toast to toast_layout
am:
3b7309d753
Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
Hemal Patel [Tue, 9 Aug 2016 20:55:34 +0000 (20:55 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
Hemal Patel [Tue, 9 Aug 2016 20:53:11 +0000 (20:53 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
Erik Wolsheimer [Fri, 5 Aug 2016 16:24:07 +0000 (09:24 -0700)]
Add missing null check to AppErrors#handleAppCrashLocked
BUG:
30692618
Change-Id: Ibe3589e1248520067714d5a20963a17935789066
(cherry picked from commit
dc74142c74bf37e0ddcbe6ec7d76f57191815b44)
Dianne Hackborn [Tue, 9 Aug 2016 20:18:21 +0000 (13:18 -0700)]
Fix issue #
30766518: Document what targeting N does
Also small documentation cleanup in a few other places.
Change-Id: I16581c751aa0ffa146faba3b140a8fa2170f4520
Chad Brubaker [Tue, 9 Aug 2016 19:59:10 +0000 (19:59 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31 am:
6e1f860c6a
am:
10943c69a2
Change-Id: I51870e48ab7519ef75e1a2643ab5af76918f46db
Shawn Willden [Tue, 9 Aug 2016 19:52:32 +0000 (19:52 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a am:
58635e74ed
am:
c9974a889b
Change-Id: I0046859ca48a52a5e9cd1c32c44eb4917557edcc
Shawn Willden [Tue, 9 Aug 2016 19:52:25 +0000 (19:52 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9 am:
e5d71c4cfa
am:
0b90611069
Change-Id: I543ce45e581e3b12b5dde9b055e72b2b7a3ecd7c
Chad Brubaker [Tue, 9 Aug 2016 19:50:35 +0000 (19:50 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31
am:
6e1f860c6a
Change-Id: I5c1f4d9785e56777e37da614ed6515113ae277c1
Chad Brubaker [Tue, 9 Aug 2016 19:43:50 +0000 (19:43 +0000)]
Merge "Add stub isCTVerificationRequired methods"
am:
5b63231a31
Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
Shawn Willden [Tue, 9 Aug 2016 19:43:24 +0000 (19:43 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a
am:
61f9b9227e
Change-Id: I8e6f93c62f9bba9ca6dbe2f838932e4c42c0c04c
Shawn Willden [Tue, 9 Aug 2016 19:43:17 +0000 (19:43 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9
am:
7f35a49d77
Change-Id: I2b86839143ed1419e5f5b025b785d33a600105c4
Shawn Willden [Tue, 9 Aug 2016 19:43:15 +0000 (19:43 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a
am:
58635e74ed
Change-Id: Ie3ba00057e4b44c41520af58fd27dfbbb412f3ca
Shawn Willden [Tue, 9 Aug 2016 19:43:10 +0000 (19:43 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9
am:
e5d71c4cfa
Change-Id: I5b488b48ca27365bf4066acd1df4bc40a08660f1
Andrew Rossignol [Tue, 9 Aug 2016 19:38:36 +0000 (19:38 +0000)]
Merge "ContextHub: Avoid reference leaks" into cw-f-dev
am:
efdd4ac34b
Change-Id: I05f09b52140d307980c5fabfd0f7a2395d750340
Andrew Rossignol [Tue, 9 Aug 2016 19:38:31 +0000 (19:38 +0000)]
ContextHub: Avoid reference leaks
am:
52dda59896
Change-Id: I78df3e5c2f78684eb1ec5ac4f2781cf88b0fa2f2
Shawn Willden [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I8f350a045c1eb301418a91edfd975a388298507b
Julia Reynolds [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev am:
6715c6abbd
am:
f5c030217f
Change-Id: I91d529e072d79aefda24a204ccd653e080a2697d
Shawn Willden [Tue, 9 Aug 2016 19:38:20 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Ic680cc75dbe80b57876dae701551cacfe2022086
Julia Reynolds [Tue, 9 Aug 2016 19:38:17 +0000 (19:38 +0000)]
Clean up zen rules and permissions immediately on uninstall. am:
6434eb2e04
am:
eaf9974125
Change-Id: I80252835f84de0fc22491c5aa95595819c0d945c
Shawn Willden [Tue, 9 Aug 2016 19:38:05 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I302b1dce1cff57b6f1cd5da3d6619984c80fde92
Shawn Willden [Tue, 9 Aug 2016 19:38:00 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Iadb16bd13d4bb525805dd0266aea046c4c472309
Andrew Rossignol [Tue, 9 Aug 2016 19:17:31 +0000 (19:17 +0000)]
Merge "ContextHub: Avoid reference leaks" into cw-f-dev
Chad Brubaker [Tue, 9 Aug 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Add stub isCTVerificationRequired methods"
Julia Reynolds [Tue, 9 Aug 2016 19:10:46 +0000 (19:10 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev
am:
6715c6abbd
Change-Id: I0d41f50144bb308f53c38ee4fa6e6d760adcb79e
Julia Reynolds [Tue, 9 Aug 2016 19:10:43 +0000 (19:10 +0000)]
Clean up zen rules and permissions immediately on uninstall.
am:
6434eb2e04
Change-Id: Id9c534ec4226f341909e151c6703b23b6c7b9af9