OSDN Git Service
Joe Fernandez [Thu, 19 Sep 2013 04:31:08 +0000 (21:31 -0700)]
am
fe2d0c4c: am
3ce21086: Merge "docs: RenderScript Dev Guide fixes" into jb-mr2-docs
* commit '
fe2d0c4cbe852de9d3b247cff3013db73d98dce4':
docs: RenderScript Dev Guide fixes
Joe Fernandez [Thu, 19 Sep 2013 04:28:30 +0000 (21:28 -0700)]
am
3ce21086: Merge "docs: RenderScript Dev Guide fixes" into jb-mr2-docs
* commit '
3ce210869725619c3222dc8147d1117d9a8c47c9':
docs: RenderScript Dev Guide fixes
Joe Fernandez [Thu, 19 Sep 2013 04:26:37 +0000 (04:26 +0000)]
Merge "docs: RenderScript Dev Guide fixes" into jb-mr2-docs
James Kelly [Thu, 19 Sep 2013 01:07:02 +0000 (18:07 -0700)]
am
2815bb05: am
48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs
* commit '
2815bb05a042975b282f7131514368aa89cf0dd4':
more string changes for wi-fi trademark compliance
James Kelly [Thu, 19 Sep 2013 01:04:45 +0000 (18:04 -0700)]
am
48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs
* commit '
48c6b5735ef6a8f6afe92ed7c34d848d1f7754a3':
more string changes for wi-fi trademark compliance
James Kelly [Thu, 19 Sep 2013 01:02:13 +0000 (01:02 +0000)]
Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs
Joe Fernandez [Wed, 18 Sep 2013 18:54:48 +0000 (11:54 -0700)]
docs: RenderScript Dev Guide fixes
Change-Id: I0d0ef44df989419e9335789e2957fbd94c49615f
Dirk Dougherty [Tue, 17 Sep 2013 16:23:21 +0000 (09:23 -0700)]
am
fe790af5: am
1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs
* commit '
fe790af5897a9c466b5b0a79201ad7752782eaac':
Doc change: change initial quota limit for Google Play Developer API v1_1.
Dirk Dougherty [Tue, 17 Sep 2013 16:20:57 +0000 (09:20 -0700)]
am
1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs
* commit '
1e6c936e84675925ef5c58a04c6e80d8894d7128':
Doc change: change initial quota limit for Google Play Developer API v1_1.
Dirk Dougherty [Tue, 17 Sep 2013 16:17:58 +0000 (16:17 +0000)]
Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs
Dirk Dougherty [Tue, 17 Sep 2013 16:13:29 +0000 (09:13 -0700)]
Doc change: change initial quota limit for Google Play Developer API v1_1.
Change-Id: I553bbe9794cfbeee0fc8ebeded5af9ce6256a975
Scott Main [Mon, 16 Sep 2013 20:11:07 +0000 (13:11 -0700)]
more string changes for wi-fi trademark compliance
Change-Id: Iee87c7d627e724f212d4a378815a77ff056d0dec
Joe Fernandez [Mon, 16 Sep 2013 18:15:37 +0000 (11:15 -0700)]
am
a1e59983: am
27ab2172: Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs
* commit '
a1e59983ef6e1f6b0a1c8e65b439e80846f8b662':
docs: SDK / ADT 22.2 Release Notes
Joe Fernandez [Mon, 16 Sep 2013 18:13:08 +0000 (11:13 -0700)]
am
27ab2172: Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs
* commit '
27ab217212a663e22133cdd2a72ef27bdf5f778c':
docs: SDK / ADT 22.2 Release Notes
Joe Fernandez [Mon, 16 Sep 2013 18:12:05 +0000 (11:12 -0700)]
am
90bb0cf7: am
385179b2: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs
* commit '
90bb0cf7680874a5332fd5f063b54e7f65ef2cea':
Update RenderScript docs to include Support Library APIs
Joe Fernandez [Mon, 16 Sep 2013 18:10:54 +0000 (18:10 +0000)]
Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs
Joe Fernandez [Mon, 16 Sep 2013 18:09:40 +0000 (11:09 -0700)]
am
385179b2: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs
* commit '
385179b2811e95833066dfdb801e963e43229b97':
Update RenderScript docs to include Support Library APIs
Joe Fernandez [Mon, 16 Sep 2013 18:07:19 +0000 (18:07 +0000)]
Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs
Joe Fernandez [Mon, 16 Sep 2013 18:06:33 +0000 (11:06 -0700)]
am
d82b567c: am
881a4b82: Support Library 18.1 Release Notes
* commit '
d82b567c718dafdcd3477cb3da8f729bd64859cc':
Support Library 18.1 Release Notes
Joe Fernandez [Mon, 16 Sep 2013 18:05:12 +0000 (11:05 -0700)]
am
881a4b82: Support Library 18.1 Release Notes
* commit '
881a4b8235160884b9fc7aa9a6c6b13be5567aa4':
Support Library 18.1 Release Notes
Joe Fernandez [Mon, 16 Sep 2013 17:29:06 +0000 (10:29 -0700)]
am
c2260830: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-ub-dev
* commit '
c2260830f092152067eac18634b5f4001bf13298':
Update RenderScript docs to include Support Library APIs
Joe Fernandez [Thu, 12 Sep 2013 19:02:33 +0000 (12:02 -0700)]
Support Library 18.1 Release Notes
adding release notes for v8 support library containing RenderScript
Change-Id: I12d48c26e6b99cacfb8f36750c3f1ce80da5ef23
(cherry picked from commit
75026c547fd00600572c9c4b471ecc9512ab1b17)
Joe Fernandez [Fri, 13 Sep 2013 19:40:56 +0000 (12:40 -0700)]
Update RenderScript docs to include Support Library APIs
Added new section to explain how to access the Support Library
RenderScript APIs in Eclipse.
Change-Id: Ife6e25bcc7b91c39bb399d1ace624e106a3f38bc
(cherry picked from commit
f82b04d4ecb9450afc8a3679e7178bfa4ca782b8)
Joe Fernandez [Mon, 16 Sep 2013 17:26:31 +0000 (17:26 +0000)]
Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-ub-dev
Joe Fernandez [Mon, 16 Sep 2013 17:19:27 +0000 (10:19 -0700)]
am
1f7cee21: Merge "Support Library 18.1 Release Notes" into jb-mr2-ub-dev
* commit '
1f7cee21e1506c8476a926f0d37b747a825e9f4a':
Support Library 18.1 Release Notes
Joe Fernandez [Mon, 16 Sep 2013 17:18:10 +0000 (17:18 +0000)]
Merge "Support Library 18.1 Release Notes" into jb-mr2-ub-dev
Dirk Dougherty [Sat, 14 Sep 2013 02:56:03 +0000 (19:56 -0700)]
am
788fc628: am
6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs
* commit '
788fc6285a0b7f1585c5a4fa68599af7c07747e5':
Update documentation for speech APIs.
Dirk Dougherty [Sat, 14 Sep 2013 02:53:26 +0000 (19:53 -0700)]
am
6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs
* commit '
6212f6b3c5c92298fedbb37f5ceb0094b770549b':
Update documentation for speech APIs.
Dirk Dougherty [Sat, 14 Sep 2013 02:50:15 +0000 (02:50 +0000)]
Merge "Update documentation for speech APIs." into jb-mr2-docs
Scott Main [Sat, 14 Sep 2013 02:36:49 +0000 (19:36 -0700)]
am
575245dc: am
1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
* commit '
575245dc29441fc796442805caa16000f48f27cc':
update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
Scott Main [Sat, 14 Sep 2013 02:33:17 +0000 (19:33 -0700)]
am
1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
* commit '
1294a8f9a2ccc4e19d218dbe8645ddac533706d8':
update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
Scott Main [Sat, 14 Sep 2013 02:31:08 +0000 (02:31 +0000)]
Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
Scott Main [Thu, 12 Sep 2013 19:57:29 +0000 (12:57 -0700)]
update samples landing page with summaries based on parameter in the url.
This is just for testing purposes... no real functionality yet.
Change-Id: I7d18033b01a7c3615e3d998da71062b25af22b28
Scott Main [Sat, 14 Sep 2013 01:06:28 +0000 (18:06 -0700)]
am
8bf0c9ae: am
a23fd887: more javadocs for onTrimMemory()
* commit '
8bf0c9ae604e5114260159077bfafbdd9d16a7ea':
more javadocs for onTrimMemory()
Scott Main [Sat, 14 Sep 2013 01:03:18 +0000 (18:03 -0700)]
am
a23fd887: more javadocs for onTrimMemory()
* commit '
a23fd88729bd10c02a9d631c9954616b3a1d0f6f':
more javadocs for onTrimMemory()
Scott Main [Thu, 15 Aug 2013 20:53:31 +0000 (13:53 -0700)]
more javadocs for onTrimMemory()
Change-Id: I52a99bc1b07732e474d1c632f3021c6c4db8c5ab
Joe Fernandez [Fri, 13 Sep 2013 19:40:56 +0000 (12:40 -0700)]
Update RenderScript docs to include Support Library APIs
Added new section to explain how to access the Support Library
RenderScript APIs in Eclipse.
Change-Id: Ife6e25bcc7b91c39bb399d1ace624e106a3f38bc
Joe Fernandez [Fri, 26 Jul 2013 22:32:10 +0000 (15:32 -0700)]
docs: SDK / ADT 22.2 Release Notes
Current release notes draft.
Change-Id: Icbd7bcaeb3e909fe35b4d9b4fdb1f0f9e3fde0da
Deepanshu Gupta [Fri, 13 Sep 2013 21:57:35 +0000 (14:57 -0700)]
am
0ecfe381: am
54d88f76: Fix ClassCastException when rendering ListView
* commit '
0ecfe3819269062805c4c56cdc1470c2fc3856c8':
Fix ClassCastException when rendering ListView
Deepanshu Gupta [Fri, 13 Sep 2013 21:55:06 +0000 (14:55 -0700)]
am
54d88f76: Fix ClassCastException when rendering ListView
* commit '
54d88f7678387a6eb871ec2dccd36af4ff35b1fe':
Fix ClassCastException when rendering ListView
Joe Fernandez [Thu, 12 Sep 2013 19:02:33 +0000 (12:02 -0700)]
Support Library 18.1 Release Notes
adding release notes for v8 support library containing RenderScript
Change-Id: I12d48c26e6b99cacfb8f36750c3f1ce80da5ef23
Scott Main [Fri, 13 Sep 2013 20:02:20 +0000 (13:02 -0700)]
am
cdde6dc6: am
95e7df91: fix title for uses-sdk doc
* commit '
cdde6dc6675207708020fbe7458b13ccf22fe492':
fix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 19:59:59 +0000 (12:59 -0700)]
am
95e7df91: fix title for uses-sdk doc
* commit '
95e7df915fd3c173b4d8d71c1ac5cbeaa8c8e7ed':
fix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 19:55:20 +0000 (12:55 -0700)]
fix title for uses-sdk doc
Change-Id: I544868d209f04cb46928861148e9320fc0118f56
Marc Wilson [Tue, 10 Sep 2013 14:29:00 +0000 (15:29 +0100)]
Update documentation for speech APIs.
Makes it clear that the intent and service APIs are likely to stream
audio over the network and notes that impact this has on bandwidth and
battery life.
Also clarifies that the service API should not be used for continuous
recognition as a result. The intent API only runs when the activity is
in the foreground so I didn't mention continuous recognition for it.
Bug:
10674392
Change-Id: Ib5e0c16b3124f4b7d892ef5bd4167f23662d2ca3
(cherry picked from commit
2921cee3048f7e64ba6645d50a1c1705ef9658f8)
Joe Malin [Thu, 12 Sep 2013 17:51:12 +0000 (10:51 -0700)]
am
1e3a0203: am
6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
* commit '
1e3a02030949df8c1d1f37a37fc23f25357632f0':
Android Training: Add Location Testing Lesson
Joe Malin [Thu, 12 Sep 2013 17:48:38 +0000 (10:48 -0700)]
am
6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
* commit '
6f9e30e3b76f564db3a56de24e4efdc5a64455f0':
Android Training: Add Location Testing Lesson
Joe Malin [Thu, 12 Sep 2013 17:45:05 +0000 (17:45 +0000)]
Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
Joe Malin [Sat, 27 Jul 2013 00:26:52 +0000 (17:26 -0700)]
Android Training: Add Location Testing Lesson
Change-Id: I855e1c3dd0db65be7dc970437af2d52ccf836cb7
Dirk Dougherty [Thu, 12 Sep 2013 16:22:20 +0000 (09:22 -0700)]
am
4c6cde54: am
89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
* commit '
4c6cde545c5d2e76d9ba8ef926399463369da7e7':
Pass whitelist of sample groups to doclava.
Dirk Dougherty [Thu, 12 Sep 2013 16:15:25 +0000 (09:15 -0700)]
am
89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
* commit '
89579294ce0fbe728738fa09fb45cc53fd79bfb5':
Pass whitelist of sample groups to doclava.
Dirk Dougherty [Thu, 12 Sep 2013 16:01:52 +0000 (16:01 +0000)]
Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
Dirk Dougherty [Wed, 11 Sep 2013 18:53:35 +0000 (11:53 -0700)]
Pass whitelist of sample groups to doclava.
Change-Id: I36f3e3426115cc296531cf41d20ab07a4d429b19
quddusc [Wed, 11 Sep 2013 17:15:12 +0000 (10:15 -0700)]
am
a0b259a9: am
161e423e: Merge "docs: Fixed deprecated value. Bug:
10641906" into jb-mr2-docs
* commit '
a0b259a917f9c7cf73b4e8ceab104cdab4383c24':
docs: Fixed deprecated value. Bug:
10641906
quddusc [Wed, 11 Sep 2013 17:09:45 +0000 (10:09 -0700)]
am
161e423e: Merge "docs: Fixed deprecated value. Bug:
10641906" into jb-mr2-docs
* commit '
161e423ead0e2272ebb0b73957abf0c916ad57ff':
docs: Fixed deprecated value. Bug:
10641906
Deepanshu Gupta [Tue, 10 Sep 2013 22:39:41 +0000 (15:39 -0700)]
Fix ClassCastException when rendering ListView
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
quddusc [Mon, 9 Sep 2013 20:22:55 +0000 (20:22 +0000)]
Merge "docs: Fixed deprecated value. Bug:
10641906" into jb-mr2-docs
Dirk Dougherty [Mon, 9 Sep 2013 17:45:57 +0000 (10:45 -0700)]
am
b096bee1: am
dd93ae32: Doc change: fix typo.
* commit '
b096bee155cc089144d59640494adba0b31d56ed':
Doc change: fix typo.
Dirk Dougherty [Mon, 9 Sep 2013 17:42:47 +0000 (10:42 -0700)]
am
dd93ae32: Doc change: fix typo.
* commit '
dd93ae32a8d50147a95a270cc99f9474dbf9ee27':
Doc change: fix typo.
Dirk Dougherty [Mon, 9 Sep 2013 17:36:37 +0000 (10:36 -0700)]
Doc change: fix typo.
Change-Id: Idd14111f1b62430560a11c5803a864f2bad5eff0
quddusc [Fri, 6 Sep 2013 18:18:27 +0000 (11:18 -0700)]
docs: Fixed deprecated value.
Bug:
10641906
Change-Id: I1e89e031292fb225f67c7f8a06924f29a9e950b2
Wink Saville [Fri, 6 Sep 2013 16:17:19 +0000 (09:17 -0700)]
am
50f86448: am
59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '
50f864480d6e9cf9e4d83b4533e3764753b4d408':
Do not change NetworkInfo.DetailedState.
Wink Saville [Fri, 6 Sep 2013 16:12:50 +0000 (09:12 -0700)]
am
59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '
59a9884bf8280e2db9db7680370e98f40a065d56':
Do not change NetworkInfo.DetailedState.
Wink Saville [Fri, 6 Sep 2013 16:09:36 +0000 (16:09 +0000)]
Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
Wink Saville [Thu, 5 Sep 2013 19:02:25 +0000 (12:02 -0700)]
Do not change NetworkInfo.DetailedState.
I'd changed DetailedState to force ConnectivityService to treat
provisioning apn's specially. In particular so that they wouldn't
be identified they were fully connected until the provisioning
actually started. The problem is that DetailedState is a public enum
that has a CTS test and just changing the CTS to allow for the new
state (CONNECTED_TO_PROVISIONING_NETWORK) was inappropriate.
Instead I've added a new mIsConnectedToProvisioningNetwork variable
and used the DetailedState.SUSPENDED as the intermediate state.
Bug:
10620248
Change-Id: Id4a842398cad67455541ce629959351c27d83639
Deepanshu Gupta [Thu, 5 Sep 2013 18:58:59 +0000 (11:58 -0700)]
am
dd4efc22: am
3a762d8b: Merge "Fix text rendering" into jb-mr2-dev
* commit '
dd4efc22c736973ecfa1b7b4af9e71f971dd48b3':
Fix text rendering
Deepanshu Gupta [Thu, 5 Sep 2013 18:58:54 +0000 (11:58 -0700)]
am
c78d173b: am
68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
* commit '
c78d173b730dcfdf107e6ac2bc959d459fe3eedd':
Fix layout rendering for RTL locales
Deepanshu Gupta [Thu, 5 Sep 2013 18:52:48 +0000 (11:52 -0700)]
am
3a762d8b: Merge "Fix text rendering" into jb-mr2-dev
* commit '
3a762d8bfbe6b2d4066bc5cc90301063c19976c4':
Fix text rendering
Deepanshu Gupta [Thu, 5 Sep 2013 18:52:42 +0000 (11:52 -0700)]
am
68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
* commit '
68411471083abd7a7713483b5cd40f394387b7b3':
Fix layout rendering for RTL locales
Deepanshu Gupta [Thu, 5 Sep 2013 18:49:31 +0000 (18:49 +0000)]
Merge "Fix text rendering" into jb-mr2-dev
Deepanshu Gupta [Thu, 5 Sep 2013 18:48:55 +0000 (18:48 +0000)]
Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
Deepanshu Gupta [Fri, 12 Jul 2013 18:38:05 +0000 (11:38 -0700)]
Fix text rendering
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.
Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
Dirk Dougherty [Thu, 5 Sep 2013 05:26:54 +0000 (22:26 -0700)]
am
07c9bcc3: am
4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '
07c9bcc3a60a8860b65aa43badd8ab1f1858522b':
Add a few more samples to browser.
Dirk Dougherty [Thu, 5 Sep 2013 05:23:48 +0000 (22:23 -0700)]
am
4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '
4ef51c3c4298cbd7980029b6b1cad2f6696f7bb5':
Add a few more samples to browser.
Dirk Dougherty [Thu, 5 Sep 2013 05:19:41 +0000 (05:19 +0000)]
Merge "Add a few more samples to browser." into jb-mr2-docs
Dirk Dougherty [Tue, 3 Sep 2013 22:32:24 +0000 (15:32 -0700)]
Add a few more samples to browser.
Change-Id: Iac7acc22a8dd71950b32e2c35c82f53abc34168a
Wink Saville [Thu, 5 Sep 2013 01:14:07 +0000 (18:14 -0700)]
am
aa5b0f8b: am
ce1e3798: Add provisioning apn timeout.
* commit '
aa5b0f8bdadcfa1ddb041e09b815ea4b5986e901':
Add provisioning apn timeout.
Wink Saville [Thu, 5 Sep 2013 01:11:07 +0000 (18:11 -0700)]
am
ce1e3798: Add provisioning apn timeout.
* commit '
ce1e37981caec29df2671a6e2909f00da7f24a00':
Add provisioning apn timeout.
Scott Main [Wed, 4 Sep 2013 22:40:27 +0000 (15:40 -0700)]
am
966b9d46: am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
966b9d467dbb21d7bbc0a49067110ff4ddaffb89':
update dashboards for 9/13
Scott Main [Wed, 4 Sep 2013 22:36:59 +0000 (15:36 -0700)]
am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
002057bf0452168fd88eb81c2d36f02cfb260769':
update dashboards for 9/13
Scott Main [Wed, 4 Sep 2013 22:35:04 +0000 (22:35 +0000)]
Merge "update dashboards for 9/13" into jb-mr2-docs
Scott Main [Wed, 4 Sep 2013 01:01:31 +0000 (18:01 -0700)]
update dashboards for 9/13
Change-Id: I50171e5448fa062ed59d585c603cb5ac80f80d47
Deepanshu Gupta [Thu, 20 Jun 2013 00:29:12 +0000 (17:29 -0700)]
Fix layout rendering for RTL locales
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.
Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.
Change-Id: I1ed0d516ab64120a0abca413ba678036661508f8
Scott Main [Wed, 4 Sep 2013 16:20:31 +0000 (09:20 -0700)]
am
ca0d88b8: am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
ca0d88b841db52fc926027f412003a8bf6efdf39':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:18:23 +0000 (09:18 -0700)]
am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
c3adcf9dc745932bf3a059a7201644dd96b97750':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:17:05 +0000 (09:17 -0700)]
am
e0718c04: am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
e0718c044bc81db0334f2973b9884b968c18ce07':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:14:59 +0000 (16:14 +0000)]
Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
Scott Main [Wed, 4 Sep 2013 16:13:57 +0000 (09:13 -0700)]
am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
605d56c0492536488c997c6ca0b85fd38fd4e19a':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:10:58 +0000 (16:10 +0000)]
Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
Wink Saville [Tue, 3 Sep 2013 23:41:44 +0000 (16:41 -0700)]
Add provisioning apn timeout.
Bug:
10609993
Change-Id: I2dd4fe23fa2b22ef8f4849c161c630d1a85cdb4b
Dirk Dougherty [Tue, 3 Sep 2013 18:48:34 +0000 (11:48 -0700)]
am
c236f992: am
5e52ee6e: Doc change: small refinement of brand usage guidelines.
* commit '
c236f99234bbcc9b1ced14777b179adb59922b0f':
Doc change: small refinement of brand usage guidelines.
Dirk Dougherty [Tue, 3 Sep 2013 18:44:24 +0000 (11:44 -0700)]
am
5e52ee6e: Doc change: small refinement of brand usage guidelines.
* commit '
5e52ee6ecf08b299b433104798e736e2bc3904d5':
Doc change: small refinement of brand usage guidelines.
Dirk Dougherty [Tue, 3 Sep 2013 17:08:54 +0000 (10:08 -0700)]
Doc change: small refinement of brand usage guidelines.
Change-Id: I3e7513ee6b5cc0dd0204ca5b78c9fd13e4c8cf4a
Scott Main [Fri, 30 Aug 2013 20:56:05 +0000 (13:56 -0700)]
clarify javadoc for constructors.
bug:
10563421
Change-Id: Ifa898005a13f987e4de07d1a34cb3b289d533256
Ed Tam [Fri, 30 Aug 2013 21:06:47 +0000 (14:06 -0700)]
am
00e4c672: am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
Telephony: SMS over IMS, DO NOT MERGE
Ed Tam [Fri, 30 Aug 2013 21:04:45 +0000 (14:04 -0700)]
am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
Telephony: SMS over IMS, DO NOT MERGE
Ed Tam [Fri, 30 Aug 2013 20:50:35 +0000 (20:50 +0000)]
Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
quddusc [Thu, 29 Aug 2013 18:57:52 +0000 (11:57 -0700)]
am
40765a4a: am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
40765a4a5300914e8c7ce7ed6397cec7ab8d78a1':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
quddusc [Thu, 29 Aug 2013 18:12:44 +0000 (11:12 -0700)]
am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
2ef3952d8e62b71baca176b3e17315a37facd34a':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
quddusc [Fri, 21 Jun 2013 23:49:46 +0000 (16:49 -0700)]
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Change-Id: Idce540108d048d76fc2c4bc37ecf2118b82588c5
OSDN Git Service
