Craig Mautner
828f094a5f
Merge "Limit screenshots to specified activity and stack."
2013-05-15 19:41:06 +00:00
Craig Mautner
76ea224678
Limit screenshots to specified activity and stack.
...
The screenshots were capturing the entire screen. Now they are limited
to the stack containing the activity.
Add debug for stack states.
Change-Id: I6d47cd37091bfdfd94e7abe89826b7ba8cb69b51
2013-05-15 12:40:10 -07:00
Romain Guy
357eccdd52
Merge "Revert "Reduce the number of measurement passes in RelativeLayout""
2013-05-15 18:03:32 +00:00
Romain Guy
398051b8ee
Revert "Reduce the number of measurement passes in RelativeLayout"
...
This reverts commit 4cb81d6423ab15ce97575699e5fbc765322ba699.
2013-05-15 11:02:25 -07:00
Robert Greenwalt
e67677f92c
am 777e2e85: am a34b531b: Merge "EthernetDataTracker: Set network available on connected"
...
* commit '777e2e8545e37dfaf27f0f0ccd835f64fab7b746':
EthernetDataTracker: Set network available on connected
2013-05-15 10:44:04 -07:00
Robert Greenwalt
777e2e8545
am a34b531b: Merge "EthernetDataTracker: Set network available on connected"
...
* commit 'a34b531bb6d2f2923f474b8c0a0c09149303e5d3':
EthernetDataTracker: Set network available on connected
2013-05-15 10:41:54 -07:00
Robert Greenwalt
a34b531bb6
Merge "EthernetDataTracker: Set network available on connected"
2013-05-15 16:39:05 +00:00
Dirk Dougherty
c979d9c008
am f4dfad6a: am 1b173c6d: am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
...
* commit 'f4dfad6a89831d6b1780513cf4ea28a5485b19b9':
Doc change: add redirects for edu urls.
2013-05-15 07:41:51 -07:00
Dirk Dougherty
26701f2b50
am d662bf1a: am 7b2fba2f: am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
...
* commit 'd662bf1a50e7a19f5ea301a8083aeb6dabee4b0a':
Doc change: updates to location landing.
2013-05-15 07:41:49 -07:00
Dirk Dougherty
f4dfad6a89
am 1b173c6d: am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
...
* commit '1b173c6d5dceac14a42e6bf92980d0e247f5ccbc':
Doc change: add redirects for edu urls.
2013-05-15 07:39:49 -07:00
Dirk Dougherty
d662bf1a50
am 7b2fba2f: am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
...
* commit '7b2fba2f4a78fb42f42268fb899884b8fe4c5e1d':
Doc change: updates to location landing.
2013-05-15 07:39:46 -07:00
Dirk Dougherty
1b173c6d5d
am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
...
* commit '0f5d1391f511380382b2cb91cf356d80854230b5':
Doc change: add redirects for edu urls.
2013-05-15 07:37:59 -07:00
Dirk Dougherty
7b2fba2f4a
am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
...
* commit '997d00428c420ba8c2175c7c2e28f14d54abd0b9':
Doc change: updates to location landing.
2013-05-15 07:37:55 -07:00
Dirk Dougherty
0f5d1391f5
am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
...
* commit 'b705986179b1bbda80c9281477a4d6b6b6d27e88':
Doc change: add redirects for edu urls.
2013-05-15 07:35:52 -07:00
Dirk Dougherty
997d00428c
am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
...
* commit 'aa0acfc8761fc8802879f90511b904061a523ed2':
Doc change: updates to location landing.
2013-05-15 07:35:49 -07:00
Dirk Dougherty
b705986179
am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
...
* commit '2694897a3c20b79e3b28601ee43bcaefec827232':
Doc change: add redirects for edu urls.
2013-05-15 07:33:18 -07:00
Dirk Dougherty
aa0acfc876
am 231e2474: Merge commit \'c3069c26\' into manualmerge
...
* commit '231e2474f283dc0a1962b45f1c16c5280a8937df':
Doc change: updates to location landing.
2013-05-15 07:33:16 -07:00
Dirk Dougherty
2694897a3c
am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
...
* commit '787cbb37d5cb2334af80d8da1b8fa4286e845eee':
Doc change: add redirects for edu urls.
2013-05-15 07:32:03 -07:00
Dirk Dougherty
231e2474f2
Merge commit 'c3069c26' into manualmerge
...
Conflicts:
docs/html/guide/topics/location/strategies.jd
Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
2013-05-15 07:30:11 -07:00
Dirk Dougherty
787cbb37d5
am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
...
* commit '9a51dfd4e3e10411ede67743f85cdd510ba3eb90':
Doc change: add redirects for edu urls.
2013-05-15 06:38:32 -07:00
Dirk Dougherty
c3069c2614
am 8d595130: Merge "Doc change: updates to location landing." into jb-mr1.1-docs
...
* commit '8d59513030cbc61c37aec2d2a2343a9bfc03ae2d':
Doc change: updates to location landing.
2013-05-15 06:35:10 -07:00
Dirk Dougherty
9a51dfd4e3
Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
2013-05-15 13:34:31 +00:00
Dirk Dougherty
8d59513030
Merge "Doc change: updates to location landing." into jb-mr1.1-docs
2013-05-15 13:33:06 +00:00
Dirk Dougherty
d14295cf0e
Doc change: updates to location landing.
...
Change-Id: Id7862fd966d9e80bf23521620e964813ad9065a6
2013-05-15 06:31:48 -07:00
Dirk Dougherty
11929a3b4a
am 89d42cab: am 0163a180: am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
...
* commit '89d42cabcd8b2395474f30fc2d3ecf42a7c03681':
Doc change: add files for edu content.
2013-05-15 05:39:26 -07:00
Dirk Dougherty
89d42cabcd
am 0163a180: am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
...
* commit '0163a180510128142ed9f13bf0d5a7daa4bf6c30':
Doc change: add files for edu content.
2013-05-15 05:37:14 -07:00
Dirk Dougherty
0163a18051
am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
...
* commit '8f13a2ad9f68ddb10388e86104868311e5ee2e29':
Doc change: add files for edu content.
2013-05-15 05:35:25 -07:00
Dirk Dougherty
8f13a2ad9f
am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
...
* commit 'c3727b78faf23f84a4888d96a0e21716ac0cecb7':
Doc change: add files for edu content.
2013-05-15 05:28:14 -07:00
Dirk Dougherty
c3727b78fa
am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
...
* commit '260f110fce5374fa2c4b2d1788a54b1fa5a04d0f':
Doc change: add files for edu content.
2013-05-15 04:33:00 -07:00
Dirk Dougherty
260f110fce
am 7929aafe: am 6402d93e: Doc change: add files for edu content.
...
* commit '7929aafeaf95b1531e471cfbe9b79acd6a783a23':
Doc change: add files for edu content.
2013-05-15 04:29:16 -07:00
Dirk Dougherty
206a40720a
Doc change: add redirects for edu urls.
...
Change-Id: Ic46047c99fe9b1902694d9ecdcea1c9c799ee611
2013-05-15 04:28:25 -07:00
Dirk Dougherty
7929aafeaf
am 6402d93e: Doc change: add files for edu content.
...
* commit '6402d93ed8ff6712c0b9787188607e5a9b212602':
Doc change: add files for edu content.
2013-05-15 04:24:49 -07:00
Dirk Dougherty
6402d93ed8
Doc change: add files for edu content.
...
Change-Id: I5187958d5bbbdd1117df5bcc9b553c06323fef8d
2013-05-15 04:17:19 -07:00
Dirk Dougherty
cac4bc3188
am 3cdce556: am e7ba7a29: am 6999e89f: am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
...
* commit '3cdce5568107490c09030fc380c0d4aba5d6388d':
Doc change: update gms and gcm reference TOC.
2013-05-15 02:59:30 -07:00
Dirk Dougherty
3cdce55681
am e7ba7a29: am 6999e89f: am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
...
* commit 'e7ba7a29e81388f9293a90a730a4e9be84938f8b':
Doc change: update gms and gcm reference TOC.
2013-05-15 02:57:23 -07:00
Dirk Dougherty
e7ba7a29e8
am 6999e89f: am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
...
* commit '6999e89fd30679e189fca2a1e46b0c06ece1aff7':
Doc change: update gms and gcm reference TOC.
2013-05-15 02:55:07 -07:00
Dirk Dougherty
6999e89fd3
am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
...
* commit '63c15be8a9b12bbc487e48160623a5aae883255b':
Doc change: update gms and gcm reference TOC.
2013-05-15 02:52:39 -07:00
Dirk Dougherty
63c15be8a9
am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
...
* commit 'f76a9d23db204734ac88a20a96fd87c0d4b63665':
Doc change: update gms and gcm reference TOC.
2013-05-15 02:51:01 -07:00
Dirk Dougherty
f76a9d23db
am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
...
* commit '7ea00d91c1f3447168cafebe04a99462e5c25c32':
Doc change: update gms and gcm reference TOC.
2013-05-15 02:49:13 -07:00
Scott Main
de94923e64
am 84fa53ab: am dab92bca: am 78d38908: am f2216fd0: am 527b7623: more search suggest tagging
...
* commit '84fa53abab928427fc730d246db15480ab1e21bb':
more search suggest tagging
2013-05-15 02:47:51 -07:00
Dirk Dougherty
7ea00d91c1
am a38ca33d: Doc change: update gms and gcm reference TOC.
...
* commit 'a38ca33d17f40a0a67855b2ec1b5895a5157b851':
Doc change: update gms and gcm reference TOC.
2013-05-15 02:47:04 -07:00
Scott Main
84fa53abab
am dab92bca: am 78d38908: am f2216fd0: am 527b7623: more search suggest tagging
...
* commit 'dab92bca845018865e8e6f17906e890dd5e9698d':
more search suggest tagging
2013-05-15 02:45:43 -07:00
Scott Main
dab92bca84
am 78d38908: am f2216fd0: am 527b7623: more search suggest tagging
...
* commit '78d38908c43f2af43347cb19d4712617041ea815':
more search suggest tagging
2013-05-15 02:43:33 -07:00
Scott Main
78d38908c4
am f2216fd0: am 527b7623: more search suggest tagging
...
* commit 'f2216fd0af83ba648f2ea0662d25210137bf0da3':
more search suggest tagging
2013-05-15 02:41:07 -07:00
Dirk Dougherty
a38ca33d17
Doc change: update gms and gcm reference TOC.
...
Change-Id: I24b9506c3111a744c26e0c6c2b94192402684c80
2013-05-15 02:40:55 -07:00
Scott Main
f2216fd0af
am 527b7623: more search suggest tagging
...
* commit '527b762341ef96b3ecc99aa6aa3b8b7615311458':
more search suggest tagging
2013-05-15 02:38:44 -07:00
Scott Main
527b762341
more search suggest tagging
...
Change-Id: I2cbed751c4b75547feb3e6dc3d4762be9bd944d3
2013-05-15 02:33:57 -07:00
Dirk Dougherty
2aa3ca5286
am e3c734ac: am c50a14a6: am 78aad359: am a964c856: am daaa01af: am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
...
* commit 'e3c734ac01df424ad457794bd2cfefcf1bc11469':
Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:28:00 -07:00
Dirk Dougherty
e3c734ac01
am c50a14a6: am 78aad359: am a964c856: am daaa01af: am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
...
* commit 'c50a14a66a3bc623ab0a48c94eae4b8dce8a340d':
Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:26:54 -07:00
Dirk Dougherty
c50a14a66a
am 78aad359: am a964c856: am daaa01af: am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
...
* commit '78aad359350d9bae842019737a3998a1d3a784c5':
Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:24:42 -07:00
