82899 Commits

Author SHA1 Message Date
Katie McCormick
ec705ab672 am 3ff0667d: am ec33e341: am 1cfe4b40: am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '3ff0667d2f014b671ae27318a1e43f95daf96426':
  Doc change: 4K -> 4kb
2012-08-01 17:24:53 -07:00
Katie McCormick
5ce3de6186 am b929c056: am 2184bae4: am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit 'b929c056e199e1be5087cee775faff0e01d1bed6':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
2012-08-01 17:24:46 -07:00
Scott Main
cdf3d5e231 am 97592ec3: am c221f35d: am a9a3c25a: am c9506415: Group revert of the following commits for design docs:
* commit '97592ec3a5c5ee69f2a973239475579366ed8b49':
  Group revert of the following commits for design docs:
2012-08-01 17:24:39 -07:00
Scott Main
80adeb535f am 5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit '5ae754c93a2c713f46e6cdbcab5ef051b5d0b600':
  fix markup for gl pie
2012-08-01 17:04:58 -07:00
Scott Main
5ae754c93a Merge "fix markup for gl pie" into jb-dev 2012-08-01 16:59:45 -07:00
Katie McCormick
27ed953f63 am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
* commit '9f94208953fc8da72140c2964bcf12ff5b485784':
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
2012-08-01 16:53:12 -07:00
Katie McCormick
9f94208953 Merge changes I9bd42a8a,I613d0b12 into jb-dev
* changes:
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
2012-08-01 16:49:38 -07:00
Wink Saville
4feae8fc8c am 97425536: Merge "Unhide the new location API\'s" into jb-mr1-dev
* commit '9742553603af071b5087df3e352e2ad4ac1d382f':
  Unhide the new location API's
2012-08-01 16:48:11 -07:00
Wink Saville
9742553603 Merge "Unhide the new location API's" into jb-mr1-dev 2012-08-01 16:43:36 -07:00
Adam Powell
c033235307 am 800dd9b9: Merge "Fix drawable handling for ActionBarContainer" into jb-mr1-dev
* commit '800dd9b936f75aa09ffc5cb2ed83e351bb00b5d6':
  Fix drawable handling for ActionBarContainer
2012-08-01 16:41:54 -07:00
Katie McCormick
3ff0667d2f am ec33e341: am 1cfe4b40: am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit 'ec33e341f61aafdb1974f4bdd5855740db9fb0e0':
  Doc change: 4K -> 4kb
2012-08-01 16:41:50 -07:00
Adam Powell
800dd9b936 Merge "Fix drawable handling for ActionBarContainer" into jb-mr1-dev 2012-08-01 16:36:08 -07:00
Katie McCormick
ec33e341f6 am 1cfe4b40: am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '1cfe4b40d3cbf11695ffc70efa891559cff040b7':
  Doc change: 4K -> 4kb
2012-08-01 16:35:25 -07:00
Adam Powell
a7cc06d82e Fix drawable handling for ActionBarContainer
ActionBarContainer drawables for primary/stacked/split backgrounds
will now properly respect callbacks, layout direction, etc.

Bug 6905932

Change-Id: I20a089861c66a2a378f4b70c0b6cb4bb27476049
2012-08-01 16:33:12 -07:00
Scott Main
a18e0b4647 fix markup for gl pie
Change-Id: I97b40b61f70ecd720f604ceca5849b066cf89988
2012-08-01 16:31:19 -07:00
Brian Carlstrom
d2237dfe7d Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" 2012-08-01 16:30:54 -07:00
Katie McCormick
b929c056e1 am 2184bae4: am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit '2184bae4e58ff5e3c13fbe7493b5dc3d292aaa39':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
2012-08-01 16:25:56 -07:00
Katie McCormick
1cfe4b40d3 am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '9c311279726598de073314fb6059feea66957219':
  Doc change: 4K -> 4kb
2012-08-01 16:24:25 -07:00
Katie McCormick
2184bae4e5 am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit '510d817977af6761274e700178a854b9f9160d9c':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
2012-08-01 16:22:31 -07:00
Katie McCormick
9c31127972 Merge "Doc change: 4K -> 4kb" into jb-dev 2012-08-01 16:21:53 -07:00
Katie McCormick
510d817977 am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit 'a5e150c95c6e7c38fc8643c3615f5664e2cd4582':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
2012-08-01 16:16:22 -07:00
Katie McCormick
a65d0e78dd Doc change: 4K -> 4kb
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
2012-08-01 16:14:47 -07:00
Katie McCormick
a5e150c95c Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 2012-08-01 16:13:36 -07:00
Scott Main
97592ec3a5 am c221f35d: am a9a3c25a: am c9506415: Group revert of the following commits for design docs:
* commit 'c221f35de3a5e76311d993a36f241e41d787ff2b':
  Group revert of the following commits for design docs:
2012-08-01 16:11:26 -07:00
Scott Main
c221f35de3 am a9a3c25a: am c9506415: Group revert of the following commits for design docs:
* commit 'a9a3c25a52e91346bb898e2d8c33f5c8fdd0295d':
  Group revert of the following commits for design docs:
2012-08-01 16:09:29 -07:00
Scott Main
a9a3c25a52 am c9506415: Group revert of the following commits for design docs:
* commit 'c9506415d533c61a9607c5b61a1993747bafb406':
  Group revert of the following commits for design docs:
