Jason Sams
fa234b2910
Merge "Fix defered type creation when loading from A3D."
2011-07-07 16:10:38 -07:00
Gilles Debunne
d4116b3d93
Merge "XmlDocumentProvider moved to the XmlAdapter sample code"
2011-07-07 16:07:07 -07:00
Jason Sams
b6d4c47195
Merge "AllocationAdapter cleanup."
2011-07-07 15:50:41 -07:00
Eric Laurent
613f5ff0bb
Merge "Moved and renamed effect API header files"
2011-07-07 15:37:07 -07:00
Joe Fernandez
47a355d658
Merge "Revert "docs: OpenGL Tutorials""
2011-07-07 15:33:15 -07:00
Huahui Wu
373aad1bb4
Merge "Revert "b/3302378 Passes touch pressures, size and timestamps to webkit.""
2011-07-07 15:10:25 -07:00
Jamie Gennis
798ff739a1
Merge "SurfaceTexture: enable newly passing tests."
2011-07-07 14:42:12 -07:00
Adam Powell
5100c063a8
Merge "Action bar layout tweaks"
2011-07-07 14:35:22 -07:00
Jim Miller
bd2f0535d4
Merge "Fix 4689527: Fix rendering issue with thumbnails on phones"
2011-07-07 14:35:18 -07:00
Joe Fernandez
eb20d068cb
Merge "docs: OpenGL Tutorials"
2011-07-07 14:31:02 -07:00
Philip Milne
703f7f53f8
Merge "Simplify and tidy the API for maximum value support."
2011-07-07 14:30:31 -07:00
Romain Guy
e76fbf4ec9
Merge "Add an API to query maximum bitmap/texture size on Canvas."
2011-07-07 14:10:52 -07:00
Jim Miller
7b4329fb89
Merge "Fix 4689527: Update Recents"
2011-07-07 13:58:13 -07:00
Daniel Lehmann
c616445641
Merge "Contacts contract changes for social updates."
2011-07-07 13:35:00 -07:00
James Dong
a8b1288afd
Merge "Add support for some custom YUV420 color formats to recordvideo utility"
2011-07-07 13:34:58 -07:00
Eric Fischer
555b49d09b
Merge "Import revised translations."
2011-07-07 11:33:38 -07:00
Scott Main
042715ba5b
am 33f6d634: am e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
...
* commit '33f6d6347b88d239b16a6b3f28adcb7bf4a61881':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
2011-07-07 11:23:25 -07:00
Scott Main
1968b6da26
am 9638fbcf: am 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
...
* commit '9638fbcfd2c4449075ead8545a759a4d4dd03a28':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
2011-07-07 11:23:22 -07:00
Wink Saville
6da6073153
am 19065008: am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
...
* commit '19065008b820ea95530d49cf1894f7481929f8e6':
Reset FAILED ApnContext state to IDLE on data setup triggers
2011-07-07 11:22:34 -07:00
Robert Ly
3d020401c1
am 6c9d636f: am 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
...
* commit '6c9d636f40477ef3ac44a6e30ac645d708d89002':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
2011-07-07 11:22:31 -07:00
Kazuhiro Ondo
860529197d
am 6716ac53: am c8e2916d: Bring back ERI into CDMA-LTE mode
...
* commit '6716ac5342de7e83e5ba47f28aac40a46d1363ac':
Bring back ERI into CDMA-LTE mode
2011-07-07 11:22:10 -07:00
Wink Saville
11ae780481
am 5eeeea29: am 97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
...
* commit '5eeeea29ecd731897211d31bde7ee87af182420c':
Allow vril-dump to work on user builds
2011-07-07 11:05:51 -07:00
Huahui Wu
ce50359c90
Merge "b/3302378 Passes touch pressures, size and timestamps to webkit."
2011-07-07 11:05:13 -07:00
Jeff Sharkey
5840d56c89
Merge "Temporarily disable socket tagging."
2011-07-07 10:23:44 -07:00
Scott Main
e06423e154
am e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
...
* commit 'e4e1c3fda937d30c9aa75a43c470de6c54a97073':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
2011-07-07 10:17:00 -07:00
Scott Main
da26247235
am 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
...
* commit '0657e1a7e7d25fee700930252f6b85c3d70bc368':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
2011-07-07 10:14:38 -07:00
Scott Main
a307ced08a
am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
...
* commit '40afb97c3289cd3daae9a31f4829d660ba747d37':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
2011-07-07 10:13:44 -07:00
Scott Main
1c4d16f1bc
am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
...
* commit '77dfe2173e2970a6a662b7d9537715c81886185e':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
2011-07-07 10:10:29 -07:00
Robert Ly
81faebb104
am f870327d: am bc45fcbb: am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
...
* commit 'f870327d5dc8a914d0fc55f454b6378f3e504d79':
cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
2011-07-07 09:54:18 -07:00
Jean-Baptiste Queru
b0d13a9dc7
Merge 37dbfcaf
...
Change-Id: Iae55ecada8dc231c88bb87b32e8bd5e7b6a47bd0
2011-07-07 08:46:09 -07:00
Adrian Ludwig
b1d0261f33
Merge "Android security code review."
2011-07-07 08:08:13 -07:00
Irfan Sheriff
2f774e9c6f
Merge "Moved WifiWatchdogService and DnsPinger"
2011-07-06 22:08:38 -07:00
Wink Saville
516dec3c9f
am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
...
* commit '48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
Reset FAILED ApnContext state to IDLE on data setup triggers
2011-07-06 19:05:40 -07:00
Wink Saville
8c05bdcdbc
Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
2011-07-06 19:04:30 -07:00
Robert Ly
054f597fa8
am 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
...
* commit '027654e90da14275fbf076e739e16f89c4fcae2c':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
2011-07-06 18:19:26 -07:00
Robert Ly
3e02d13040
am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
...
* commit 'ad2724de956955b0ddf95491f6cb378f54dafde5':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
2011-07-06 18:17:53 -07:00
Elliott Hughes
c5b8a10ad5
Merge "Add the "debug.jni.logging" property so third-party developers can debug their JNI problems."
2011-07-06 18:11:20 -07:00
Kazuhiro Ondo
927ed58ff7
am c8e2916d: Bring back ERI into CDMA-LTE mode
...
* commit 'c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
Bring back ERI into CDMA-LTE mode
2011-07-06 18:04:30 -07:00
Mike Lockwood
608a6c0e4c
Merge "UsbDeviceManager: Initialize RNDIS ethernet address based on device serial number"
2011-07-06 17:54:08 -07:00
Svetoslav Ganov
a3fa300bfe
Merge "Addressing comments during security review of the interrogation feature."
2011-07-06 17:27:21 -07:00
Christopher Tate
a63917ce2e
Merge "Remove unused object"
2011-07-06 15:31:56 -07:00
Brian Carlstrom
aa0fa62164
Merge "New KeyChain API for credential installation"
2011-07-06 14:59:21 -07:00
Christopher Tate
e341676010
Merge "Make full backup API available to apps"
2011-07-06 14:48:43 -07:00
Jamie Gennis
47dd726460
SurfaceTexture: enable newly passing tests.
...
This change enables the following four SurfaceTextures tests:
UpdateTexImageBeforeFrameFinishedWorks
UpdateTexImageAfterFrameFinishedWorks
RepeatedUpdateTexImageBeforeFrameFinishedWorks
RepeatedUpdateTexImageAfterFrameFinishedWorks
Change-Id: I7632630bc97873e50d4a765ffc44a86f16ae62f1
2011-07-06 14:47:47 -07:00
Shimeng (Simon) Wang
d9f93bdfd6
Merge "Treat restored defaultScale as overview."
2011-07-06 14:40:53 -07:00
Irfan Sheriff
c33c7281cc
Merge "Log supplicant restart count correctly"
2011-07-06 13:42:42 -07:00
Jason Sams
f95b206400
Merge "docs: Re-write of OpenGL Framework topic bug 4285030"
2011-07-06 13:29:29 -07:00
Brian Carlstrom
9573a61400
Merge "Adding additional details to ssl_certificate view"
2011-07-06 12:39:25 -07:00
Wink Saville
c6066148b5
am 97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
...
* commit '97667d0cb3d5aecca7210c70a302f7a667330708':
Allow vril-dump to work on user builds
2011-07-06 12:09:48 -07:00
Wink Saville
53fef10a0d
Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
2011-07-06 12:08:05 -07:00