GitLab

Change-Id: I6feefba15eb1562161e38df03223cb2fba4eb7ee
Signed-off-by: Dima Zavin <dima@android.com>

(Cherry-pick from donut.)

Delete the old recovery-from-boot patch before patching system files,
then install the new one at the end of the process.  Also fix an issue
with applypatch returning the wrong status.

Change-Id: I614fce39f307eded696ba792912b863f9fb0580b

If LOCAL_SDK_VERSION is current, link against the stub, otherwise
link against prebuilt historical sdk

which otherwise remains stale in system/app and eventually causes problems.

	Alas, poor AlarmClock! I knew, him, Froyo: a fellow
	of infinite alarm, of most excellent punctuality: he hath
	warned me of a meeting a thousand times, and now, how
	abhorred in my build it is! My Droid rings at
	it. Here hung those beeps that I have snoozed I know
	not how oft. Where be your chimes now? Your
	roosters? Your songs? Your flashes of alert,
	that were wont to set the table on a buzz? Not one
	now, to post your own notification? Quite ongoing?

This change allows modules to insert different include paths before the system
include paths. STLPort uses this to find system include files that have the same
name.

Change-Id: Ieafbf2596252ee3a2fe5d1ad433e8863fbf84601

The Dalvik core libraries team would like to start making warnings
errors in certain packages by definition LOCAL_JAVACFLAGS. This will
allow easier debuging of warnings in other packages by supplying
"-Xlint:..."  options.

Merge "revise script and styles for the expandable widget in the dev guide side nav to allow nested toggle lists. This is necessary for the new resources docs that have an expandable list nested in an expandable list."

guide side nav to allow nested toggle lists. This is necessary
for the new resources docs that have an expandable list nested
in an expandable list.

Merge commit 'f925cb32'

* commit 'f925cb32': (198 commits)
  android-2.1_r1 snapshot
  ERD79
  ERD78
  ERD77D
  ERD77C
  ERD77B
  ERD77
  ERD76
  ERD75
  ERD72
  ERD71F
  ERD71E
  ERD71D
  ERD71C
  ERD71B
  ERD71
  ERD70B
  ERD70
  ERD69
  ERD68B
  ...

This lets you use the source code from one apk to build a new one
with a new module name, a new android package name and optionally,
a new certificate.

To use this, in a makefile, add this:

$(call inherit-package, \
    packages/apps/Music/Android.mk, \
    Music, \
    MusicFork, \
    my_cert, \
    com.example.music)

You don't need the LOCAL_PATH and CLEAR_VARS stuff.  It will override
only the packages that are defined in the makefile name you give, but
if other modules of other types are defined, you will get an error
saying that it's defined twice.  In that case, you need to move the
duplicate library (for example a .so) out into a different makefile.

A LOCAL_OVERRIDES_PACKAGES entry is automatically created for the
forked app.

Merge commit '97233468' into eclair-plus-aosp

* commit '97233468': (198 commits)
  android-2.1_r1 snapshot
  ERD79
  ERD78
  ERD77D
  ERD77C
  ERD77B
  ERD77
  ERD76
  ERD75
  ERD72
  ERD71F
  ERD71E
  ERD71D
  ERD71C
  ERD71B
  ERD71
  ERD70B
  ERD70
  ERD69
  ERD68B
  ...

Three unrelated changes:

- change the add-radio-file makefile function to support adding files
  with paths.  (The path part of the pathname is stripped off.)

- add an UnmountAll function to the OTA script generation code, so
  that we can explicitly unmount everything we've mounted (in addition
  to doing it automatically at the end of the script).

- add the updater API version to the info object passed to
  device-specific code.

Change-Id: Ia62b15403c1cc8fce8d9910f291450c8077e49f4

Change-Id: Icb4c7e1bb2dfa4df71f07cb022c92e95a9115019

Needed because AndroidTests.java has been removed.

Merge commit '20d93db1'

* commit '20d93db1':
  retry patch using cache if in-place write fails

Merge commit 'cdb621bf' into eclair-plus-aosp

* commit 'cdb621bf':
  retry patch using cache if in-place write fails

[cherry-pick from donut branch]

Instead of failing outright when yaffs lies about how much space is
free on the filesystem, delete the partially-written output file and
retry using the copy-source-to-cache method instead.

Change all the log statements to printf; mixing stdout and stderr
logging just makes the logs hard to read because they're buffered
differently.

Change-Id: Iebca77f2f710ee4c15bf7089647f8d79fe79f33a

Merge commit 'ffae6f51'

* commit 'ffae6f51':
  Update version string.

am 5729dbfa: am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair

Merge commit '5729dbfa'

* commit '5729dbfa':
  docs: accept the enter key on key-down, rather than key-up,

Merge commit 'ccd0338c'

* commit 'ccd0338c':
  Fix windows make: layoutlib_api moved to sdk.git too.

Merge commit '262e8214'

* commit '262e8214':
  doc change: add announce for developer lab at mwc.

related-to-bug: 2395398