Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
Merge "Restore AOSP-style version numbers - DO NOT MERGE"
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64

Change-Id: Ia856159017f6228dbfd5a7100e3731b82e6e8fe4
Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
make primary landing button dark red

Change-Id: I2d515991ccdca79a28ee1ebe7706e8fbc3afc57e
reverse the blue button hover state color

Change-Id: Ib3b8abcd9683eda3b9a69f0c0ba1d53228191540
Make default 64-bit primary, 32-bit secondary

This is required to get aarch64 & x86_64 emulators booting
on lmp-preview-dev. Without this change, the system_server
is a 32 bit process but java only apps that use the
"android.uid.system" shared UID are dex2oated to 64 bit and
won't work correctly.

The correct fix needs build system changes, so this is the
easiest fix for now.

Note that this happens to work on volantis because the package
manager adjusts their ABI correctly during boot. That can't
happen on emulators because of dex-preopt; dex2oat can't oatify
a dex file from inside an existing oat file.

(cherry picked from commit d79504631926bbdd1bdc721e8824fcb8a9952f54)

Change-Id: Id94bcc382e90b279e726f2d1d0350fc60a5020df
SDK targets should inherit from core_64_bit.mk

bug: 15661143

(cherry picked from commit e78ba32d23dd3a1f3df1b861b1b17fced45801b0)

Change-Id: Icf9d0a7d429f848ca6163a8658c6e5f208fdd039
Fix issue in symlinking 64 bit executables.

We were not inspecting the value of TARGET_SUPPORTS_{32,64}_BIT_APPS
so we'd sometimes create the wrong symlink if TARGET_IS_64_BIT was
true.

bug: 15661143

(cherry picked from commit 79bc52af37dd796f0588a03dc317d46b461b8e5d)

Change-Id: I736a7fa3986d6594293851a5f946c37e67d5a5a4
fix vertical spacing following collection

Change-Id: I50ec016d646a8fd92cf1f85a844cb6f3bf96cf79
am 85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"

* commit '85fe14395b8bbc5b44383c1705f60bfdc12c61cf':
  Restore AOSP-style version numbers - DO NOT MERGE
Merge "Make default 64-bit primary, 32-bit secondary" into lmp-preview-dev
am e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"

* commit 'e0be9135a249ee5d60c6b897e7d538b1afb94b29':
  Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Merge " delete duplicate variable definition"
new android logo for preview docs header

Change-Id: I80a35bcbdb55c50a445e061212e32ed2361f983c
Merge "new android logo for preview docs header" into klp-modular-dev
Updated gdbclient path support.

Now gdbclient accepts a fully qualified pathname for EXEs, which it will
not modify, or a relative pathname, to which it will prefix
"/system/bin".  As an example, each of the following now works.

Fully qualified:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient /system/bin/ping :5039 /system/bin/ping

Relative:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient ping :5039 /system/bin/ping

Change-Id: I1e4c9fca64c4fbc52c255271cc7f83f35c258509
Merge "Updated gdbclient path support."
am cda1a9a7: add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue

* commit 'cda1a9a756cbe694fda94687eccf64fdabb8c775':
  add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
am baf5b60b: make primary landing button dark red

* commit 'baf5b60b1242710867878b350595cb98a9511b61':
  make primary landing button dark red