101428 Commits

Author SHA1 Message Date
Dirk Dougherty
137914a529 am 2b57a2c5: am 71d9a09f: am f842ff83: am ebaeef0c: am 4e5d954f: am 1b272cbd: am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo.
* commit '2b57a2c5bda09610ec21866e1207c77b39568c91':
2013-03-05 21:24:49 +00:00
Dirk Dougherty
019f31a1e0 am 32d2e30f: am e95d243a: am 495c25aa: am a26dd19e: am b7870890: am af749fec: am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
* commit '32d2e30f14c3eae98f6a6a16373cc7e40c03f860':
2013-03-05 21:24:46 +00:00
Dirk Dougherty
2b57a2c5bd am 71d9a09f: am f842ff83: am ebaeef0c: am 4e5d954f: am 1b272cbd: am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo.
* commit '71d9a09fa0ccf0831118eb25aa20ce8d94f32b62':
2013-03-05 21:21:56 +00:00
Dirk Dougherty
32d2e30f14 am e95d243a: am 495c25aa: am a26dd19e: am b7870890: am af749fec: am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
* commit 'e95d243a3336649441c497ed88064d8a8d6f1426':
2013-03-05 21:21:53 +00:00
Dirk Dougherty
71d9a09fa0 am f842ff83: am ebaeef0c: am 4e5d954f: am 1b272cbd: am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo.
* commit 'f842ff83dbe46d472ee389ea23b18333e216ed26':
2013-03-05 21:16:09 +00:00
Dirk Dougherty
e95d243a33 am 495c25aa: am a26dd19e: am b7870890: am af749fec: am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
* commit '495c25aaf08770eb7d10e3a1450069295216d32e':
2013-03-05 21:16:06 +00:00
Dirk Dougherty
f842ff83db am ebaeef0c: am 4e5d954f: am 1b272cbd: am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo.
* commit 'ebaeef0c92520e11b3fdb72de2c6453014774036':
2013-03-05 13:13:10 -08:00
Dirk Dougherty
495c25aaf0 am a26dd19e: am b7870890: am af749fec: am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
* commit 'a26dd19ea756570ada5eb683593642645271e700':
2013-03-05 13:13:07 -08:00
Dirk Dougherty
ebaeef0c92 am 4e5d954f: am 1b272cbd: am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo.
* commit '4e5d954fecbe7e5bee2b81d4315fef89518dfda4':
2013-03-05 13:09:10 -08:00
Dirk Dougherty
a26dd19ea7 am b7870890: am af749fec: am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
* commit 'b787089034d9f068167f225fbe9b1461743c98c8':
2013-03-05 13:09:08 -08:00
Andy McFadden
7f610e0e95 am 12a7c027: am 3e732435: Merge "Add eglPresentationTimeANDROID" into jb-mr2-dev
* commit '12a7c0278c69f882cb032f8cc0a3f956bc734daf':
  Add eglPresentationTimeANDROID
2013-03-05 21:08:34 +00:00
Daniel Sandler
e1a0bc7e71 am 9f16fd5b: am 56bea4d4: Merge "Defend against NaNs in panel animation code." into jb-mr2-dev
* commit '9f16fd5b12b73bfa4c781811d1963328d6594add':
  Defend against NaNs in panel animation code.
2013-03-05 21:08:32 +00:00
Scott Main
5fb0b4555b am 94c78e92: am 13d0ce0a: am 0f8958d0: am e3b8a46c: am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
* commit '94c78e92d42021f972eb38c639c38410b3f37e2f':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 21:08:29 +00:00
Joe Malin
2a4977e964 am 8f835164: am f4634dcf: am d88cccc9: am 72ee1820: am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
* commit '8f835164315caa93b225a75dad43ab7e9e445f7c':
  Bug 8289268: Reversed text Content Provider Basics
2013-03-05 21:08:27 +00:00
Romain Guy
4fef703a08 am ccb90292: am b0d415a7: Merge "Fix colored rects clipping and code cleanup" into jb-mr2-dev
* commit 'ccb90292c30901578c740691ed25db73b45daac9':
  Fix colored rects clipping and code cleanup
2013-03-05 21:08:24 +00:00
Dianne Hackborn
5c14d36c59 am 892e0782: am ad4a174b: Merge "Fix build." into jb-mr2-dev
* commit '892e07829414fda01594f52c54352c8dbbd37499':
  Fix build.
2013-03-05 21:08:21 +00:00
Irfan Sheriff
9cad79bb0b am 4a1b9089: am c7ede61f: Merge "Fix client tracking" into jb-mr2-dev
* commit '4a1b9089791fea4393f70d81f342bd1cf08bc70c':
  Fix client tracking
2013-03-05 21:08:19 +00:00
Andy McFadden
2cb2f92e02 am 56094c11: am 43abdc48: Merge "Implement Surface input to MediaCodec." into jb-mr2-dev
* commit '56094c11cfa3cfa4d7c15378c9798e612f38f0f0':
  Implement Surface input to MediaCodec.
2013-03-05 21:08:16 +00:00
Dianne Hackborn
ee61a7fb95 am 530b2b1c: am a5513616: Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev
* commit '530b2b1c98e3a3d86fd90cd91a08005370b8aa49':
  Add new WindowId for cross-process monitoring of focus.
2013-03-05 21:08:13 +00:00
Dirk Dougherty
4e5d954fec am 1b272cbd: am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo.
* commit '1b272cbd557eed790faea4d713bc98c64e386712':
2013-03-05 13:05:57 -08:00
Dirk Dougherty
b787089034 am af749fec: am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
* commit 'af749fece445a24e5d01872b4856f17b1fb6106d':
2013-03-05 13:05:55 -08:00
Andy McFadden
12a7c0278c am 3e732435: Merge "Add eglPresentationTimeANDROID" into jb-mr2-dev
* commit '3e732435e7b0fb8dcfc19593f6c2ae3c434cf6f5':
  Add eglPresentationTimeANDROID