2012-08-01 16:07:18 -07:00
Katie McCormick
ec4ec27ea6 cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
Change-Id: I6342d1a3925d43719358d905fc29f2628c6e92b4
2012-08-01 16:01:18 -07:00
Scott Main
c9506415d5 Group revert of the following commits for design docs:
ce470e17fd4298c1b8aa9a5fd7493bde7a6be840
8874ab0473f4db10e71bf0537c0703db03bac4ee
bdd8d0fada73dabbda7f6f174c17317d1e30a79e
6443ca4cd9406ed8e9ba55461d4b2eb677aad17a
5ac5a324b377c8c5f29a3d368ebfdc76b0d02e3e
1edd4ae5c4748bd9d1e64f65dc554790063d59b8
be13fa0b7ac7929e65b1f3e40b2834ed0d9ed7ff
6a681afd38d9881154207436e5e145856e9d2f75
353474c0acdad9b8ffdb86d3d5f32137885dd720
2b1584c1d53cd1070d5157c07158828b4baf8844

Had to revert these because they're not ready to be published.

Change-Id: I704cf0df1db9aa159295bdf78e97cef9605addc6
2012-08-01 15:51:29 -07:00
Rajeev Sharma
c1deaa221f Vignette filter: precompute more values, simplify math, cleanup code
Change-Id: I29cfc313a5173fd393944dd9af58d0111a3d726a
2012-08-01 15:46:30 -07:00
Brian Carlstrom
2a5b147ec8 Change KeyStore to use Modified UTF-8 to match NativeCrypto
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
2012-08-01 15:44:52 -07:00
Ying Wang
4d11d8ff72 am 8c236ed5: (-s ours) am 880209e4: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '8c236ed5a84bebcf30057d77ed534bae1fd0c464':
  Import translations. DO NOT MERGE
2012-08-01 15:34:01 -07:00
Ying Wang
8c236ed5a8 am 880209e4: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '880209e41215308a96ffc6d2eede1e830304bf58':
  Import translations. DO NOT MERGE
2012-08-01 15:32:16 -07:00
Peter Ng
dc8d78b5e2 am a5ff3e55: am 8a90d746: am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography
* commit 'a5ff3e554f393994770dad014db944c46b84791d':
  new confirming page and updates to progress and iconography
2012-08-01 15:30:37 -07:00
Ying Wang
880209e412 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-01 15:29:17 -07:00
Peter Ng
a5ff3e554f am 8a90d746: am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography
* commit '8a90d746ff85cc5e064a16b6db14b499469050b4':
  new confirming page and updates to progress and iconography
2012-08-01 15:17:42 -07:00
The Android Open Source Project
d231d12609 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2012-08-01 15:16:11 -07:00
The Android Open Source Project
bde88e9702 am d0ad0931: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'd0ad0931fefa0e4444539858c0b3d4ce658c8d46':
2012-08-01 15:15:48 -07:00
Ying Wang
53eb7a0744 Merge "Import translations. DO NOT MERGE" 2012-08-01 15:15:43 -07:00
Ying Wang
f35edb9317 Merge "Import translations. DO NOT MERGE" 2012-08-01 15:15:43 -07:00
Peter Ng
8a90d746ff am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography
* commit '7bf18315505090f45cbe91ad025e772c3ea7ebc4':
  new confirming page and updates to progress and iconography
2012-08-01 15:14:38 -07:00
Ying Wang
e34f48ce86 Merge "Import translations. DO NOT MERGE" 2012-08-01 15:14:28 -07:00
The Android Open Source Project
d0ad0931fe Reconcile with jb-mr1-release - do not merge
Change-Id: I2a14632780e1a82c04a53ef60c7e4040a4fe0653
2012-08-01 15:13:34 -07:00
Peter Ng
7bf1831550 am 2b1584c1: new confirming page and updates to progress and iconography
* commit '2b1584c1d53cd1070d5157c07158828b4baf8844':
  new confirming page and updates to progress and iconography
2012-08-01 15:12:26 -07:00
Brian Carlstrom
4faeef378e Merge "Improve test key names to reproduce public issue" 2012-08-01 15:06:35 -07:00
Chris Wren
bc26dc75c3 am c9d737dd: am 45aaa4a8: am 790474ba: am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev
* commit 'c9d737dd8c5085d1a5717caa03a7d3d907d8afd1':
  Add missing docs to notification style rebuilder functions.
2012-08-01 14:56:06 -07:00
Scott Main
f67a03795c am bd4a1041: am 4861668e: am c82875e4: am e2594672: Merge "dashboard update for 8/1" into jb-dev
* commit 'bd4a10411aa1ffe54f910010347ab67fdc28905d':
  dashboard update for 8/1
2012-08-01 14:56:02 -07:00
Robert Greenwalt
412ebf4624 am d0378f4d: am 6c5cec88: am 6b6ce6bf: am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
* commit 'd0378f4dddbff8173c21a263e458ca965cfc4a74':
  Telephony: Add HSPAP to getTcpBufferSizesPropName
2012-08-01 14:55:57 -07:00
Katie McCormick
dd983ad556 cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a
2012-08-01 14:55:22 -07:00
Jeff Sharkey
231b2814c5 am 2a036091: am 6a916ed0: Merge "Add trimToSize() to public API." into jb-mr1-dev
* commit '2a036091420674a56fb2e4634950b9d917d1b7b2':
  Add trimToSize() to public API.
2012-08-01 14:53:14 -07:00
Teng-Hui Zhu
cf737484a8 am ca6b44f8: am 3a680382: Merge "Add license info to the HTML5Video files." into jb-mr1-dev
* commit 'ca6b44f8a9c78002f1826d49ced350287831dba4':
  Add license info to the HTML5Video files.
2012-08-01 14:53:10 -07:00