Wink Saville
752c5db2cb
am 4f50ff1e: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '4f50ff1ee39cdb3c93d2ef88c0007195765ec1c6':
2012-03-12 15:59:44 -07:00
Wink Saville
2a0eed20b5
am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '442612a273981a1b21fdb2e9c19a887ab710224d':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 15:57:44 -07:00
Wink Saville
442612a273
am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit 'f4ae6aabbcefe39b3c85b03729c74044f02369d4':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 15:54:38 -07:00
Wink Saville
4f50ff1ee3
am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit 'f4ae6aabbcefe39b3c85b03729c74044f02369d4':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 15:53:52 -07:00
Wink Saville
f4ae6aabbc
Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
Bearer Independent Protocol (BIP) connections as defined in
ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)"
need to be able to establish data connections even when not provisioned.
This can occur when trying to provision on via and EVDO network.
Bug: 6110632
Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
2012-03-10 13:23:35 -08:00
Conley Owens
ea37409651
am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
...
* commit 'c24f5ba4ee2873d6fd980229f0d24c80104d3558':
stagefright amrwbenc: Simplify the definition of static_vo
2012-03-09 15:13:14 -08:00
Conley Owens
3557654c95
am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028
...
* commit '66da3fdce4dc61f7d1c125eda9b2e065658cc0e5':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
2012-03-09 15:13:11 -08:00
Conley Owens
c24f5ba4ee
am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
...
* commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
stagefright amrwbenc: Simplify the definition of static_vo
2012-03-09 15:10:08 -08:00
Conley Owens
66da3fdce4
am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028
...
* commit '972efafb90b543eea51aa5b23104d469a1bcc1fb':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
2012-03-09 15:09:58 -08:00
Conley Owens
9a3f3b9db6
am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
...
* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
stagefright amrwbenc: Simplify the definition of static_vo
2012-03-09 15:06:53 -08:00
Conley Owens
972efafb90
am 6db6ea02: Merge changes I00c852e4,Ib31bf028
...
* commit '6db6ea02b999e86dfbddd08780eeab0034389f93':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
2012-03-09 15:06:48 -08:00
Andrew Flynn
36fde2688b
am dfc87c82: Merge "Use a different width for nav icons in sw600dp-port." into ics-scoop
...
* commit 'dfc87c82e4a5e77e89c464f7074e50238525913d':
Use a different width for nav icons in sw600dp-port.
2012-03-09 11:03:00 -08:00
Andrew Flynn
dfc87c82e4
Merge "Use a different width for nav icons in sw600dp-port." into ics-scoop
2012-03-09 11:00:14 -08:00
Conley Owens
67cf093d86
Merge "stagefright amrwbenc: Simplify the definition of static_vo"
2012-03-09 08:54:59 -08:00
Conley Owens
6db6ea02b9
Merge changes I00c852e4,Ib31bf028
...
* changes:
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
2012-03-09 08:53:40 -08:00
Derek Sollenberger
4ff65a0b93
am d6f3d00b: am d7978a28: am 34ccd7af: Merge "Add missing includes for threads.h"
...
* commit 'd6f3d00b602c16fe4f67932d8f6b47f42fa9bf73':
Add missing includes for threads.h
2012-03-08 17:48:57 -08:00
Derek Sollenberger
d6f3d00b60
am d7978a28: am 34ccd7af: Merge "Add missing includes for threads.h"
...
* commit 'd7978a28219465e0e579adee3c9258b04c0a5b40':
Add missing includes for threads.h
2012-03-08 17:46:33 -08:00
Derek Sollenberger
d7978a2821
am 34ccd7af: Merge "Add missing includes for threads.h"
...
* commit '34ccd7af4216f571c2f88b32fea8bfed8ef0baab':
Add missing includes for threads.h
2012-03-08 17:43:21 -08:00
Andrew Flynn
1d9af30b74
Use a different width for nav icons in sw600dp-port.
...
Change-Id: I6c4024e9f60e14c072d7c01f29fabc89fc51dfb8
2012-03-08 15:56:10 -08:00
Megha Joshi
2126508d20
am fa71583e: am 33372b21: Merge "A few updates for TVs." into ics-mr1
...
* commit 'fa71583e15d1fda1b5fa51b22e0f8510082d5355':
2012-03-08 12:29:09 -08:00
Megha Joshi
b5ef90bee0
am e0e6612d: am 33372b21: Merge "A few updates for TVs." into ics-mr1
...
* commit 'e0e6612d30308a68c107d517582eb68f0e4caa99':
A few updates for TVs.
2012-03-08 12:27:41 -08:00
Megha Joshi
1994e1d1cb
am 702d9cbc: am 84099f3d: Merge "Adding TV related updates." into ics-mr1
...
* commit '702d9cbc5d501dfa81030be2d0aec46d8f06e797':
2012-03-08 12:25:34 -08:00
Megha Joshi
e0e6612d30
am 33372b21: Merge "A few updates for TVs." into ics-mr1
...
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
A few updates for TVs.
2012-03-08 12:25:08 -08:00
Megha Joshi
fa71583e15
am 33372b21: Merge "A few updates for TVs." into ics-mr1
...
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
A few updates for TVs.
2012-03-08 12:24:29 -08:00
Megha Joshi
5c2fa5e5c9
am bb0a1602: am 84099f3d: Merge "Adding TV related updates." into ics-mr1
...
* commit 'bb0a160229cdfc86529517905b60d0ace2dd2172':
Adding TV related updates.
2012-03-08 12:24:20 -08:00
Megha Joshi
33372b217e
Merge "A few updates for TVs." into ics-mr1
2012-03-08 12:22:49 -08:00
Megha Joshi
702d9cbc5d
am 84099f3d: Merge "Adding TV related updates." into ics-mr1
...
* commit '84099f3d788974169a8ea282f9413cb399d17012':
Adding TV related updates.
2012-03-08 12:22:05 -08:00
Megha Joshi
bb0a160229
am 84099f3d: Merge "Adding TV related updates." into ics-mr1
...
* commit '84099f3d788974169a8ea282f9413cb399d17012':
Adding TV related updates.
2012-03-08 12:21:55 -08:00
Megha Joshi
84099f3d78
Merge "Adding TV related updates." into ics-mr1
2012-03-08 12:20:21 -08:00
Megha Joshi
500cc4be2f
A few updates for TVs.
...
Change-Id: I2465cbfdfd3a5b9e22f94bd1c678aec33ab216d9
2012-03-08 12:18:00 -08:00
Derek Sollenberger
34ccd7af42
Merge "Add missing includes for threads.h"
2012-03-08 11:59:03 -08:00
Scott Main
f8ee2ebd0b
am 3e29de0e: am 99e790de: docs: add troido adk link
...
* commit '3e29de0ed097e283718ddaebbf3c0654a6b630ce':
2012-03-07 17:22:43 -08:00
Scott Main
f2c57b3142
am 5e75bca9: am 99e790de: docs: add troido adk link
...
* commit '5e75bca9273b9656291192e13c83799f9300d486':
docs: add troido adk link
2012-03-07 17:21:50 -08:00
Megha Joshi
87e32816c4
Adding TV related updates.
...
Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77
2012-03-07 17:19:44 -08:00
Scott Main
5e75bca927
am 99e790de: docs: add troido adk link
...
* commit '99e790de9ea23f59933fd695ca35bb6d1033b4e9':
docs: add troido adk link
2012-03-07 17:19:22 -08:00
Scott Main
3e29de0ed0
am 99e790de: docs: add troido adk link
...
* commit '99e790de9ea23f59933fd695ca35bb6d1033b4e9':
docs: add troido adk link
2012-03-07 17:19:06 -08:00
Scott Main
99e790de9e
docs: add troido adk link
...
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
2012-03-06 16:17:08 -08:00
Roman Nurik
23b39217a5
am ce8697f8: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
...
* commit 'ce8697f8d5368aa617b853fdabb6d7fb980bc5ce':
2012-03-06 14:54:19 -08:00
Android Git Automerger
30e9f8807e
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
2012-03-06 14:54:13 -08:00
Roman Nurik
f4d8fa6090
am c4b44be6: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
...
* commit 'c4b44be63d0dd315ddc499c3e939af0f4b5de594':
docs: move Android Design from static HTML to JD
2012-03-06 14:45:19 -08:00
Roman Nurik
ce8697f8d5
am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
...
* commit '96c757e557ed40da4400b82fd62dfbd4bc8151d1':
docs: move Android Design from static HTML to JD
2012-03-06 14:43:38 -08:00
Roman Nurik
c4b44be63d
am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
...
* commit '96c757e557ed40da4400b82fd62dfbd4bc8151d1':
docs: move Android Design from static HTML to JD
2012-03-06 14:42:59 -08:00
Roman Nurik
96c757e557
Merge "docs: move Android Design from static HTML to JD" into ics-mr1
2012-03-06 14:39:54 -08:00
Scott Main
30f954dd2d
am bf03ee12: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
...
* commit 'bf03ee12dba1504f8733297158a412b3eab40deb':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-06 14:28:44 -08:00
Scott Main
842b4e22e3
am fff19ee8: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
...
* commit 'fff19ee88baff16e144d1bfc23c25a4b7f2cb191':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-06 14:28:37 -08:00
Scott Main
fff19ee88b
am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
...
* commit '66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-06 14:25:27 -08:00
Scott Main
bf03ee12db
am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
...
* commit '66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-06 14:24:55 -08:00
Scott Main
66895ad5f7
Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
2012-03-06 14:23:23 -08:00
Scott Main
3f6912e5e8
am f3cbcf43: am 97b94e78: docs: a few more Market -> Play strings
...
* commit 'f3cbcf439692b180ec5081cc68ed67c8f2a9d16d':
2012-03-06 14:01:48 -08:00
Scott Main
15b7481d34
am 40dbc3db: am 97b94e78: docs: a few more Market -> Play strings
...
* commit '40dbc3db62006f81656043e174e9019c89686e9b':
docs: a few more Market -> Play strings
2012-03-06 13:59:34 -08:00