OSDN Git Service
Dianne Hackborn [Tue, 7 Feb 2012 21:48:38 +0000 (13:48 -0800)]
am
dc210ade: Merge "Return information about whether overlays are disabled."
* commit '
dc210ade0ad4770c5294320453f8ddfbfcbaf943':
Return information about whether overlays are disabled.
Dianne Hackborn [Tue, 7 Feb 2012 21:48:35 +0000 (13:48 -0800)]
am
424a69d5: Merge "Only generate private symbols that are needed."
* commit '
424a69d502db85ffaecf9cad00321b677616a9c5':
Only generate private symbols that are needed.
Dianne Hackborn [Tue, 7 Feb 2012 21:46:46 +0000 (13:46 -0800)]
Merge "Return information about whether overlays are disabled."
Dianne Hackborn [Tue, 7 Feb 2012 21:46:28 +0000 (13:46 -0800)]
Merge "Only generate private symbols that are needed."
Svetoslav Ganov [Tue, 7 Feb 2012 20:09:28 +0000 (12:09 -0800)]
am
d36ad9b1: Merge "Adding a method for retching the root node in UiTestAutomationBridge"
* commit '
d36ad9b1ff99675dd0eca6a3fda1f52353f451a4':
Adding a method for retching the root node in UiTestAutomationBridge
Svetoslav Ganov [Tue, 7 Feb 2012 20:07:23 +0000 (12:07 -0800)]
Merge "Adding a method for retching the root node in UiTestAutomationBridge"
Jeff Sharkey [Tue, 7 Feb 2012 18:47:22 +0000 (10:47 -0800)]
am
e7171eff: Merge "List rotated netstats files during --checkin dump."
* commit '
e7171effdf9ef0700782520187c0a292b0a74759':
List rotated netstats files during --checkin dump.
Jeff Sharkey [Tue, 7 Feb 2012 18:45:41 +0000 (10:45 -0800)]
Merge "List rotated netstats files during --checkin dump."
Andreas Huber [Tue, 7 Feb 2012 18:45:06 +0000 (10:45 -0800)]
am
8320e70f: Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
* commit '
8320e70fbee26dc72a23aaad498f57e2252cc7c8':
MatroskaExtractor: to support MPEG4 and MP3 codec.
Andreas Huber [Tue, 7 Feb 2012 18:43:08 +0000 (10:43 -0800)]
Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
The Android Open Source Project [Tue, 7 Feb 2012 18:25:11 +0000 (10:25 -0800)]
The Android Open Source Project [Tue, 7 Feb 2012 18:23:12 +0000 (10:23 -0800)]
The Android Open Source Project [Tue, 7 Feb 2012 18:21:31 +0000 (10:21 -0800)]
am
1bd8111b: Reconcile with ics-mr1-release
* commit '
1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
The Android Open Source Project [Tue, 7 Feb 2012 18:18:32 +0000 (10:18 -0800)]
Reconcile with ics-mr1-release
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
The Android Open Source Project [Tue, 7 Feb 2012 18:15:33 +0000 (10:15 -0800)]
am
067af269: am
01383571: am
07bebe8b: Reconcile with ics-mr1-release
* commit '
067af269edf76260e1b0b07ea46896299d5f01ec':
Don't use SNR in the invalid check.
The Android Open Source Project [Tue, 7 Feb 2012 18:12:59 +0000 (10:12 -0800)]
am
01383571: am
07bebe8b: Reconcile with ics-mr1-release
* commit '
0138357198244b5bda242e248ed98040622ea5af':
Don't use SNR in the invalid check.
The Android Open Source Project [Tue, 7 Feb 2012 18:11:11 +0000 (10:11 -0800)]
am
07bebe8b: Reconcile with ics-mr1-release
* commit '
07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
Don't use SNR in the invalid check.
The Android Open Source Project [Tue, 7 Feb 2012 18:09:07 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
Marco Nelissen [Tue, 7 Feb 2012 16:30:22 +0000 (08:30 -0800)]
am
f047c14f: Merge "Make media scanner use new delete-parameter"
* commit '
f047c14f23abd94b3fb04f56dded13b66236ca53':
Make media scanner use new delete-parameter
Marco Nelissen [Tue, 7 Feb 2012 16:28:02 +0000 (08:28 -0800)]
Merge "Make media scanner use new delete-parameter"
Dianne Hackborn [Tue, 7 Feb 2012 05:21:05 +0000 (21:21 -0800)]
Return information about whether overlays are disabled.
Change-Id: I85ae42e9f28461f5142cc6b3c8e25ff3f195805a
Chih-Chung Chang [Tue, 7 Feb 2012 05:13:42 +0000 (21:13 -0800)]
am
fb2cfa22: Comment out a warning message to avoid log spamming.
* commit '
fb2cfa223b47db3ee46df22dcdb92f4fb013dcdd':
Comment out a warning message to avoid log spamming.
Mathias Agopian [Tue, 7 Feb 2012 03:20:42 +0000 (19:20 -0800)]
am
f0533365: Merge "make sure to ignore SIGPIPE in the write side of BitTube"
* commit '
f0533365dc1c89253a551a77fbc987568bb8e650':
make sure to ignore SIGPIPE in the write side of BitTube
Mathias Agopian [Tue, 7 Feb 2012 03:18:57 +0000 (19:18 -0800)]
Merge "make sure to ignore SIGPIPE in the write side of BitTube"
Mathias Agopian [Tue, 7 Feb 2012 03:10:04 +0000 (19:10 -0800)]
make sure to ignore SIGPIPE in the write side of BitTube
Change-Id: If4f037f4403d3ecbcd5f91248354765fc0fa13cb
Alex Sakhartchouk [Tue, 7 Feb 2012 03:16:33 +0000 (19:16 -0800)]
Merge "Streamlining texture creation. Adding render target textureas. Adding texture params for shaders. Making it easier to bind root script." into graphics-dev
Alex Sakhartchouk [Tue, 7 Feb 2012 03:15:20 +0000 (19:15 -0800)]
Merge "Fixes to simplify programmatic creation." into graphics-dev
Xavier Ducrohet [Tue, 7 Feb 2012 02:09:43 +0000 (18:09 -0800)]
am
0c34c14a: Merge "Fix a setBackgroundDrawable in layoutlib."
* commit '
0c34c14a17af0e90086f674f6a4d510673e250c8':
Fix a setBackgroundDrawable in layoutlib.
Xavier Ducrohet [Tue, 7 Feb 2012 02:07:21 +0000 (18:07 -0800)]
Merge "Fix a setBackgroundDrawable in layoutlib."
Fabrice Di Meglio [Tue, 7 Feb 2012 01:25:20 +0000 (17:25 -0800)]
am
61241256: Merge "Fix bug #
5968466 system running out of memory during WebView performance test"
* commit '
61241256985d72cd4ff7673eea275aacb82d6cf9':
Fix bug #
5968466 system running out of memory during WebView performance test
Fabrice Di Meglio [Tue, 7 Feb 2012 01:23:13 +0000 (17:23 -0800)]
am
f531a800: Merge "Update BiDiTest app for adding GridLayout unit tests"
* commit '
f531a800754d6af5c04ee50f15db1ceb00897bb1':
Update BiDiTest app for adding GridLayout unit tests
Fabrice Di Meglio [Tue, 7 Feb 2012 01:22:06 +0000 (17:22 -0800)]
Merge "Fix bug #
5968466 system running out of memory during WebView performance test"
Fabrice Di Meglio [Tue, 7 Feb 2012 01:21:40 +0000 (17:21 -0800)]
Merge "Update BiDiTest app for adding GridLayout unit tests"
John Wang [Tue, 7 Feb 2012 01:09:35 +0000 (17:09 -0800)]
am
c70969ea: am
a0da8adf: am
397d3ffc: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
c70969ea5cf8021635be1fdb5074e4fb3cb928f0':
John Wang [Tue, 7 Feb 2012 01:09:33 +0000 (17:09 -0800)]
am
17cbdd39: am
7e6295b3: am
9ad528d5: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
17cbdd39ea0319ca2d50ab6ee4b5733312417ec6':
Don't use SNR in the invalid check.
Craig Mautner [Tue, 7 Feb 2012 01:07:27 +0000 (17:07 -0800)]
am
a52b6e7b: Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."
* commit '
a52b6e7bcf5ee6e80a4443f19b31a3df0ec4e518':
Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods.
John Wang [Tue, 7 Feb 2012 01:06:18 +0000 (17:06 -0800)]
am
a0da8adf: am
397d3ffc: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
a0da8adf5519d0660d6f0f44e7f91b99d6b741d9':
John Wang [Tue, 7 Feb 2012 01:06:16 +0000 (17:06 -0800)]
am
7e6295b3: am
9ad528d5: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
7e6295b32310afddccf5fb030d4c475ed3678e0f':
Don't use SNR in the invalid check.
Tom Taylor [Tue, 7 Feb 2012 01:05:16 +0000 (17:05 -0800)]
am
429cf48e: Merge "CrespoMMS appears after delay in the thread"
* commit '
429cf48e2c777cc72925955d7943091b3cf3e181':
CrespoMMS appears after delay in the thread
John Wang [Tue, 7 Feb 2012 01:04:42 +0000 (17:04 -0800)]
am
397d3ffc: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
397d3ffcbd27d10b9479e58a46ca6ba70838b697':
Craig Mautner [Tue, 7 Feb 2012 01:04:23 +0000 (17:04 -0800)]
Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."
John Wang [Tue, 7 Feb 2012 01:04:11 +0000 (17:04 -0800)]
am
9ad528d5: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
Don't use SNR in the invalid check.
Tom Taylor [Tue, 7 Feb 2012 01:03:34 +0000 (17:03 -0800)]
Merge "CrespoMMS appears after delay in the thread"
John Wang [Tue, 7 Feb 2012 01:03:15 +0000 (17:03 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:02:30 +0000 (17:02 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:00:49 +0000 (17:00 -0800)]
Merge "Don't use SNR in the invalid check." into ics-mr1
Xavier Ducrohet [Tue, 7 Feb 2012 00:51:04 +0000 (16:51 -0800)]
am
0a599632: am
82a74bbe: (-s ours) am
82fc005f: am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
0a59963287f6a54eaf7ff5110474b02713502f9a':
Xavier Ducrohet [Tue, 7 Feb 2012 00:48:55 +0000 (16:48 -0800)]
am
82a74bbe: (-s ours) am
82fc005f: am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':
Xavier Ducrohet [Tue, 7 Feb 2012 00:48:48 +0000 (16:48 -0800)]
am
e1ce916e: am
c9bcd33a: (-s ours) am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
e1ce916e0029d72ddbf7476efd4993c7301ec784':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:46:46 +0000 (16:46 -0800)]
am
c9bcd33a: (-s ours) am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
c9bcd33afa5c34e0a49955c30aa875ac8205b65f':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:45:21 +0000 (16:45 -0800)]
am
82fc005f: am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
82fc005f579a20b3c7e63603f056ca095c288196':
Xavier Ducrohet [Tue, 7 Feb 2012 00:44:32 +0000 (16:44 -0800)]
am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
b1f95c6a938f6eaaa7a3fd28574a14647178059b':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:56 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:41 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
James Dong [Tue, 7 Feb 2012 00:23:12 +0000 (16:23 -0800)]
am
c10cd4a6: Merge "Don\'t call virtual function in destructor of SurfaceMediaSource"
* commit '
c10cd4a6e3021010786c1dbd69ab4e03ecb689e6':
Don't call virtual function in destructor of SurfaceMediaSource
James Dong [Tue, 7 Feb 2012 00:21:24 +0000 (16:21 -0800)]
Merge "Don't call virtual function in destructor of SurfaceMediaSource"
Xavier Ducrohet [Tue, 7 Feb 2012 00:19:08 +0000 (16:19 -0800)]
am
327c8c2f: Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge."
* commit '
327c8c2fbcfa954b2216de5d627447bec2cd4ea8':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:17:42 +0000 (16:17 -0800)]
Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge."
Xavier Ducrohet [Mon, 6 Feb 2012 23:54:49 +0000 (15:54 -0800)]
am
6c963980: Merge "Setup ActionBars in layoutlib the same way the platform does it."
* commit '
6c9639803ee5829a41048e56f92774752b931b7f':
Setup ActionBars in layoutlib the same way the platform does it.
Xavier Ducrohet [Mon, 6 Feb 2012 23:52:58 +0000 (15:52 -0800)]
Merge "Setup ActionBars in layoutlib the same way the platform does it."
Amith Yamasani [Mon, 6 Feb 2012 23:41:45 +0000 (15:41 -0800)]
am
13c7b822: Merge "Check for null ActivityInfo."
* commit '
13c7b82234c1c76aca74e23d635a69099611b18e':
Check for null ActivityInfo.
Amith Yamasani [Mon, 6 Feb 2012 23:39:40 +0000 (15:39 -0800)]
Merge "Check for null ActivityInfo."
Mangesh Ghiware [Mon, 6 Feb 2012 23:28:15 +0000 (15:28 -0800)]
am
5bd41b29: Merge "Use WebKit hit testing result for centering on double-tap zoom."
* commit '
5bd41b2949fe25e19ba8ec62da7e204403c51061':
Use WebKit hit testing result for centering on double-tap zoom.
Mangesh Ghiware [Mon, 6 Feb 2012 23:27:08 +0000 (15:27 -0800)]
Merge "Use WebKit hit testing result for centering on double-tap zoom."
Scott Main [Mon, 6 Feb 2012 22:48:10 +0000 (14:48 -0800)]
am
cb6831d7: am
f9bb376b: am
afaec576: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
cb6831d7b6b9f5ef940e79e5dddc022f35d4b4c7':
Scott Main [Mon, 6 Feb 2012 22:48:07 +0000 (14:48 -0800)]
am
053e0d14: am
dbee29ba: am
5a0fe6fc: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
053e0d14bb0cffcd593860bdda341b928e45ea2a':
docs: switch from caps to initial-case for device button names
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:48:05 +0000 (14:48 -0800)]
am
0a3f6d69: am
33476f7a: am
f79bcd2d: am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
0a3f6d69b6e5242d5eaca6ede801eaabbff56cfd':
Skia API changes as a result of an update to the Skia library.
Scott Main [Mon, 6 Feb 2012 22:45:41 +0000 (14:45 -0800)]
am
f9bb376b: am
afaec576: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
f9bb376bd7bfb6bdc77e1621a340122c29afd21c':
Scott Main [Mon, 6 Feb 2012 22:45:39 +0000 (14:45 -0800)]
am
dbee29ba: am
5a0fe6fc: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
dbee29ba559a0c16919b5977ed4972481b0a98ec':
docs: switch from caps to initial-case for device button names
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:45:36 +0000 (14:45 -0800)]
am
33476f7a: am
f79bcd2d: am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
33476f7ad1c3b4dcaefddb306f315e201c4efb33':
Skia API changes as a result of an update to the Skia library.
Scott Main [Mon, 6 Feb 2012 22:15:06 +0000 (14:15 -0800)]
am
afaec576: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
afaec57668551b797505f43d9d9677979dedf0c9':
Scott Main [Mon, 6 Feb 2012 22:14:09 +0000 (14:14 -0800)]
am
5a0fe6fc: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
docs: switch from caps to initial-case for device button names
Scott Main [Mon, 6 Feb 2012 22:12:39 +0000 (14:12 -0800)]
am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:12:05 +0000 (14:12 -0800)]
am
f79bcd2d: am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
f79bcd2dd5d82376640661f50aa2e9237af7c02c':
Skia API changes as a result of an update to the Skia library.
Scott Main [Mon, 6 Feb 2012 22:12:03 +0000 (14:12 -0800)]
am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
Scott Main [Mon, 6 Feb 2012 22:10:16 +0000 (14:10 -0800)]
Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:09:36 +0000 (14:09 -0800)]
am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
52da99fac85d1e16a3c95bdd9c039801e920e6d1':
Skia API changes as a result of an update to the Skia library.
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:07:31 +0000 (14:07 -0800)]
am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
Skia API changes as a result of an update to the Skia library.
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:01:05 +0000 (14:01 -0800)]
Merge "Skia API changes as a result of an update to the Skia library."
Scott Main [Mon, 6 Feb 2012 21:11:03 +0000 (13:11 -0800)]
am
e75abda2: am
6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
e75abda25a4a638599b36ba8dc21fe4ddefd61ab':
Scott Main [Mon, 6 Feb 2012 21:10:58 +0000 (13:10 -0800)]
am
6d41c9a9: am
584156ad: am
8e399408: am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
6d41c9a96e085eed31ab8d689e6ca6f01e5e03b2':
docs: add Sony USB VID issue
5967572
Xavier Ducrohet [Mon, 6 Feb 2012 21:10:56 +0000 (13:10 -0800)]
Scott Main [Mon, 6 Feb 2012 21:09:08 +0000 (13:09 -0800)]
am
6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
6f2f42d52a23de0bd639d5e4957331118ccc47b8':
Scott Main [Mon, 6 Feb 2012 21:09:06 +0000 (13:09 -0800)]
am
584156ad: am
8e399408: am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
584156ad29ec3b62a403ac692b16025c652b984c':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:07:24 +0000 (13:07 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Scott Main [Mon, 6 Feb 2012 21:07:21 +0000 (13:07 -0800)]
am
8e399408: am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
8e399408724f3d18d48d13194e05a80108216fed':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:07:04 +0000 (13:07 -0800)]
am
0654994b: am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
0654994b9e546c50d84b3a9909f190220df65497':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:05:28 +0000 (13:05 -0800)]
am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:05:04 +0000 (13:05 -0800)]
am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:03:16 +0000 (13:03 -0800)]
Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
Xavier Ducrohet [Mon, 6 Feb 2012 19:47:30 +0000 (11:47 -0800)]
am
30ca4b52: am
3d4db0dc: am
c205a9d6: am
f8aea993: Make aapt ignore tools-related data.
* commit '
30ca4b526902fa5ecb556b14efce42890affc552':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:46:49 +0000 (11:46 -0800)]
am
9485ca87: am
b54f371c: am
f8aea993: Make aapt ignore tools-related data.
* commit '
9485ca87edd819e3106a4b8c3d08f1ab73adf818':
Xavier Ducrohet [Mon, 6 Feb 2012 19:44:43 +0000 (11:44 -0800)]
am
3d4db0dc: am
c205a9d6: am
f8aea993: Make aapt ignore tools-related data.
* commit '
3d4db0dc1803252b924076f7d10d8e806af71824':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:44:19 +0000 (11:44 -0800)]
am
b54f371c: am
f8aea993: Make aapt ignore tools-related data.
* commit '
b54f371cc4cfd32acf0fec35885a1da64accec9e':
Xavier Ducrohet [Mon, 6 Feb 2012 19:42:50 +0000 (11:42 -0800)]
am
c205a9d6: am
f8aea993: Make aapt ignore tools-related data.
* commit '
c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:56 +0000 (11:41 -0800)]
am
f8aea993: Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:04 +0000 (11:41 -0800)]
am
f8aea993: Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:00:12 +0000 (11:00 -0800)]
am
75ef7bea: Merge "Add some lint control for the frameworks."
* commit '
75ef7bea320f06ece5e405ec4f373c1dde7b0dab':
Add some lint control for the frameworks.
Xavier Ducrohet [Mon, 6 Feb 2012 19:00:09 +0000 (11:00 -0800)]
am
edc3c653: Merge "Make aapt ignore tools-related data."
* commit '
edc3c653875bcda60457f42b96876365ffce9bff':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 18:57:50 +0000 (10:57 -0800)]
Merge "Add some lint control for the frameworks."