OSDN Git Service
Siyamed Sinir [Tue, 16 Feb 2016 22:36:26 +0000 (14:36 -0800)]
Visibility fixes for text related tests.
Some of the text and text layout related tests fail because of the
visibility of parameters/functions they use. This CL updates
annotations and visibility of related classes.
Bug:
29871441
Change-Id: Ia06072815261379ff839c440482d94570ec05a80
Ta-wei Yen [Fri, 20 May 2016 01:29:22 +0000 (01:29 +0000)]
Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am:
4f2a1d0913 am:
ba9b910bbc" into nyc-mr1-dev-plus-aosp
am:
44aac008a8
* commit '
44aac008a801cfcfe00088259272a6a4556e9947':
Change-Id: Ie83f12a37e045c12badfa2a58c6c9e1a715d64e6
Ta-wei Yen [Fri, 20 May 2016 01:23:22 +0000 (01:23 +0000)]
Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am:
4f2a1d0913 am:
93ad8c6b2f" into nyc-mr1-dev-plus-aosp
am:
48fcac0445
* commit '
48fcac0445741a9c4ba3bee60a5c41758c9b4068':
Hide VoicemailContract.setQuota()
Change-Id: I236f788a0ee0e1bca73163108f055d15c7a33050
Ta-wei Yen [Fri, 20 May 2016 01:21:47 +0000 (01:21 +0000)]
Merge "Merge "Rename visual voicemail sync intent value" into nyc-dev am:
0f712b164f am:
7220c75f65" into nyc-mr1-dev-plus-aosp
am:
4574c449e9
* commit '
4574c449e91e289c7840de23148802c7263a9839':
Change-Id: I5384358263725cb787629a5b0a8f5e0ccfd7428f
Ta-wei Yen [Fri, 20 May 2016 01:19:35 +0000 (01:19 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev am:
0f712b164f am:
621b68a213
am:
f652b1ec42
* commit '
f652b1ec426b0d8141cd5860a8ddd0985cb1c08b':
Rename visual voicemail sync intent value
Change-Id: I3769f7a4958eae52047dc276b96939a73418d1ac
Android Build Merger (Role) [Fri, 20 May 2016 01:15:08 +0000 (01:15 +0000)]
Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am:
4f2a1d0913 am:
ba9b910bbc" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 May 2016 01:14:58 +0000 (01:14 +0000)]
Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am:
4f2a1d0913 am:
93ad8c6b2f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 May 2016 01:14:54 +0000 (01:14 +0000)]
Merge "Merge "Rename visual voicemail sync intent value" into nyc-dev am:
0f712b164f am:
7220c75f65" into nyc-mr1-dev-plus-aosp
Ta-wei Yen [Fri, 20 May 2016 01:14:08 +0000 (01:14 +0000)]
Merge "Hide VoicemailContract.setQuota()" into nyc-dev am:
4f2a1d0913
am:
ba9b910bbc
* commit '
ba9b910bbcb9297a962734fdd5eea11f9d180d71':
Hide VoicemailContract.setQuota()
Change-Id: I085299287cbb5e9a39adaf2fefcd6b529e565e32
Ta-wei Yen [Fri, 20 May 2016 01:14:01 +0000 (01:14 +0000)]
Merge "Hide VoicemailContract.setQuota()" into nyc-dev am:
4f2a1d0913
am:
93ad8c6b2f
* commit '
93ad8c6b2f9b6610989ef8d37e62f7b66e6f6c11':
Hide VoicemailContract.setQuota()
Change-Id: Ibce8e2d08074ea44e22a0b3a9fc596ebdb78740e
Ta-wei Yen [Fri, 20 May 2016 01:11:34 +0000 (01:11 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev am:
0f712b164f
am:
621b68a213
* commit '
621b68a2136b644734292655228503c42a541576':
Rename visual voicemail sync intent value
Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
Ta-wei Yen [Fri, 20 May 2016 01:11:30 +0000 (01:11 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev am:
0f712b164f
am:
7220c75f65
* commit '
7220c75f65b615999d2d555024aab6a324b0f376':
Rename visual voicemail sync intent value
Change-Id: Ia94612e1fe827b829d2caedc41e177bed9dfb681
Ta-wei Yen [Fri, 20 May 2016 01:07:56 +0000 (01:07 +0000)]
Merge "Hide VoicemailContract.setQuota()" into nyc-dev
am:
4f2a1d0913
* commit '
4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
Hide VoicemailContract.setQuota()
Change-Id: I11017309443435f9fe840c72deada0c7984f5ce9
Ta-wei Yen [Fri, 20 May 2016 01:07:52 +0000 (01:07 +0000)]
Merge "Hide VoicemailContract.setQuota()" into nyc-dev
am:
4f2a1d0913
* commit '
4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
Hide VoicemailContract.setQuota()
Change-Id: Ifc1365650a981130a376ef253e96331595475510
Ta-wei Yen [Fri, 20 May 2016 01:06:04 +0000 (01:06 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev
am:
0f712b164f
* commit '
0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value
Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
Ta-wei Yen [Fri, 20 May 2016 01:06:03 +0000 (01:06 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev
am:
0f712b164f
* commit '
0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value
Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
Ta-wei Yen [Fri, 20 May 2016 01:00:29 +0000 (01:00 +0000)]
Merge "Hide VoicemailContract.setQuota()" into nyc-dev
Ta-wei Yen [Fri, 20 May 2016 01:00:02 +0000 (01:00 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev
Hemal Patel [Fri, 20 May 2016 00:43:14 +0000 (00:43 +0000)]
Merge "Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6 am:
a18a3d3211 am:
99a9b165e8 am:
98c5daf98a" into nyc-mr1-dev-plus-aosp
am:
6625924f7a
* commit '
6625924f7a8ff126baf9fbf3b36270d11359f710':
Change-Id: I3b8ab778b216c42d94a85406dc53a75e3219719b
Hemal Patel [Fri, 20 May 2016 00:43:09 +0000 (00:43 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6 am:
a18a3d3211 am:
99a9b165e8 am:
070cb41933
am:
ab9663ebfa
* commit '
ab9663ebfa97b45750c5dcd79ff3d308fd4e7e75':
Docs: Fixed a wrong file name
Change-Id: I183f8dfebe23d00a39713dfb45dec48fc0a22e2e
Cheryl Potter [Fri, 20 May 2016 00:43:02 +0000 (00:43 +0000)]
Merge "Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702 am:
0793d19267 am:
212fe6c071 am:
e6192a3aad" into nyc-mr1-dev-plus-aosp
am:
88cd7d4bb1
* commit '
88cd7d4bb1d853fe142554c08ba1d71524fa894e':
Change-Id: Iccb100e9cf1366f1dd343160e86447a5b87529f4
smain@google.com [Fri, 20 May 2016 00:37:58 +0000 (00:37 +0000)]
Merge "Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc am:
ccf143ea10 am:
eaad66b697 am:
d1515a26e8" into nyc-mr1-dev-plus-aosp
am:
069ffaba13
* commit '
069ffaba1332570e6ff5488c236c0efe81a8f198':
Change-Id: Ia9a2aedc7708d823fce787e56542b74f4a50ebb1
Android Build Merger (Role) [Fri, 20 May 2016 00:37:47 +0000 (00:37 +0000)]
Merge "Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6 am:
a18a3d3211 am:
99a9b165e8 am:
98c5daf98a" into nyc-mr1-dev-plus-aosp
Cheryl Potter [Fri, 20 May 2016 00:37:49 +0000 (00:37 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702 am:
0793d19267 am:
212fe6c071 am:
dba7d004e2
am:
a302cb09e0
* commit '
a302cb09e09ab0dbfd339377da904565d0ff543e':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: I37bf3a257192f0874658b53db7bd9e18a021d435
Scott Main [Fri, 20 May 2016 00:37:38 +0000 (00:37 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc am:
ccf143ea10 am:
eaad66b697 am:
7422c51fd0
am:
35fbe1909f
* commit '
35fbe1909fe26e693fff7411a0d2d74d0b84aef3':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I1b9918789a3f88e59dbb47667c96a46a058a029b
Hemal Patel [Fri, 20 May 2016 00:37:26 +0000 (00:37 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6 am:
a18a3d3211 am:
99a9b165e8
am:
070cb41933
* commit '
070cb41933350396a99d6de180e53d0531caa472':
Docs: Fixed a wrong file name
Change-Id: I030e59345d3b063211949ae8ede8834bc7416632
Hemal Patel [Fri, 20 May 2016 00:37:26 +0000 (00:37 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6 am:
a18a3d3211 am:
99a9b165e8
am:
98c5daf98a
* commit '
98c5daf98ada08e6fc6e3a4c95114f101fbc51fe':
Docs: Fixed a wrong file name
Change-Id: I58364a9435bf9c273c206729ac4b455948da77da
smain@google.com [Fri, 20 May 2016 00:37:25 +0000 (00:37 +0000)]
Merge "update links to studio docs am:
73cf8224cb am:
f7304c8cc8 am:
69428b4a0a am:
9bcd8e509c" into nyc-mr1-dev-plus-aosp
am:
c1c1e02fed
* commit '
c1c1e02fede8e0b91bc255afb1fa52f9ac87e4cb':
Change-Id: Icc392af873c08826a0bdcd08a7eadf3576d211cb
smain@google.com [Fri, 20 May 2016 00:37:10 +0000 (00:37 +0000)]
update links to studio docs am:
73cf8224cb am:
f7304c8cc8 am:
69428b4a0a am:
0cd3a78a0d
am:
99e56dbd64
* commit '
99e56dbd649936f835e04dabaa99d403a7376e5f':
update links to studio docs
Change-Id: I740f16c5281d850ba4cf727c18ade2beb4d44384
Hemal Patel [Fri, 20 May 2016 00:30:39 +0000 (00:30 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6 am:
a18a3d3211
am:
99a9b165e8
* commit '
99a9b165e8ad31aa9e3609c7f3d1d4e02a1072cd':
Docs: Fixed a wrong file name
Change-Id: I475a41513ac45ace7bf2387e4a72ef8fd5cd7e15
Hemal Patel [Fri, 20 May 2016 00:30:28 +0000 (00:30 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6 am:
a18a3d3211
am:
99a9b165e8
* commit '
99a9b165e8ad31aa9e3609c7f3d1d4e02a1072cd':
Docs: Fixed a wrong file name
Change-Id: I65827263125951ec157ca2f0c891774fc4d6f0ad
Android Build Merger (Role) [Fri, 20 May 2016 00:27:31 +0000 (00:27 +0000)]
Merge "Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702 am:
0793d19267 am:
212fe6c071 am:
e6192a3aad" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 May 2016 00:27:21 +0000 (00:27 +0000)]
Merge "Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc am:
ccf143ea10 am:
eaad66b697 am:
d1515a26e8" into nyc-mr1-dev-plus-aosp
Cheryl Potter [Fri, 20 May 2016 00:26:53 +0000 (00:26 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702 am:
0793d19267 am:
212fe6c071
am:
e6192a3aad
* commit '
e6192a3aad92e1bac1e7229739d3e1919d309d71':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: I066daa0a6fd123ea1b0b97a6706ae9c6eeb9bcd3
Cheryl Potter [Fri, 20 May 2016 00:26:48 +0000 (00:26 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702 am:
0793d19267 am:
212fe6c071
am:
dba7d004e2
* commit '
dba7d004e2b7f8f9802ef85d290b543c3eb5860c':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: I25c309a4062035d6695d5997b439dfc1b6606c88
smain@google.com [Fri, 20 May 2016 00:26:46 +0000 (00:26 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc am:
ccf143ea10 am:
eaad66b697
am:
d1515a26e8
* commit '
d1515a26e8a2ccfc04e55c9ad84ac5adcad410ca':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: Ide9ab23c3241852d9b2321c08e15cb38bda83197
smain@google.com [Fri, 20 May 2016 00:26:40 +0000 (00:26 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc am:
ccf143ea10 am:
eaad66b697
am:
7422c51fd0
* commit '
7422c51fd0236d32fe554972c41d7217e22c7eef':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I997b2cfba38019ee9f353550972b8ebcf7931f36
Hemal Patel [Fri, 20 May 2016 00:25:49 +0000 (00:25 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6
am:
a18a3d3211
* commit '
a18a3d32118872907e0979856f5906752360b058':
Docs: Fixed a wrong file name
Change-Id: I93ac53610c9c1b0aad68e525eed3d8703bfde613
Cheryl Potter [Fri, 20 May 2016 00:19:40 +0000 (00:19 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702 am:
0793d19267
am:
212fe6c071
* commit '
212fe6c0714bb79d70d3ea424eea8211ee1421f5':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: I57929cc1788085e2a61aa45e093d21eb2f2f4806
Hemal Patel [Fri, 20 May 2016 00:19:35 +0000 (00:19 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs
am:
06a9fbcdd6
* commit '
06a9fbcdd68a3d48697e6e88c04fcdb6040673c5':
Docs: Fixed a wrong file name
Change-Id: I7f672848dfc1f77a2559494c34de6d5cc70df130
Scott Main [Fri, 20 May 2016 00:19:34 +0000 (00:19 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc am:
ccf143ea10
am:
eaad66b697
* commit '
eaad66b697b3605c1b5b75bb203ea308dee2589c':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I14dde8c5eebec9ce9d9a416cd071393d53e59b8a
Cheryl Potter [Fri, 20 May 2016 00:19:29 +0000 (00:19 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702 am:
0793d19267
am:
212fe6c071
* commit '
212fe6c0714bb79d70d3ea424eea8211ee1421f5':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: Iea77250d360a10567016eb0975fa94df0b832a90
Scott Main [Fri, 20 May 2016 00:19:24 +0000 (00:19 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc am:
ccf143ea10
am:
eaad66b697
* commit '
eaad66b697b3605c1b5b75bb203ea308dee2589c':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I3a8035cfb8cb03315cb47344f432e88b4dcac205
Hemal Patel [Fri, 20 May 2016 00:15:08 +0000 (00:15 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs
Cheryl Potter [Fri, 20 May 2016 00:14:07 +0000 (00:14 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702
am:
0793d19267
* commit '
0793d1926729cdfd6cd023e89e45b21c63c1d91d':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: I183e31bdf55e6e691785430d65d4cf2934a2f7ef
smain@google.com [Fri, 20 May 2016 00:14:02 +0000 (00:14 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc
am:
ccf143ea10
* commit '
ccf143ea106de35de35d4829ade55ba78b7a3fee':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I42306e09cb173642840ee29130bb80e9da347a81
Cheryl Potter [Fri, 20 May 2016 00:11:13 +0000 (00:11 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118
am:
f2fa5cd702
* commit '
f2fa5cd7022d450d4e0faa4c81db5207d1ec00d3':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: Iacbf1fca2c1d3189a39122e893ece5fcf033246a
Cheryl Potter [Fri, 20 May 2016 00:08:47 +0000 (00:08 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs
am:
d382293118
* commit '
d382293118dad1337726986c1f2465d2ec25171b':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: Ieadb04df863e4f50db2b1b6168cc31f6501fa242
Scott Main [Fri, 20 May 2016 00:08:46 +0000 (00:08 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44
am:
9ad92619dc
* commit '
9ad92619dc455a42c40e5b102e2fdf65c2787549':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I52fc62f8f233682a6707a4c1e5ef67f42844551b
Android Build Merger (Role) [Fri, 20 May 2016 00:05:51 +0000 (00:05 +0000)]
Merge "update links to studio docs am:
73cf8224cb am:
f7304c8cc8 am:
69428b4a0a am:
9bcd8e509c" into nyc-mr1-dev-plus-aosp
smain@google.com [Fri, 20 May 2016 00:05:20 +0000 (00:05 +0000)]
update links to studio docs am:
73cf8224cb am:
f7304c8cc8 am:
69428b4a0a
am:
9bcd8e509c
* commit '
9bcd8e509ce0906445899435d59f4666d1e93e83':
update links to studio docs
Change-Id: I2665a3df257ad693eb5607cfd3a051472bda6417
smain@google.com [Fri, 20 May 2016 00:05:01 +0000 (00:05 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs
am:
486f792d44
* commit '
486f792d4448819c47c7e18dfd4ccb40133df528':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: Iffb768397f425b34c1e297d40c9b1077d1e7ad5d
smain@google.com [Fri, 20 May 2016 00:04:35 +0000 (00:04 +0000)]
update links to studio docs am:
73cf8224cb am:
f7304c8cc8 am:
69428b4a0a
am:
0cd3a78a0d
* commit '
0cd3a78a0d4d3a5ebc377a06f00af5796cc470c4':
update links to studio docs
Change-Id: I4f9d8acf320fe2a5e3da594ed446ff1c71b83c8e
Cheryl Potter [Fri, 20 May 2016 00:03:06 +0000 (00:03 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs
Cheryl Potter [Thu, 19 May 2016 23:55:49 +0000 (16:55 -0700)]
docs: Fix card descriptions in Android Monitor Overview page
b/
2885829
Change-Id: I2c36d9889f685ea6f18859f5859d876da55ba034
smain@google.com [Thu, 19 May 2016 23:55:01 +0000 (23:55 +0000)]
update links to studio docs am:
73cf8224cb am:
f7304c8cc8
am:
69428b4a0a
* commit '
69428b4a0ad9b3bed3c31bbf3dff4d61548af77a':
update links to studio docs
Change-Id: Ia2b3f1b7556c01c2bebed8d50a43a05def067b3b
Scott Main [Thu, 19 May 2016 23:54:19 +0000 (23:54 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs
smain@google.com [Thu, 19 May 2016 23:53:56 +0000 (23:53 +0000)]
update links to studio docs am:
73cf8224cb am:
f7304c8cc8
am:
69428b4a0a
* commit '
69428b4a0ad9b3bed3c31bbf3dff4d61548af77a':
update links to studio docs
Change-Id: I6ebfa3b240ffe0b3b9a64e4c065410d98e73ccaa
The Android Automerger [Thu, 19 May 2016 23:51:32 +0000 (23:51 +0000)]
stephenli@ manually merge many commits up to '
032dcff'
* commit '
032dcff': (22 commits)
Remove outdated google services links.
Fix misc-macro-parentheses warnings in services jni.
Fix misc-macro-parentheses warnings in hwui and graphic jni.
Fix misc-macro-parentheses warnings in aapt and androidfw.
docs: Update to column widths for Complications table
Fix a11y crash when window layer isn't unique.
Never set resized while not drag resizing for pinned stack.
While turning OFF do not honor ON requests.
Fix GATT autoConnect race condition
Fix GATT autoConnect race condition
Fix RTL issue in delete dialog.
Incorporate feedback on new wallpaper-related APIs
Mapping up/down of legacy Gps vs. Gnss Status
Fixed a bug where the chronometer was invisible
Fixed a bug where the chronometer wasn't updating the time
Update BlockedNumberContract javadocs.
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Update documentation about copyTo and copyFrom.
DO NOT MERGE Cherry pick libpng usage fixes
Start the Wear Time System Service with SystemServer
...
smain@google.com [Thu, 19 May 2016 23:47:54 +0000 (23:47 +0000)]
update links to studio docs am:
73cf8224cb
am:
f7304c8cc8
* commit '
f7304c8cc8aa947558be355fd0c547f418e44931':
update links to studio docs
Change-Id: I9886a9618513c63f02add34b12761f8d35afb1da
smain@google.com [Thu, 19 May 2016 23:43:17 +0000 (23:43 +0000)]
update links to studio docs
am:
73cf8224cb
* commit '
73cf8224cbd97918d6407aac79a97c6ef70b9a30':
update links to studio docs
Change-Id: I79a52f27e9107b63c377e8783d129b93c2013c78
Chih-Hung Hsieh [Thu, 19 May 2016 23:39:59 +0000 (23:39 +0000)]
Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am:
6f4b566169 am:
f55c9f7aa6
am:
d5bb8487d5
* commit '
d5bb8487d58b168543d6504504d8e89e062a6b8b':
Fix misc-macro-parentheses warnings in aapt and androidfw.
Change-Id: I779a9fe55406d460cedc1279e3c056e74787c5bb
Chih-Hung Hsieh [Thu, 19 May 2016 23:39:56 +0000 (23:39 +0000)]
Merge "Fix misc-macro-parentheses warnings in services jni." am:
fe91d2a83d am:
d05b6478d5
am:
03df422689
* commit '
03df42268995e3742aeb42ee6a77048dcc8fd889':
Fix misc-macro-parentheses warnings in services jni.
Change-Id: Id2bf8a02360cf917957f77d2cde284dda35e75a1
Adam Lesinski [Thu, 19 May 2016 23:34:58 +0000 (23:34 +0000)]
Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am:
6f4b566169
am:
f55c9f7aa6
* commit '
f55c9f7aa64660712242705d4e5e89e2191bbf69':
Fix misc-macro-parentheses warnings in aapt and androidfw.
Change-Id: I23f28430cf242be3f77926016626ea3e5705d4ec
Chih-Hung Hsieh [Thu, 19 May 2016 23:34:54 +0000 (23:34 +0000)]
Merge "Fix misc-macro-parentheses warnings in services jni." am:
fe91d2a83d
am:
d05b6478d5
* commit '
d05b6478d5341f7d70e78fad031d2d426155f68a':
Fix misc-macro-parentheses warnings in services jni.
Change-Id: Ibee251ace2e3f15b98a8f91da0d8450069500177
smain@google.com [Thu, 19 May 2016 23:30:43 +0000 (16:30 -0700)]
update links to studio docs
Change-Id: Ie4eccfcb19e690fff935e3a6064332d2e5a3323c
Android Build Merger (Role) [Thu, 19 May 2016 23:30:13 +0000 (23:30 +0000)]
Merge "Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc am:
8053c79246 am:
f339170837 am:
0720f5885e" into nyc-mr1-dev-plus-aosp
Dirk Dougherty [Thu, 19 May 2016 23:29:41 +0000 (23:29 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc am:
8053c79246 am:
f339170837
am:
0720f5885e
* commit '
0720f5885e8337f408d7f8be44cc64f83d3f8626':
Remove outdated google services links.
Change-Id: I28fdb2e4f00fea7ed9519a1ecb039b8e11ebb6d1
Dirk Dougherty [Thu, 19 May 2016 23:29:33 +0000 (23:29 +0000)]
Merge "Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc am:
8053c79246 am:
f339170837" into nyc-dev-plus-aosp
am:
0cf5b8d0fe
* commit '
0cf5b8d0fe74edfe560b795cf57f268d28a652cd':
Remove outdated google services links.
Change-Id: I44ca465eb20beebe518e6ca122cc8155687c2324
Chih-Hung Hsieh [Thu, 19 May 2016 23:29:32 +0000 (23:29 +0000)]
Merge "Fix misc-macro-parentheses warnings in aapt and androidfw."
am:
6f4b566169
* commit '
6f4b5661696355d230c515a45aca2dddd8fe99b1':
Fix misc-macro-parentheses warnings in aapt and androidfw.
Change-Id: I5333078964a57c20144acb6b538205bde2782c12
Chih-Hung Hsieh [Thu, 19 May 2016 23:29:28 +0000 (23:29 +0000)]
Merge "Fix misc-macro-parentheses warnings in services jni."
am:
fe91d2a83d
* commit '
fe91d2a83daee3604a49c1bae0744cdde6d14b46':
Fix misc-macro-parentheses warnings in services jni.
Change-Id: I3ca66bf839e5a720e610657fc9afb6dbb8b853f8
Chih-Hung Hsieh [Thu, 19 May 2016 23:29:27 +0000 (23:29 +0000)]
resolve merge conflicts of
404e2b2 to nyc-dev-plus-aosp
am:
0a87059452
* commit '
0a870594527a3af036b1238983abfe4e6118178b':
Fix misc-macro-parentheses warnings in hwui and graphic jni.
Change-Id: I84afca734f9bf0cf4b9d503b17878d13f5a2b29c
Android Build Merger (Role) [Thu, 19 May 2016 23:26:34 +0000 (23:26 +0000)]
Merge "Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc am:
8053c79246 am:
f339170837" into nyc-dev-plus-aosp
Dirk Dougherty [Thu, 19 May 2016 23:26:08 +0000 (23:26 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc am:
8053c79246
am:
f339170837
* commit '
f3391708373758acac5d4c8daf3abe9ca2a38b97':
Remove outdated google services links.
Change-Id: Ib4dd699dd767dac910af70eb32471570291af482
Dirk Dougherty [Thu, 19 May 2016 23:25:42 +0000 (23:25 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc am:
8053c79246
am:
f339170837
* commit '
f3391708373758acac5d4c8daf3abe9ca2a38b97':
Remove outdated google services links.
Change-Id: I89b08725b84a2618f5a2af0cf216f02b39ee53ad
Adam Lesinski [Thu, 19 May 2016 23:25:09 +0000 (23:25 +0000)]
Merge "Fix misc-macro-parentheses warnings in aapt and androidfw."
Treehugger Robot [Thu, 19 May 2016 23:24:03 +0000 (23:24 +0000)]
Merge "Fix misc-macro-parentheses warnings in services jni."
TreeHugger Robot [Thu, 19 May 2016 23:22:07 +0000 (23:22 +0000)]
Merge "Create frameworks-base-testutils lib"
Chih-Hung Hsieh [Thu, 19 May 2016 23:22:09 +0000 (16:22 -0700)]
resolve merge conflicts of
404e2b2 to nyc-dev-plus-aosp
Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
Dirk Dougherty [Thu, 19 May 2016 23:19:12 +0000 (23:19 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc
am:
8053c79246
* commit '
8053c79246f14a78158b6476169299999299d6d8':
Remove outdated google services links.
Change-Id: I4c85952e4962381261e42d3ecf1c3408a57ab55e
Dirk Dougherty [Thu, 19 May 2016 23:13:57 +0000 (23:13 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9
am:
5fb577e6bc
* commit '
5fb577e6bc96cf38cc2395abe54ecb65a4e06936':
Remove outdated google services links.
Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b
John Reck [Thu, 19 May 2016 23:13:16 +0000 (23:13 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c am:
08a4808197 am:
7298186769 -s ours am:
02b5805ba3
am:
93510f46e0
* commit '
93510f46e0f4be83fae3a81fb7aac61de8728b42':
Change-Id: I91db9913f0ffc3e75cf0c30b2fed5dd65e32e2fd
John Reck [Thu, 19 May 2016 23:10:33 +0000 (23:10 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c am:
08a4808197 am:
7298186769 -s ours am:
02b5805ba3
am:
3a3973d263
* commit '
3a3973d263137315e998564a461c54692f39cc06':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I31ee32d36cedc4b0138b9d0ce55dd656bd9915aa
John Reck [Thu, 19 May 2016 23:07:15 +0000 (23:07 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c am:
08a4808197 am:
7298186769 -s ours
am:
02b5805ba3
* commit '
02b5805ba3f5567ef6eea5931f120fd261cd4a54':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I753de859a133ded85cb89fb914bbe29e195a3432
Dirk Dougherty [Thu, 19 May 2016 23:07:10 +0000 (23:07 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs
am:
dc40b80ae9
* commit '
dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
Remove outdated google services links.
Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
Chih-Hung Hsieh [Thu, 19 May 2016 23:07:09 +0000 (23:07 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni."
am:
e66235bf00
* commit '
e66235bf00a695cacb44b0bc1a241cabb7de3b96':
Fix misc-macro-parentheses warnings in hwui and graphic jni.
Change-Id: I08ab0efc29e8b595f087a781d8a66a472f1f9797
John Reck [Thu, 19 May 2016 23:06:25 +0000 (23:06 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c am:
08a4808197 am:
7298186769 -s ours
am:
02b5805ba3
* commit '
02b5805ba3f5567ef6eea5931f120fd261cd4a54':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Id1ae8b8ead92837ef43e9e40aeac8696fe8a6e76
Bert McMeen [Thu, 19 May 2016 23:03:52 +0000 (23:03 +0000)]
docs: Update to column widths for Complications table am:
76372f02fe am:
4cdad3212e am:
8386df9ea1
am:
00df4e8cf3
* commit '
00df4e8cf3c00486091f67da26598fded57a5c03':
Change-Id: Ic555774a27d71339ba51bfd136f18ae86d1ffe6f
Treehugger Robot [Thu, 19 May 2016 23:02:55 +0000 (23:02 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni."
Dirk Dougherty [Thu, 19 May 2016 23:01:53 +0000 (23:01 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs
Dirk Dougherty [Thu, 19 May 2016 22:57:40 +0000 (15:57 -0700)]
Remove outdated google services links.
Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e
Bert McMeen [Thu, 19 May 2016 22:59:52 +0000 (22:59 +0000)]
docs: Update to column widths for Complications table am:
76372f02fe am:
4cdad3212e am:
8386df9ea1
am:
bf5dd7b969
* commit '
bf5dd7b9693a5a9f5165ba78e27c8500642ef6f6':
docs: Update to column widths for Complications table
Change-Id: Id00f7931635bc02a95dd5ac8e4e9549a4367ee6f
John Reck [Thu, 19 May 2016 22:59:26 +0000 (22:59 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c am:
08a4808197
am:
7298186769 -s ours
* commit '
7298186769395978045ed2d35252cdf7f644d85b':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I93f337a4e85a4e20e91fbbf7bd7aeb48bd0df735
Bert McMeen [Thu, 19 May 2016 22:57:08 +0000 (22:57 +0000)]
docs: Update to column widths for Complications table am:
76372f02fe am:
4cdad3212e
am:
8386df9ea1
* commit '
8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
docs: Update to column widths for Complications table
Change-Id: I9a282a4b7f4b75ea6b51939afc516960bb690161
Bert McMeen [Thu, 19 May 2016 22:56:34 +0000 (22:56 +0000)]
docs: Update to column widths for Complications table am:
76372f02fe am:
4cdad3212e
am:
8386df9ea1
* commit '
8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
docs: Update to column widths for Complications table
Change-Id: Iacc8d86b622f2ecf46625fdf9d12b31dca78655e
John Reck [Thu, 19 May 2016 22:54:05 +0000 (22:54 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c
am:
08a4808197
* commit '
08a480819763dd632fd8006a0ea57b8220ee121a':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ia434422652e624aa5afc871857e7d8dac168912e
Android Build Merger (Role) [Thu, 19 May 2016 22:51:37 +0000 (22:51 +0000)]
Merge "Merge "Update BlockedNumberContract javadocs." into nyc-dev am:
07abc7f813 am:
cd44b983fe" into nyc-mr1-dev-plus-aosp
Abhijith Shastry [Thu, 19 May 2016 22:51:07 +0000 (22:51 +0000)]
Merge "Update BlockedNumberContract javadocs." into nyc-dev am:
07abc7f813
am:
cd44b983fe
* commit '
cd44b983fed7431ab930852ddd3a22c0d3b19a90':
Update BlockedNumberContract javadocs.
Change-Id: I93d004752ea4bdcd1c9c5aeb7fa25ddfdad0aad2
John Reck [Thu, 19 May 2016 22:50:55 +0000 (22:50 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8
am:
0f59d9b80c
* commit '
0f59d9b80c9f5daa321b683525ba8732add007c2':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ieab233f8cc5b9a0c3468c551b4cd023532c5eff6
Bert McMeen [Thu, 19 May 2016 22:50:53 +0000 (22:50 +0000)]
docs: Update to column widths for Complications table am:
76372f02fe
am:
4cdad3212e
* commit '
4cdad3212e67fabbfe4ba68f7b214be5ff5c10af':
docs: Update to column widths for Complications table
Change-Id: I22f82c2ca729b9d679fc077dbc9b54c85a70d6fc
OSDN Git Service
