124485 Commits

Author SHA1 Message Date
Ruben Brunk
4ee60085c9 am 40675bdd: Merge "camera3: Update maxRegions tag."
* commit '40675bdd3857a9e29b2e61b5bc1660e9bb2e82a2':
  camera3: Update maxRegions tag.
2014-02-04 13:04:15 -08:00
Ruben Brunk
40675bdd38 Merge "camera3: Update maxRegions tag." 2014-02-04 21:01:19 +00:00
Alan Viverette
be2c04201f am 07f00e74: Merge "Update APIs from RotateDrawable change"
* commit '07f00e74029cbe80cd4353955dbaae7e828b8e70':
  Update APIs from RotateDrawable change
2014-02-04 11:39:24 -08:00
Alan Viverette
07f00e7402 Merge "Update APIs from RotateDrawable change" 2014-02-04 19:37:41 +00:00
Alan Viverette
f14415a9bb Update APIs from RotateDrawable change
Change-Id: I89b1ef79360231912e16d60b20c2a52d4dc2c94e
2014-02-04 11:37:05 -08:00
Scott Main
95ffabbc5d am 45d1cc58: am 35a25455: am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14
* commit '45d1cc587bec8770e3f56a194c27452b933cc058':
  dashbaord update for feb '14
2014-02-04 11:35:45 -08:00
Scott Main
45d1cc587b am 35a25455: am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14
* commit '35a254554787196cf835536cc3bc28f9ee890af4':
  dashbaord update for feb '14
2014-02-04 19:33:26 +00:00
Scott Main
35a2545547 am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14
* commit '70f908d7af916bf0e5b6af2913752dca431b837f':
  dashbaord update for feb '14
2014-02-04 19:25:04 +00:00
Alan Viverette
cad2096687 am b8771938: Merge "Clean up RotateDrawable, add getters and setters for XML properties"
* commit 'b8771938daf6a2e40fdbf97d60bfdb2b0fe8ccd9':
  Clean up RotateDrawable, add getters and setters for XML properties
2014-02-04 11:24:04 -08:00
Scott Main
70f908d7af am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14
* commit '3e80914d1683d1641fd6a01f14f126452e17f5c7':
  dashbaord update for feb '14
2014-02-04 19:22:02 +00:00
Scott Main
3e80914d16 am eea15edc: am 749120f3: dashbaord update for feb \'14
* commit 'eea15edcd47e6830dd6cdecb2c0b1e26eba0e6e3':
  dashbaord update for feb '14
2014-02-04 19:19:38 +00:00
Alan Viverette
b8771938da Merge "Clean up RotateDrawable, add getters and setters for XML properties" 2014-02-04 19:19:21 +00:00
Scott Main
eea15edcd4 am 749120f3: dashbaord update for feb \'14
* commit '749120f39bdac49a96771d06d25b7f9edf70be67':
  dashbaord update for feb '14
2014-02-04 19:15:36 +00:00
Glenn Kasten
e06f32a1c8 am c734de9c: am 9d2ad121: am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit 'c734de9c2bcd17e5b07647002acb11afcf19aff6':
  Add adb over Wi-Fi
2014-02-04 11:07:05 -08:00
Adam Lesinski
3d650b9565 am 94c40a4c: resolved conflicts for merge of 1b5b60d6 to master
* commit '94c40a4cf90933216e6d656213dfdfa19c68a9c3':
  Add support for multiple asset dirs (-A)
2014-02-04 11:03:35 -08:00
Glenn Kasten
c734de9c2b am 9d2ad121: am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '9d2ad12181a1793686d7cdbdf11b3aa5a92030c4':
  Add adb over Wi-Fi
2014-02-04 19:02:57 +00:00
Adam Lesinski
94c40a4cf9 resolved conflicts for merge of 1b5b60d6 to master
Change-Id: I2b713a55fcdf02c01afa99f175bf14248f210460
2014-02-04 11:00:03 -08:00
Scott Main
749120f39b dashbaord update for feb '14
Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2
2014-02-04 10:57:47 -08:00
Glenn Kasten
9d2ad12181 am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '830d4ffcb79fd2a676942a87d9fe661725d745f3':
  Add adb over Wi-Fi
2014-02-04 18:40:09 +00:00
Adam Lesinski
1b5b60d696 am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
  Add support for multiple asset dirs (-A)
2014-02-04 18:36:10 +00:00
Glenn Kasten
830d4ffcb7 am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '74dc4bd09e0dce4855c15cae31dcdd42b05d3532':
  Add adb over Wi-Fi
2014-02-04 18:35:30 +00:00
Glenn Kasten
74dc4bd09e am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '983a9381b87519ddd1c6e12e44a8762dc805894a':
  Add adb over Wi-Fi
2014-02-04 18:32:10 +00:00
Adam Lesinski
203356a34a Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev 2014-02-04 18:31:23 +00:00
Glenn Kasten
983a9381b8 am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '11263b24230a0d5db363d76ad199d692bcff1b35':
  Add adb over Wi-Fi
2014-02-04 18:29:17 +00:00
Glenn Kasten
11263b2423 Merge "Add adb over Wi-Fi" into klp-docs 2014-02-04 18:27:13 +00:00
Ricardo Cervera
7890a755f3 am 2a1fdefe: am 1441acdd: am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs
* commit '2a1fdefe16046860fcaf524af4fc380d850d28bb':
  docs: Added note on multiple build.gradle files. Bug: 12870006