2013-03-05 21:05:35 +00:00
Daniel Sandler
9f16fd5b12 am 56bea4d4: Merge "Defend against NaNs in panel animation code." into jb-mr2-dev
* commit '56bea4d41b41b617634eff591254d218b92f9d43':
  Defend against NaNs in panel animation code.
2013-03-05 21:05:23 +00:00
Scott Main
94c78e92d4 am 13d0ce0a: am 0f8958d0: am e3b8a46c: am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
* commit '13d0ce0a0e256ec574ec061a4eba4a1d2ae6c62d':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 21:05:20 +00:00
Joe Malin
8f83516431 am f4634dcf: am d88cccc9: am 72ee1820: am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
* commit 'f4634dcfe0b04700bcf60d930897ff86c81b697c':
  Bug 8289268: Reversed text Content Provider Basics
2013-03-05 21:05:17 +00:00
Romain Guy
ccb90292c3 am b0d415a7: Merge "Fix colored rects clipping and code cleanup" into jb-mr2-dev
* commit 'b0d415a79af01bb6bdf382c4fd9130c1e780c97d':
  Fix colored rects clipping and code cleanup
2013-03-05 21:05:12 +00:00
Dianne Hackborn
892e078294 am ad4a174b: Merge "Fix build." into jb-mr2-dev
* commit 'ad4a174bbcd92750a382b033768a307585bc8ffe':
  Fix build.
2013-03-05 21:05:04 +00:00
Irfan Sheriff
4a1b908979 am c7ede61f: Merge "Fix client tracking" into jb-mr2-dev
* commit 'c7ede61f592a2389790ce0993b8ee0a16de54b5e':
  Fix client tracking
2013-03-05 21:04:56 +00:00
Andy McFadden
56094c11cf am 43abdc48: Merge "Implement Surface input to MediaCodec." into jb-mr2-dev
* commit '43abdc486d19c137b79a2bde9ce4706c91656bda':
  Implement Surface input to MediaCodec.
2013-03-05 21:04:49 +00:00
Dianne Hackborn
530b2b1c98 am a5513616: Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev
* commit 'a55136169eb3367c70f7b8686d51289483310586':
  Add new WindowId for cross-process monitoring of focus.
2013-03-05 21:04:46 +00:00
Dirk Dougherty
1b272cbd55 am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo.
* commit 'f02ebca3c2660b61afee2a656ce52f410cd05646':
2013-03-05 13:02:50 -08:00
Dirk Dougherty
af749fece4 am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
* commit '893f0cc179ca29d8a55eb36bd2108e428d33c406':
2013-03-05 13:02:46 -08:00
Andy McFadden
3e732435e7 Merge "Add eglPresentationTimeANDROID" into jb-mr2-dev 2013-03-05 20:59:47 +00:00
Craig Mautner
3e708d280b Merge "Remove all vestiges of mHistory." 2013-03-05 20:48:24 +00:00
Philip Milne
a235362152 GridLayout diagnostics.
Add null check for:

https://googleplex-android-review.git.corp.google.com/#/c/183792/

Change-Id: Ic8ef7b6749b6d2568ed4e4b3b1fa4ad6659c70eb
2013-03-05 12:21:43 -08:00
Daniel Sandler
56bea4d41b Merge "Defend against NaNs in panel animation code." into jb-mr2-dev 2013-03-05 19:54:35 +00:00
Scott Main
13d0ce0a0e am 0f8958d0: am e3b8a46c: am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
* commit '0f8958d053467453fd99f62a40035115d347f662':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 19:51:49 +00:00
Dianne Hackborn
07a55b376c Merge "Welcome, Key Lime Pie." 2013-03-05 19:50:54 +00:00
Scott Main
0f8958d053 am e3b8a46c: am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
* commit 'e3b8a46c4c37bf72086697c5add976297e329190':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:49:21 -08:00
Philip Milne
0e051852e5 Merge "Provide (general) mecahnism for users of GridLayout to either suppress or react to diagnostics." 2013-03-05 19:48:23 +00:00
Joe Malin
f4634dcfe0 am d88cccc9: am 72ee1820: am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
* commit 'd88cccc9ba2051ec0523dbeb757680ffd59ec598':
  Bug 8289268: Reversed text Content Provider Basics
2013-03-05 19:47:35 +00:00
Scott Main
e3b8a46c4c am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
* commit 'f4c80adc04788c802c4a8df305d0ef8a1fe154b7':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:47:32 -08:00
Joe Malin
d88cccc9ba am 72ee1820: am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
* commit '72ee1820ceb5595087baca1c1205f5140197e0cb':
  Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:45:51 -08:00
Scott Main
f4c80adc04 am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
* commit '48ff42cd1ca381b1de535bd74405649215bc7d01':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:45:39 -08:00
Joe Malin
72ee1820ce am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
* commit 'c17673712a8b199f0e30fd9fc920e9ff7d928dc9':
  Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:44:11 -08:00
Scott Main
48ff42cd1c am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
* commit '864e60fb26ddb7c48d0f0b9a0519e40b2fd528f0':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:43:49 -08:00
Joe Malin
c17673712a am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
* commit 'ebdf1ccc5bd18e2f55d6f900382dabad4a287b9b':
  Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:42:15 -08:00
Joe Malin
ebdf1ccc5b am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
  Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:40:15 -08:00
Scott Main
864e60fb26 Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 2013-03-05 19:39:38 +00:00
Joe Malin
33a9f63c1c Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 2013-03-05 19:35:57 +00:00