Merge commit '2223e3c2706a0c77b12a4526c78ce1611a641605'
* commit '2223e3c2706a0c77b12a4526c78ce1611a641605':
Remove tcpdump from the old location (it's now in system/xbin)
Merge commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5'
* commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5':
Print the platform version and version codename in the big build header.
Merge commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55'
* commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55':
AI 148870: Pinging Ryan for Dr No approval.
Merge commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d' into donut
* commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d':
AI 148870: Pinging Ryan for Dr No approval.
---
Cloned from CL 147240 by 'g4 patch'.
Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50.
"Making PDK work in SDK environment."
This CL should be pretty straight forward and should be touching only PDK
related templates, etc. Turns out we no longer need to touch the highlightNav
code.
Automated import of CL 148870
Merge commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c'
* commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c':
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
Merge commit '9b54792d7044125126a9765d1baf3ff0e59efcb4' into donut
* commit '9b54792d7044125126a9765d1baf3ff0e59efcb4':
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
add vertical padding to quickview list items so that items are distinguishable when the text wraps-around the line
BUG=1790235
Automated import of CL 148820
Merge commit '3de1fe627073608270f844714f24ed83ed4266db'
* commit '3de1fe627073608270f844714f24ed83ed4266db':
Fix makefile to be compatible with findbugs v 1.3.8
Merge commit '233728de06f3ce711c0be94d5a3427bc007674a3'
* commit '233728de06f3ce711c0be94d5a3427bc007674a3':
AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Merge commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45' into donut
* commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45':
AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Before CL 148645, 'startcts' called the 'cts' script. This is no longer the
case, so we want to exclude the 'cts' script from the distribution to avoid
confusion. The 'cts' script is only used when running cts directly on a
fully built source tree.
Automated import of CL 148675
Merge commit 'e27db38fdd6b29ae470a7d296a4de07002f23acb'
* commit 'e27db38fdd6b29ae470a7d296a4de07002f23acb':
allow separate source and target files for applypatch
Allow applypatch to use different filenames for the source and target.
(Using the same filename is still fine; in fact the target filename
can be specified as "-" to mean "same as the source file.) This will
allow us to still use diffs in the case of files being renamed, and
will allow us to use diffs for the boot and recovery images.
Merge commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5'
* commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5':
Add new property for dev codename, update version to Donut.
Merge commit '6ea3b8856d656752c0310ca237ed99e7451be83b'
* commit '6ea3b8856d656752c0310ca237ed99e7451be83b':
core: Recovery image should have the custom kernel base as well.
Merge commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec'
* commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec':
core: Allow the board config to specify the kernel base address for mkbootimg
Merge commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0'
* commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0':
AI 148430: Adding a new CTS test runner that is basically
Merge commit '6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut
* commit '6178820340ccca2656fab0953bbe77da2e3e4bb7':
AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
and is built and installed as part of the CTS.
This makes sure we always have the correct test
runner on a device, so we should see the various
improvements also on off-the-shelf Cupcake phones.
BUG=1537738
Automated import of CL 148430
Merge commit 'a3896fbc15d32881d87e1ae8b7c6e2e7523008c7'
* commit 'a3896fbc15d32881d87e1ae8b7c6e2e7523008c7':
Change runtest env shortcut to point to runtest.py
Merge commit '40a06d89406a3e928a5e0d41a3077f59d8f5345d' into donut
* commit '40a06d89406a3e928a5e0d41a3077f59d8f5345d':
AI 148314: Remove droiddoc code that applies the deprecated state of superclasses to subclasses. This change was originally made in Gerrit 7655. https://review.source.android.com/Gerrit#change,7655