2014-02-04 09:38:33 -08:00
Ricardo Cervera
2a1fdefe16 am 1441acdd: am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs
* commit '1441acdd6d0f08b00493478386e1b74df47e243b':
  docs: Added note on multiple build.gradle files. Bug: 12870006
2014-02-04 17:35:37 +00:00
Ricardo Cervera
1441acdd6d am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs
* commit '6dea46b2e567f614244100f542dce04e44c26bee':
  docs: Added note on multiple build.gradle files. Bug: 12870006
2014-02-04 17:29:40 +00:00
Ricardo Cervera
6dea46b2e5 am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs
* commit 'f7c12817dc700a5e3d9e4dd3de6b1b50688a4129':
  docs: Added note on multiple build.gradle files. Bug: 12870006
2014-02-04 17:26:58 +00:00
Ricardo Cervera
f7c12817dc am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs
* commit 'b180bff575b25ab6b692327a3be244310fd90c5e':
  docs: Added note on multiple build.gradle files. Bug: 12870006
2014-02-04 17:24:28 +00:00
Ricardo Cervera
b180bff575 am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs
* commit 'ccec0906bd358ffa9fbac8f8c882f582c43b6092':
  docs: Added note on multiple build.gradle files. Bug: 12870006
2014-02-04 17:21:18 +00:00
Ricardo Cervera
ccec0906bd Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 2014-02-04 17:18:59 +00:00
Scott Main
10f07bae6c am 80ddc855: remove samples page under tools. redirect in separate cl. bug: 12878293
* commit '80ddc85515abc2da10a5bce16fcf491e0a31522b':
  remove samples page under tools. redirect in separate cl. bug: 12878293
2014-02-04 09:01:59 -08:00
Scott Main
80ddc85515 remove samples page under tools. redirect in separate cl.
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d

Conflicts:
	docs/html/tools/samples/index.jd
2014-02-04 08:57:20 -08:00
Scott Main
2b8d9cd216 am c8f40700: am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293
* commit 'c8f4070018d5b6cf69274b977fff4199b71cbb70':
  remove samples page under tools. redirect in separate cl. bug: 12878293
2014-02-04 07:43:58 -08:00
Scott Main
c8f4070018 am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293
* commit 'e4cf272967d6cbfc8e9e7c5c2756651e306a2755':
  remove samples page under tools. redirect in separate cl. bug: 12878293
2014-02-04 15:39:46 +00:00
Alan Viverette
342675df4d am 8eea3ea5: Add APIs for obtaining themed Drawable from Theme, Context
* commit '8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3':
  Add APIs for obtaining themed Drawable from Theme, Context
2014-02-03 19:04:27 -08:00
Alan Viverette
8eea3ea559 Add APIs for obtaining themed Drawable from Theme, Context
BUG: 12611005
Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016
2014-02-03 18:42:24 -08:00
Scott Main
e4cf272967 am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293
* commit '5ae21db11291cca5ea6fe9f8b2b772deca438e5b':
  remove samples page under tools. redirect in separate cl. bug: 12878293
2014-02-04 02:11:48 +00:00
Alan Viverette
a8b2edec93 Clean up RotateDrawable, add getters and setters for XML properties
Change-Id: I1bb174e981fb6df910fee3a9d596c0249282928c
2014-02-03 18:08:34 -08:00
Scott Main
5ae21db112 am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293
* commit 'a7f84f3bd4582ce2124891db14fbc2ac52548cf8':
  remove samples page under tools. redirect in separate cl. bug: 12878293
2014-02-04 02:08:28 +00:00
Scott Main
a7f84f3bd4 am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293
* commit '28a828fa198122a13d053eae2e46f18487818e91':
  remove samples page under tools. redirect in separate cl. bug: 12878293
2014-02-04 02:06:01 +00:00
Ruben Brunk
5cb46b3c8a am 8cff1a37: Merge "camera3: Update awbRegions tag."
* commit '8cff1a370e8d89c0a977b82cd8730ab791866808':
  camera3: Update awbRegions tag.
2014-02-03 18:01:40 -08:00
Scott Main
28a828fa19 am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293
* commit '56783a742458968a6ec5daf4d9e7a72f755f5ce5':
  remove samples page under tools. redirect in separate cl. bug: 12878293
2014-02-04 02:01:33 +00:00
Ruben Brunk
90bc34e5bf camera3: Update maxRegions tag.
Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
2014-02-03 17:54:24 -08:00
Ruben Brunk
8cff1a370e Merge "camera3: Update awbRegions tag." 2014-02-04 01:18:08 +00:00
Ruben Brunk
f59521d3b1 camera3: Update awbRegions tag.
Change-Id: I85053b61fae4e360eff9143afc021ad60971f3b6
2014-02-03 17:14:33 -08:00
Ricardo Cervera
641fc0f751 docs: Added note on multiple build.gradle files. Bug: 12870006
Change-Id: I44b5152dc753893d3b9f0a0441066a530e5a30f0
Review: http://quixote.mtv.corp.google.com:8006/google/play-services/setup.html
2014-02-03 17:08:31 -08:00
Scott Main
56783a7424 remove samples page under tools. redirect in separate cl.
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d
2014-02-03 17:07:27 -08:00
Glenn Kasten
77c86261ee Add adb over Wi-Fi
Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941
2014-02-03 16:49:34 -08:00