OSDN Git Service
Chris Banes [Tue, 21 Jun 2016 08:21:35 +0000 (08:21 +0000)]
Fix NPE in Toolbar - framework edition am:
3b925c1ab0
am:
09bf9e69bc
Change-Id: I17d47807646ea38d5565238d17ef6b34715a822a
Chris Banes [Tue, 21 Jun 2016 08:16:28 +0000 (08:16 +0000)]
Fix NPE in Toolbar - framework edition
am:
3b925c1ab0
Change-Id: I340ddff981e938bf6f9bd3f1392eec03f25f3e5d
Chris Banes [Mon, 20 Jun 2016 09:38:02 +0000 (10:38 +0100)]
Fix NPE in Toolbar - framework edition
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.
BUG:
28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
Andrii Kulian [Tue, 21 Jun 2016 05:47:26 +0000 (05:47 +0000)]
Merge \"Merge \\\"Compare intent filter when launching adjacent\\\" into nyc-dev am:
9980514ee0 am:
b809d1cb79\" into nyc-mr1-dev-plus-aosp
am:
f7c377f0ba
Change-Id: I522e885366d4e395c5d295617902003a5c4a8d2f
Andrii Kulian [Tue, 21 Jun 2016 05:38:34 +0000 (05:38 +0000)]
Merge \\\"Compare intent filter when launching adjacent\\\" into nyc-dev am:
9980514ee0 am:
4f47b392cc
am:
1f52fe8ee7
Change-Id: I6805746065578f044d33929b3bd4a5d1e19a69e1
Android Build Merger (Role) [Tue, 21 Jun 2016 05:35:43 +0000 (05:35 +0000)]
Merge "Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am:
9980514ee0 am:
b809d1cb79" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Tue, 21 Jun 2016 05:33:59 +0000 (05:33 +0000)]
Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am:
9980514ee0
am:
b809d1cb79
Change-Id: Ia19c62e34dc1c64be600641c31f9825b1fe0e788
Andrii Kulian [Tue, 21 Jun 2016 05:33:50 +0000 (05:33 +0000)]
Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am:
9980514ee0
am:
4f47b392cc
Change-Id: I49d1f1e08d9b917f4ba83316d7e6a37f42b72c8f
Andrii Kulian [Tue, 21 Jun 2016 05:27:27 +0000 (05:27 +0000)]
Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am:
9980514ee0
Change-Id: Icdd46a5b4735f04d8e82cd5ffb34bfd9066a431f
Andrii Kulian [Tue, 21 Jun 2016 05:27:24 +0000 (05:27 +0000)]
Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am:
9980514ee0
Change-Id: I8c2b03438fdeed6bce12489c5639245b79097577
Seigo Nonaka [Tue, 21 Jun 2016 05:21:49 +0000 (05:21 +0000)]
Merge "Add test case for issue
29491345"
Andrii Kulian [Tue, 21 Jun 2016 05:17:58 +0000 (05:17 +0000)]
Merge "Compare intent filter when launching adjacent" into nyc-dev
Sergei Vasilinetc [Tue, 21 Jun 2016 04:10:48 +0000 (04:10 +0000)]
Merge "Fix documentation for GradientDrawable.getCornerRadius"
Jeremie GARCIA [Tue, 21 Jun 2016 03:13:04 +0000 (03:13 +0000)]
Merge \"Merge \\\"Parse \\\"vendor/priv-app\\\" to find privileged applications\\\" into nyc-dev am:
8a1bc54ab0 am:
bc7e15eedc\" into nyc-mr1-dev-plus-aosp
am:
2f20dd2e26
Change-Id: Ie1485e1becf9464baea0b7998027d97d8031d61a
Jeremie GARCIA [Tue, 21 Jun 2016 03:13:01 +0000 (03:13 +0000)]
Merge \\\"Parse \\\"vendor/priv-app\\\" to find privileged applications\\\" into nyc-dev am:
8a1bc54ab0 am:
6b58130adc
am:
1a161ce520
Change-Id: I69cf9367a937e7b1f52c2e235124b5e94ade1f74
Android Build Merger (Role) [Tue, 21 Jun 2016 03:08:40 +0000 (03:08 +0000)]
Merge "Merge \\"Parse \\"vendor/priv-app\\" to find privileged applications\\" into nyc-dev am:
8a1bc54ab0 am:
bc7e15eedc" into nyc-mr1-dev-plus-aosp
Jeremie GARCIA [Tue, 21 Jun 2016 03:08:22 +0000 (03:08 +0000)]
Merge \\"Parse \\"vendor/priv-app\\" to find privileged applications\\" into nyc-dev am:
8a1bc54ab0
am:
bc7e15eedc
Change-Id: Ifc938280d1ba107c57c84689b7a4d50f90c61020
Jeremie GARCIA [Tue, 21 Jun 2016 03:07:50 +0000 (03:07 +0000)]
Merge \\"Parse \\"vendor/priv-app\\" to find privileged applications\\" into nyc-dev am:
8a1bc54ab0
am:
6b58130adc
Change-Id: I2690303b23a8283fcabb92c4088b28f9d871611c
Jeremie GARCIA [Tue, 21 Jun 2016 03:02:46 +0000 (03:02 +0000)]
Merge \"Parse \"vendor/priv-app\" to find privileged applications\" into nyc-dev
am:
8a1bc54ab0
Change-Id: I8bd79a69124345d826eff9e32b00aa8466058370
Jeremie GARCIA [Tue, 21 Jun 2016 03:02:41 +0000 (03:02 +0000)]
Merge \"Parse \"vendor/priv-app\" to find privileged applications\" into nyc-dev
am:
8a1bc54ab0
Change-Id: I651efd38fa6dd6433a13e5eb7569d882866cbc1e
TreeHugger Robot [Tue, 21 Jun 2016 02:56:36 +0000 (02:56 +0000)]
Merge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev
Jim Miller [Tue, 21 Jun 2016 02:02:46 +0000 (02:02 +0000)]
Merge \\"Enable fingerprint nav by default\\" into nyc-mr1-dev am:
1ac356280c
am:
c4f7a60765
Change-Id: I56bc077248e6b08ea4a1b5aa384dbb063f67c9f5
Jim Miller [Tue, 21 Jun 2016 01:58:03 +0000 (01:58 +0000)]
Merge \"Enable fingerprint nav by default\" into nyc-mr1-dev
am:
1ac356280c
Change-Id: Id6df513225b539497309783c3d4f11745a147684
TreeHugger Robot [Tue, 21 Jun 2016 01:51:57 +0000 (01:51 +0000)]
Merge "Enable fingerprint nav by default" into nyc-mr1-dev
sergeyv [Tue, 21 Jun 2016 01:32:03 +0000 (18:32 -0700)]
Fix documentation for GradientDrawable.getCornerRadius
Change-Id: I4ad1ef7d989df250a9208107b5baac9e79816194
Seigo Nonaka [Tue, 21 Jun 2016 01:31:03 +0000 (10:31 +0900)]
Add test case for issue
29491345
Bug:
29491345
Change-Id: Icd7d1612ad317978356a17688d6ceb8b6a4825a8
TreeHugger Robot [Tue, 21 Jun 2016 00:29:01 +0000 (00:29 +0000)]
Merge "Make print via cloud confirm diag fragment public"
Sergei Vasilinetc [Tue, 21 Jun 2016 00:16:34 +0000 (00:16 +0000)]
Merge "HWUI: move microbench to APCT infrastructure"
Sungsoo Lim [Mon, 20 Jun 2016 23:56:12 +0000 (23:56 +0000)]
Merge "MediaBrowserService: Fix ConcurrentModificationException"
TreeHugger Robot [Mon, 20 Jun 2016 23:55:13 +0000 (23:55 +0000)]
Merge "Moving Menu-related logic from BaseActivity to MenuManager."
Jeremie GARCIA [Thu, 5 Nov 2015 17:27:59 +0000 (18:27 +0100)]
Parse "vendor/priv-app" to find privileged applications
Change-Id: Icbbafba96b7880f51ca3afcee53d5f3dd5b86a45
Signed-off-by: Jeremie GARCIA <jeremie.garcia@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Bug:
29488499
Wale Ogunwale [Mon, 20 Jun 2016 23:26:32 +0000 (23:26 +0000)]
Merge \"Merge \\\"Don\\\'t re-launch stopped activities while the device is sleeping\\\" into nyc-dev am:
f159b74608 am:
6d296286e4\" into nyc-mr1-dev-plus-aosp
am:
c9077221bb
Change-Id: If2a00e182c0e622ac42cad97c2683929afdbb702
Wei Jia [Mon, 20 Jun 2016 23:26:30 +0000 (23:26 +0000)]
Merge \"Merge \\\"MediaPlayer: fix java doc for setPlaybackParams.\\\" into nyc-dev am:
bd45be5032 am:
24ac2ece50\" into nyc-mr1-dev-plus-aosp
am:
7d145e279b
Change-Id: I907535cf2c10c9d0139dda0768f24fbf503d4217
Wale Ogunwale [Mon, 20 Jun 2016 23:26:26 +0000 (23:26 +0000)]
Merge \\\"Don\\\'t re-launch stopped activities while the device is sleeping\\\" into nyc-dev am:
f159b74608 am:
87ca3c1fa5
am:
f7779b4bcf
Change-Id: I866ca87bafc9d2ed16160cff4d5b18f7d46768ba
Android Build Merger (Role) [Mon, 20 Jun 2016 23:16:49 +0000 (23:16 +0000)]
Merge "Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am:
f159b74608 am:
6d296286e4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 20 Jun 2016 23:16:38 +0000 (23:16 +0000)]
Merge "Merge \\"MediaPlayer: fix java doc for setPlaybackParams.\\" into nyc-dev am:
bd45be5032 am:
24ac2ece50" into nyc-mr1-dev-plus-aosp
Wei Jia [Mon, 20 Jun 2016 23:16:37 +0000 (23:16 +0000)]
Merge \\\"MediaPlayer: fix java doc for setPlaybackParams.\\\" into nyc-dev am:
bd45be5032 am:
2beba073d1
am:
b3660d6930
Change-Id: I7525ae0ebcf0440b8fc2deb224719e768ab3e5f3
Wale Ogunwale [Mon, 20 Jun 2016 23:15:58 +0000 (23:15 +0000)]
Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am:
f159b74608
am:
6d296286e4
Change-Id: I338f8d2cf0124a36b61d01dfa79dee91128506ac
Wale Ogunwale [Mon, 20 Jun 2016 23:15:54 +0000 (23:15 +0000)]
Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am:
f159b74608
am:
87ca3c1fa5
Change-Id: I14d57d688026d06bc4cad7c492f80a41b8e5bb85
Wei Jia [Mon, 20 Jun 2016 23:15:54 +0000 (23:15 +0000)]
Merge \\"MediaPlayer: fix java doc for setPlaybackParams.\\" into nyc-dev am:
bd45be5032
am:
24ac2ece50
Change-Id: I2c910192085820a004176f77d1f042e9869224fe
Wale Ogunwale [Mon, 20 Jun 2016 23:08:12 +0000 (23:08 +0000)]
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am:
f159b74608
Change-Id: Iaf6cdfd3e6b7ec6a1e1d37cc200b196d105f1ef7
Wei Jia [Mon, 20 Jun 2016 23:08:06 +0000 (23:08 +0000)]
Merge \\"MediaPlayer: fix java doc for setPlaybackParams.\\" into nyc-dev am:
bd45be5032
am:
2beba073d1
Change-Id: I55f86f536f55ddd7fdbd8b9b682aad88e25230a5
Wale Ogunwale [Mon, 20 Jun 2016 23:07:55 +0000 (23:07 +0000)]
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am:
f159b74608
Change-Id: I83edfb392f0f179b4c28aaab3eba0c51fe11d207
Wei Jia [Mon, 20 Jun 2016 23:07:53 +0000 (23:07 +0000)]
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am:
bd45be5032
Change-Id: I23b24e3430335e037809da0c0721bf1de0e529dd
TreeHugger Robot [Mon, 20 Jun 2016 23:03:45 +0000 (23:03 +0000)]
Merge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev
Wei Jia [Mon, 20 Jun 2016 23:03:20 +0000 (23:03 +0000)]
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am:
bd45be5032
Change-Id: I1b3604fe84dacf3febf324de154cad00fcd688b8
Sudheer Shanka [Mon, 20 Jun 2016 23:00:08 +0000 (23:00 +0000)]
Merge \\\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\\" into nyc-dev am:
f00e780472 am:
2050cfd7ba
am:
90483c4e21
Change-Id: Id52f59478b637b38dd48e4f1d2089027ba2b094d
Scott Main [Mon, 20 Jun 2016 23:00:06 +0000 (23:00 +0000)]
Merge \"Merge \\\"just a reorg of some links to put all Android Studio help button redirects together\\\" into nyc-dev am:
db4ef3f4f8 am:
bceacc42a2\" into nyc-mr1-dev-plus-aosp
am:
02221a3349
Change-Id: Ia6d053dfe9bac3e4122aa556d76f8473937dea77
Sudheer Shanka [Mon, 20 Jun 2016 23:00:03 +0000 (23:00 +0000)]
Merge \\\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\\" into nyc-dev am:
f00e780472 am:
7aecaf8d52
am:
8ecf1e52ba
Change-Id: Ic63f937457b39d56f1ac79adc082efc2196e429b
Wei Jia [Mon, 20 Jun 2016 22:58:32 +0000 (22:58 +0000)]
Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev
Wei Jia [Thu, 16 Jun 2016 22:18:20 +0000 (15:18 -0700)]
MediaPlayer: fix java doc for setPlaybackParams.
Bug:
29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
Sudheer Shanka [Mon, 20 Jun 2016 22:52:32 +0000 (22:52 +0000)]
Merge \\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\" into nyc-dev am:
f00e780472
am:
2050cfd7ba
Change-Id: I52bf33ff9a31e716bf1b1ac289e3115d0fc47ed5
Scott Main [Mon, 20 Jun 2016 22:50:15 +0000 (22:50 +0000)]
Merge \"Merge \\\"just a reorg of some links to put all Android Studio help button redirects together\\\" into nyc-dev am:
db4ef3f4f8 am:
b595fdc0e9\" into nyc-mr1-dev-plus-aosp
am:
1ef7fe8bda
Change-Id: I7cf5a9f40596880b24168dfd113fcb360e1b2c86
Antonio Cansado [Mon, 20 Jun 2016 22:50:11 +0000 (22:50 +0000)]
Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am:
c20ffc2a9e am:
43f0bd6e60
am:
ee97e6f183
Change-Id: I0044bb10437d67bed5041cec9b58ae231b820f80
Android Build Merger (Role) [Mon, 20 Jun 2016 22:49:55 +0000 (22:49 +0000)]
Merge "Merge \\"just a reorg of some links to put all Android Studio help button redirects together\\" into nyc-dev am:
db4ef3f4f8 am:
bceacc42a2" into nyc-mr1-dev-plus-aosp
Sudheer Shanka [Mon, 20 Jun 2016 22:49:34 +0000 (22:49 +0000)]
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
am:
f00e780472
Change-Id: I542e11688a52dd3cde8fd8c3df252b2ead0e5240
Scott Main [Mon, 20 Jun 2016 22:49:31 +0000 (22:49 +0000)]
Merge \\"just a reorg of some links to put all Android Studio help button redirects together\\" into nyc-dev am:
db4ef3f4f8
am:
bceacc42a2
Change-Id: I859f800bee338968a2b242a224c71e0880e0a306
Sudheer Shanka [Mon, 20 Jun 2016 22:49:27 +0000 (22:49 +0000)]
Merge \\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\" into nyc-dev am:
f00e780472
am:
7aecaf8d52
Change-Id: I62c705da440cc61e5a9bc9d8df7e781e0ec3d87d
Antonio Cansado [Mon, 20 Jun 2016 22:44:51 +0000 (22:44 +0000)]
Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am:
c20ffc2a9e am:
13cf0e7d54
am:
1d4fd3ed27
Change-Id: I5140373d930726e0b93fa62ac03315a37c581b5b
Android Build Merger (Role) [Mon, 20 Jun 2016 22:44:13 +0000 (22:44 +0000)]
Merge "Merge \\"just a reorg of some links to put all Android Studio help button redirects together\\" into nyc-dev am:
db4ef3f4f8 am:
b595fdc0e9" into nyc-mr1-dev-plus-aosp
Scott Main [Mon, 20 Jun 2016 22:43:36 +0000 (22:43 +0000)]
Merge \\"just a reorg of some links to put all Android Studio help button redirects together\\" into nyc-dev am:
db4ef3f4f8
am:
b595fdc0e9
Change-Id: Idd65315a08cb2047e252a2c77c499d0de08377a8
Philip P. Moltmann [Mon, 20 Jun 2016 22:43:30 +0000 (15:43 -0700)]
Make print via cloud confirm diag fragment public
Fixes:
29516187
Change-Id: I91266704de130b761c0c3f5d53c465c1c21dfe5a
Sudheer Shanka [Mon, 20 Jun 2016 22:43:21 +0000 (22:43 +0000)]
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
am:
f00e780472
Change-Id: Iff3282ba0b141652697c7100ff5db77906666f2e
smain@google.com [Mon, 20 Jun 2016 22:43:05 +0000 (22:43 +0000)]
Merge \"just a reorg of some links to put all Android Studio help button redirects together\" into nyc-dev
am:
db4ef3f4f8
Change-Id: Ie519bb30a4fc09c98901098b7124dfd5fef39238
Antonio Cansado [Mon, 20 Jun 2016 22:42:15 +0000 (22:42 +0000)]
Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am:
c20ffc2a9e
am:
43f0bd6e60
Change-Id: I9337468b820d214f4d40f0768f45c11860cef068
Dianne Hackborn [Mon, 20 Jun 2016 22:40:41 +0000 (22:40 +0000)]
Merge \\\"Fix issue #
29438842: Enter the \\\"am broadcast -a...\\\" into nyc-dev am:
d2480ab7bb am:
2fcd92182a
am:
87ee785316
Change-Id: I6d3964ec06a39093ca43c3b2d17f989e8098bab1
Roozbeh Pournader [Mon, 20 Jun 2016 22:40:40 +0000 (22:40 +0000)]
Merge \\"Revert \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\"\\" into nyc-mr1-dev am:
55d9051e58
am:
2704d4ead1 -s ours
Change-Id: Icb8b53c17aa76979f779361c202d209ac17bc63f
Hemal Patel [Mon, 20 Jun 2016 22:40:38 +0000 (22:40 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214 am:
2a3336813a am:
549f0f3f0c
am:
e41f004ee1
Change-Id: I259468a2a82e21867a9d1a3bead62ce19bf188f2
Dianne Hackborn [Mon, 20 Jun 2016 22:40:36 +0000 (22:40 +0000)]
Merge \\\"Fix issue #
29438842: Enter the \\\"am broadcast -a...\\\" into nyc-dev am:
d2480ab7bb am:
61923ced0c
am:
a2391dcc6f
Change-Id: I060c6e600e4d27ac63bbc3b1befc7e574d12d1d7
Hemal Patel [Mon, 20 Jun 2016 22:40:33 +0000 (22:40 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214 am:
2a3336813a am:
40f8005156
am:
96fe18e80b
Change-Id: I793c6cf5be4f6cec45505a8d84425a2eb3d1772f
smain@google.com [Mon, 20 Jun 2016 22:40:24 +0000 (22:40 +0000)]
Merge \"just a reorg of some links to put all Android Studio help button redirects together\" into nyc-dev
am:
db4ef3f4f8
Change-Id: Ib2bcfa6c5bdfb7475b714c5fef947b3f173f1914
sergeyv [Mon, 20 Jun 2016 22:27:39 +0000 (15:27 -0700)]
HWUI: move microbench to APCT infrastructure
bug:
29515780
Change-Id: I06f0518e2948d4268a1fa8ec99e08b5fcaaa3afd
Sudheer Shanka [Mon, 20 Jun 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission." into nyc-dev
Antonio Cansado [Mon, 20 Jun 2016 22:36:49 +0000 (22:36 +0000)]
Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am:
c20ffc2a9e
am:
13cf0e7d54
Change-Id: Idb7a28cf53e4c1b963df2dc0aff8de47d9ca8069
Dianne Hackborn [Mon, 20 Jun 2016 22:33:33 +0000 (22:33 +0000)]
Merge \\"Fix issue #
29438842: Enter the \\"am broadcast -a...\\" into nyc-dev am:
d2480ab7bb
am:
2fcd92182a
Change-Id: I073e2192808430fd16803a12c9b39cab536ef0e4
Roozbeh Pournader [Mon, 20 Jun 2016 22:33:29 +0000 (22:33 +0000)]
Merge \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\" into nyc-mr1-dev
am:
55d9051e58
Change-Id: I91e077b159c8830af38d608855b5cc6310e7f2d6
Hemal Patel [Mon, 20 Jun 2016 22:33:25 +0000 (22:33 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214 am:
2a3336813a
am:
549f0f3f0c
Change-Id: Iaa6dd120e02c7e0c06f8c2ae3c21745be0f3db54
Dianne Hackborn [Mon, 20 Jun 2016 22:30:16 +0000 (22:30 +0000)]
Merge \\"Fix issue #
29438842: Enter the \\"am broadcast -a...\\" into nyc-dev am:
d2480ab7bb
am:
61923ced0c
Change-Id: I8b91961e7711e6ff2b92506c6204fb57d6f0aed9
Antonio Cansado [Mon, 20 Jun 2016 22:29:49 +0000 (22:29 +0000)]
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
am:
c20ffc2a9e
Change-Id: I477910de04ef5a9a35d795240b93c3cf56e78042
Antonio Cansado [Mon, 20 Jun 2016 22:29:45 +0000 (22:29 +0000)]
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
am:
c20ffc2a9e
Change-Id: I3839e516a128befbfe677b17b05a557b9e0afd87
Scott Main [Mon, 20 Jun 2016 22:28:54 +0000 (22:28 +0000)]
Merge "just a reorg of some links to put all Android Studio help button redirects together" into nyc-dev
smain@google.com [Mon, 20 Jun 2016 22:25:56 +0000 (15:25 -0700)]
just a reorg of some links to put all Android Studio help button redirects together
Change-Id: If928756a87b18a12caa21effa15c5005d74f15c6
Antonio Cansado [Mon, 20 Jun 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
Dianne Hackborn [Mon, 20 Jun 2016 22:21:53 +0000 (22:21 +0000)]
Merge \"Fix issue #
29438842: Enter the \"am broadcast -a...\" into nyc-dev
am:
d2480ab7bb
Change-Id: I57f8a28b73cb91f6602f7ac9dce67bdb5ea545aa
Dianne Hackborn [Mon, 20 Jun 2016 22:18:29 +0000 (22:18 +0000)]
Merge \"Fix issue #
29438842: Enter the \"am broadcast -a...\" into nyc-dev
am:
d2480ab7bb
Change-Id: Ic0748c75374e236cce9a7d218d38b97397722696
Hemal Patel [Mon, 20 Jun 2016 22:12:16 +0000 (22:12 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214 am:
2a3336813a
am:
40f8005156
Change-Id: Ibed01219287a98393d8d23f5aab5feca13baba33
Dianne Hackborn [Mon, 20 Jun 2016 22:09:27 +0000 (22:09 +0000)]
Merge "Fix issue #
29438842: Enter the "am broadcast -a..." into nyc-dev
Roozbeh Pournader [Mon, 20 Jun 2016 22:08:21 +0000 (22:08 +0000)]
Merge "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"" into nyc-mr1-dev
Hemal Patel [Mon, 20 Jun 2016 22:04:48 +0000 (22:04 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214
am:
2a3336813a
Change-Id: I23fb27cd245d80d942c999466ebd8c6229379af8
Hemal Patel [Mon, 20 Jun 2016 22:04:37 +0000 (22:04 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214
am:
2a3336813a
Change-Id: Ie48aea195c987e29155013f699c36272dddc432e
Roozbeh Pournader [Mon, 20 Jun 2016 22:04:06 +0000 (22:04 +0000)]
Merge \\\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\\" into nyc-dev am:
160126e2d8 am:
1f2f328025
am:
295bdbb727 -s ours
Change-Id: I5b06a39252c89ded78c0143614328298199446c1
Antonio Cansado [Mon, 20 Jun 2016 22:03:03 +0000 (15:03 -0700)]
Fix infinite loop when registering data usage callback.
Trivial fix is to call the method that takes the handler as a param.
Bug:
29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
Hemal Patel [Mon, 20 Jun 2016 22:01:02 +0000 (22:01 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e
am:
d5af0a1214
Change-Id: I70c520f7ee4141b3c7c193aef6e4559ea5b35cc9
Roozbeh Pournader [Mon, 20 Jun 2016 21:59:29 +0000 (14:59 -0700)]
Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"
This reverts commit
e977b0ae59bbd7af0ccdf56db6aa0a53c5e6414d for MR1.
The original commit is only intended for N, not MR1.
Roozbeh Pournader [Mon, 20 Jun 2016 21:57:13 +0000 (21:57 +0000)]
Merge \\\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\\" into nyc-dev am:
160126e2d8 am:
73939d8a60
am:
a1de63c871 -s ours
Change-Id: I565c6ccb64381283cfbd2e88de5e75aede5eca18
Hemal Patel [Mon, 20 Jun 2016 21:53:54 +0000 (21:53 +0000)]
Docs: Changed sample link under Related Samples
am:
ab5de09e7e
Change-Id: Ic7423b2c59cb70ff8a13c8b67e51e5d6e572f278
Roozbeh Pournader [Mon, 20 Jun 2016 21:53:42 +0000 (21:53 +0000)]
Merge \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\" into nyc-dev am:
160126e2d8
am:
1f2f328025
Change-Id: I42c28ef717d40a6894577ecb9b662addbf202569
Roozbeh Pournader [Mon, 20 Jun 2016 21:51:12 +0000 (21:51 +0000)]
Merge \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\" into nyc-dev am:
160126e2d8
am:
73939d8a60
Change-Id: Ib8af2e151d29b17a8492fe00cd0b1b5e412ca5f5
Hall Liu [Mon, 20 Jun 2016 21:49:31 +0000 (21:49 +0000)]
Merge \"Merge \\\\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c am:
317d0cb169 am:
edace5e820 -s ours am:
f184789ae9 am:
4eff005260\" into nyc-mr1-dev-plus-aosp
am:
ab1383d161 -s ours
Change-Id: Ie9cae84613360c545b9b578903e965eb1adbb8c5
Hall Liu [Mon, 20 Jun 2016 21:49:28 +0000 (21:49 +0000)]
Merge \\\\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c am:
317d0cb169 am:
edace5e820 -s ours am:
f184789ae9 am:
7e62bf065c
am:
3e633acd70 -s ours
Change-Id: I100675dd3f20aafcf08599b7947a1ddd88c10d07
OSDN Git Service
