Commit Graph

36517 Commits

Author SHA1 Message Date
Kristian Monsen b7beee0192 Merge "Merge Chromium at r12.0.742.93: New autofill string" 2011-07-08 11:31:33 -07:00
Robert Greenwalt ab1db31b71 Merge "Remove unused setHttpProxy." 2011-07-08 11:06:55 -07:00
Robert Ly 5e40a8e9f4 am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '6b98e7128b3fbfd8b2c421286c403e4609c69708':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
2011-07-08 10:44:10 -07:00
Joe Malin 83d7414c9e am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '230ef98728f3b59a81f55dab5129aa50d5f27969':
  DOC CHANGE: Change GTV info on intro page
2011-07-08 10:41:54 -07:00
Joe Fernandez 1a1c333424 am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '20f6520197a6b70123d2ff7c466ee58349ae3032':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
2011-07-08 10:41:35 -07:00
Robert Ly b30faa2e11 am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
2011-07-08 10:39:46 -07:00
Robert Ly 9186b53da7 Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 2011-07-08 10:13:28 -07:00
Wink Saville 68843705a5 am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
  Disconnect ApnContexts in INITING state when error.
2011-07-08 09:40:11 -07:00
Wink Saville aebd78e148 am 8171e6f6: Use resetConnections with resetMask.
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
  Use resetConnections with resetMask.
2011-07-08 09:40:08 -07:00
Wink Saville 4dcbd934fc am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '848aa3ab8a00835c5af2ead954c7736e507249b5':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
2011-07-08 09:40:03 -07:00
Joe Malin 1c6e2aa5e5 am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '0e89d916f078a518093c476725fa7e0798dcc590':
  DOC CHANGE: Change GTV info on intro page
2011-07-08 09:39:25 -07:00
Joe Fernandez 104a2351c7 am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
2011-07-08 09:39:22 -07:00
Wink Saville f983682b36 Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE 2011-07-07 22:00:56 -07:00
Romain Guy 076a3c7fb1 Merge "Cleanup" 2011-07-07 21:35:19 -07:00
Romain Guy 57d9cdf408 Merge "Use NEAREST filtering mode for TextureView.getBitmap()." 2011-07-07 21:28:41 -07:00
Adam Powell d51d49eb12 Merge "Add ALL CAPS style to TextView/TextAppearance" 2011-07-07 20:55:10 -07:00
Romain Guy 9dd666ae6b Merge "Use NEAREST filtering for layers whenever possible." 2011-07-07 20:55:08 -07:00
Joe Malin 19798c7586 Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2 2011-07-07 18:19:18 -07:00
Michael Jurka e1629167cf Merge "Handling Resources.NotFoundException in Recents" 2011-07-07 16:28:03 -07:00
Jason Sams 4207b52d26 Merge "Fix more type info caching bugs." 2011-07-07 16:24:51 -07:00
Shimeng (Simon) Wang 2646b68687 Merge "Update viewport asap." 2011-07-07 16:17:16 -07:00
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
Joe Fernandez 36ff879a92 Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 2011-07-07 15:03:55 -07:00
Jamie Gennis 798ff739a1 Merge "SurfaceTexture: enable newly passing tests." 2011-07-07 14:42:12 -07:00
Wink Saville 206637af68 Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 2011-07-07 14:39:23 -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