Merge commit 'eb338efd2eae20962c7ca75baf161be540b3d664'
* commit 'eb338efd2eae20962c7ca75baf161be540b3d664':
make sure package keys are consistent with shared users
All APKs that want to share a given user id must be signed with the
same key. Look inside each APK for what (if any) shared user id it
requests, and error out if any with the same shared user are being
signed with different keys.
Merge commit '87fc0fdc53b5998a36e0a305518525c28db7f35f'
* commit '87fc0fdc53b5998a36e0a305518525c28db7f35f':
add -e option to add extra commands to OTA script
This is needed to move our modified SDL sources under external/qemu/distrib.
As per joeo's request, this change also enables target Objective-C compilation, letting it error at build time.
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.
Robert Greenwalt
Jean-Michel Trivi
Gaurav Mathur
Android (Google) Code Review
Mike Lockwood
Doug Zongker
David 'Digit' Turner
Mathias Agopian
Patrick Scott
The Android Open Source Project
Dianne Hackborn
Ed Heyl
Dan Egnor
Joe Onorato
Gaurav Mathur
Doug Kwan
Andrew Stadler
Wei Huang