63504 Commits

Author SHA1 Message Date
Dianne Hackborn
4d85c98d83 am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.
2012-03-15 11:29:22 -07:00
Dianne Hackborn
33ace979a4 Merge "Remove fade animations from framework drawables." into ics-mr1 2012-03-15 11:27:43 -07:00
Scott Main
150107763d am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:22:33 -07:00
Scott Main
f32ab91414 Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary" into ics-mr1 2012-03-15 10:21:00 -07:00
Robert Ly
da04da21ce am 957f716c: docs: fix toc in search au class
* commit '957f716cf1686145ba4c06ca8669eaa2e22f54e8':
  docs: fix toc in search au class
2012-03-14 16:55:25 -07:00
Dianne Hackborn
6fdab076b7 Remove fade animations from framework drawables.
Change-Id: Ic4115ba779e88a405b5d2cd927db99c43def3704
2012-03-14 16:46:59 -07:00
Robert Ly
957f716cf1 docs: fix toc in search au class
Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
2012-03-14 16:24:25 -07:00
Scott Main
1657080a0c docs: update various SDK and AVD Manager screenshots
and remove one from the licensing doc that's not necessary

Change-Id: I4b07446a8fd57449dfd9b605019143f543be5e14
2012-03-14 16:16:18 -07:00
Robert Ly
c3b24faa07 am b285125d: Merge "docs: android u search class" into ics-mr1
* commit 'b285125d4bad1c76e95cd24956711deb9908c4a8':
  docs: android u search class
2012-03-14 15:46:10 -07:00
Robert Ly
b285125d4b Merge "docs: android u search class" into ics-mr1 2012-03-14 15:41:02 -07:00
Scott Main
82916294a3 am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
  docs: remove link from GP logo
2012-03-13 23:12:18 -07:00
Scott Main
7f94977867 Merge "docs: remove link from GP logo" into ics-mr1 2012-03-13 23:09:09 -07:00
Robert Ly
055e3f25ba docs: android u search class
Change-Id: I433cb5b82426c942af8f357180aeb7c947f2d9e1
2012-03-13 18:14:02 -07:00
The Android Automerger
c84181849d merge in ics-mr1-release history after reset to ics-mr1 2012-03-12 19:33:04 -07:00
Daniel Lehmann
f0533f9462 am 0e873700: Remove the country detector logging
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
  Remove the country detector logging
2012-03-12 18:24:41 -07:00
Daniel Lehmann
0e87370077 Remove the country detector logging
Bug:6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
2012-03-12 17:04:17 -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
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
The Android Automerger
68eac5c187 merge in ics-mr1-release history after reset to ics-mr1 2012-03-10 09:07:24 -08:00
The Android Automerger
34edcd250e merge in ics-mr1-release history after reset to ics-mr1 2012-03-09 19:23:56 -08:00
Scott Main
161a8dec91 docs: remove link from GP logo
Change-Id: I6dff28e84b341054874995e78d20945e70d24cae
2012-03-09 19:12:53 -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
Scott Main
8edad6f16f docs: Fix a bunch of misc doc issues from external tracker
Change-Id: I03cae5bdb7b806e81cc6c983a014de212cb80c73
2012-03-09 12:30:40 -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
The Android Automerger
82da315263 merge in ics-mr1-release history after reset to ics-mr1 2012-03-08 20:45:10 -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
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
33372b217e Merge "A few updates for TVs." into ics-mr1 2012-03-08 12:22:49 -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
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
99e790de9e docs: add troido adk link
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
2012-03-06 16:17:08 -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
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
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
40dbc3db62 am 97b94e78: docs: a few more Market -> Play strings
* commit '97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
  docs: a few more Market -> Play strings
2012-03-06 13:57:32 -08:00
Roman Nurik
b99ae73cc5 docs: move Android Design from static HTML to JD
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
2012-03-06 12:26:15 -08:00
Scott Main
97b94e784c docs: a few more Market -> Play strings
Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
2012-03-06 12:10:17 -08:00
Scott Main
19fa8fee25 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.

Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
2012-03-06 11:46:30 -08:00
Dirk Dougherty
106cdc6aba am 9ad3d0ee: Update build-a-button to use new assets.
* commit '9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
  Update build-a-button to use new assets.
2012-03-06 09:38:31 -08:00
Dirk Dougherty
9ad3d0ee5b Update build-a-button to use new assets.
Change-Id: I2218af60519fa3adbe574aaedb1a72270ea3c1da
2012-03-06 09:28:17 -08:00