OSDN Git Service

android-x86/build.git
8 years agokernel.mk: split wl driver rules into another makefile kitkat-x86
Chih-Wei Huang [Tue, 12 Jan 2016 10:06:26 +0000 (18:06 +0800)]
kernel.mk: split wl driver rules into another makefile

Two purposes for this change:

* Centralize the wl related files into the wl subdirectory
* Can simply ignore wl driver on porting new kernel

8 years agokernel.mk: update the broadcom-sta hybrid driver version android-x86-4.4-r3
Chih-Wei Huang [Wed, 10 Jun 2015 16:21:07 +0000 (00:21 +0800)]
kernel.mk: update the broadcom-sta hybrid driver version

8 years agoFix acp not being available when running kernel task
dhacker29 [Sat, 9 May 2015 21:18:57 +0000 (17:18 -0400)]
Fix acp not being available when running kernel task

make[1]: Leaving directory `/android/mydroid-aod/kernel'
/bin/bash: out/host/linux-x86/bin/acp: No such file or directory

Change-Id: I0fc45a3c295eebae6db63dcffaf85ae0080e3260

8 years agokernel.mk: make the dir before creating the .config
Chih-Wei Huang [Thu, 7 May 2015 01:38:56 +0000 (09:38 +0800)]
kernel.mk: make the dir before creating the .config

8 years agokernel.mk: allow to specify a diffconfig
Chih-Wei Huang [Fri, 1 May 2015 14:25:57 +0000 (22:25 +0800)]
kernel.mk: allow to specify a diffconfig

A target can use TARGET_KERNEL_DIFFCONFIG to add
differential configs to the kernel defconfig.

9 years agoAdd dependency of import_includes on LOCAL_MODULE_MAKEFILE
Ying Wang [Thu, 22 Jan 2015 23:44:04 +0000 (15:44 -0800)]
Add dependency of import_includes on LOCAL_MODULE_MAKEFILE

So the build system regenerates import_includes when you modify
Android.mk to add a new dependency library.

Change-Id: Ic92b097b659bb68a9065e1d66da59e0dc7e2836a

9 years agoandroid-x86: remove audio.primary.default
Chih-Wei Huang [Wed, 21 Jan 2015 04:27:35 +0000 (12:27 +0800)]
android-x86: remove audio.primary.default

We don't need the dummy hal.

9 years agoRevert "Add the default local_time hal implementation to builds."
Chih-Wei Huang [Wed, 21 Jan 2015 04:26:03 +0000 (12:26 +0800)]
Revert "Add the default local_time hal implementation to builds."

Remove duplicate local_time.default.

This reverts commit a09c24db71ec4babd0e4db36ffdd180b2fcc6f7a.

Change-Id: Ic96d42235c14588d454e92a57b3bb9e74688fd99

9 years agoandroid-x86: add kernel building rules android-x86-4.4-r2
Chih-Wei Huang [Tue, 14 Oct 2014 15:56:59 +0000 (23:56 +0800)]
android-x86: add kernel building rules

9 years agocore: support make 4.00
synergydev [Wed, 16 Oct 2013 17:36:32 +0000 (10:36 -0700)]
core: support make 4.00

Make 4.00 is now out, and builds work fine with it.

Change-Id: I49e36d651a7997a52270badb0e8badd975f64e8f

9 years agoDo not stash BOARD_SYSTEMIMAGE_PARTITION_SIZE
Chih-Wei Huang [Tue, 20 May 2014 09:08:36 +0000 (17:08 +0800)]
Do not stash BOARD_SYSTEMIMAGE_PARTITION_SIZE

It's calculated later in our mkuserimg.sh.

9 years agomulti_prebuilt: allow to set LOCAL_MODULE_PATH
Chih-Wei Huang [Tue, 22 Oct 2013 01:52:10 +0000 (09:52 +0800)]
multi_prebuilt: allow to set LOCAL_MODULE_PATH

Change-Id: I29554d592e0d287cf3a888595e65cb9582606fe5

9 years agoRemove the hacks needed to support ash and mksh concurrently.
Elliott Hughes [Tue, 5 Nov 2013 19:13:49 +0000 (11:13 -0800)]
Remove the hacks needed to support ash and mksh concurrently.

We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.

Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d

9 years agoRemove shell_ash; ash is but ashes.
Elliott Hughes [Tue, 5 Nov 2013 17:05:50 +0000 (09:05 -0800)]
Remove shell_ash; ash is but ashes.

Change-Id: I88040e39c51986b14e3a764e7bb9e2c8c05ed86b

9 years agobuild: Allow building with OpenJDK
Steve Kondik [Fri, 26 Jul 2013 04:32:08 +0000 (21:32 -0700)]
build: Allow building with OpenJDK

Change-Id: I6348bc1187240729f75f50d7ef91802c68e7788b

9 years agoSome changes added to compile and run with Java 6 and Java 7.
Jerome Pilliet [Mon, 17 Dec 2012 10:12:50 +0000 (11:12 +0100)]
Some changes added to compile and run with Java 6 and Java 7.

  - correction of errors with Javac 6:
    - target 1.5 and source empty.
  - correction of errors with Javadoc 7:
    - strange behavior when duplicate classes are given.

Change-Id: Ib814ede143f7799ef18e0fb1b733547519b8b0e5

9 years agox86: strip all unneeded symbols for a userdebug build
Chih-Wei Huang [Fri, 23 Aug 2013 08:37:28 +0000 (16:37 +0800)]
x86: strip all unneeded symbols for a userdebug build

9 years agorefactor private->prebuilt machinery
Brian Harring [Sun, 8 May 2011 07:03:11 +0000 (00:03 -0700)]
refactor private->prebuilt machinery

Author: Brian Harring <brian.harring@intel.com>
Author: Alin Dobre <alin.m.dobre@intel.com>

New form basically extracts all relevant ABS metadata so that
the prebuilt form can use it; intention is to make the prebuilt
form basically a full drop in for the private form without any
manual intervention required.

Adds two templates; $(BUILD_PREBUILT_BUNDLE_CREATE) and
$(BUILD_PREBUILT_BUNDLE).

For creation, three vars influence it; PREBUILT_PROJECT
(grouping of modules), PREBUILT_MODULES (list of modules to scan
and convert to prebuilts), and PREBUILT_INSTALL_DIR (optional
subdirectory where prebuilt outputs should be placed); output is
written to for each PREBUILT_MODULES word, the module is written to
$(OUT_DIR)/prebuilt/$(PREBUILT_PROJECT)/$(CUSTOM_BOARD)/$(THE-MODULE).
W/in PREBUILT/$(PREBUILT_PROJECT), a usable Android.mk is generated that
uses the bundle machinery; basically is intended to handle it all.

For the bundle usage side, it's basically automatic; needs LOCAL_PATH to
know where to scan for bundles; it honors BUNDLE_TARGETS if specified-
this is the list of bundles to expose to ABS.  If unspecified, it scans
the directory and autoidentifies the bundles available.

Current limitations:
- doesn't handle modules that have multiple INSTALLED files; there is only
one the author is aware of that is valid.
- machinery on bundle side is ready for host, but creation side doesn't
yet fully identify if it's a host target or not, thus can't yet handle host.
- can handle LOCAL_COPY_HEADERS but not individual headers set
specified by BUILD_COPY_HEADERS

Change-Id: Id85660dada7d7ca218221f536515d8ac3e9729bc

9 years agoandroid-x86: do not build the emulator forcibly
Chih-Wei Huang [Mon, 19 Nov 2012 17:26:39 +0000 (01:26 +0800)]
android-x86: do not build the emulator forcibly

If a target wants to build the emulator, it should set
in its BoardConfig.mk.

9 years agoandroid-x86: fix a build break
Chih-Wei Huang [Mon, 19 Nov 2012 17:25:39 +0000 (01:25 +0800)]
android-x86: fix a build break

Use COPYING from our kernel tree.

9 years agostrip all but the needed symbols when building a "user" build
Stefan Seidel [Fri, 16 Mar 2012 11:15:32 +0000 (12:15 +0100)]
strip all but the needed symbols when building a "user" build

9 years agoandroid-x86: add kernel modules.dep to $(INTERNAL_SYSTEMIMAGE_FILES)
Chih-Wei Huang [Sun, 20 Nov 2011 07:40:46 +0000 (15:40 +0800)]
android-x86: add kernel modules.dep to $(INTERNAL_SYSTEMIMAGE_FILES)

9 years agoandroid-x86: add rules to generate system.sfs
Chih-Wei Huang [Wed, 16 Mar 2011 02:37:30 +0000 (10:37 +0800)]
android-x86: add rules to generate system.sfs

9 years agoKTU84Q
The Android Automerger [Fri, 27 Jun 2014 17:14:03 +0000 (10:14 -0700)]
KTU84Q

9 years ago"KTU84P"
The Android Automerger [Fri, 13 Jun 2014 06:17:10 +0000 (23:17 -0700)]
"KTU84P"

9 years agoMR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
Bart Sears [Fri, 6 Jun 2014 20:34:42 +0000 (13:34 -0700)]
MR2.1 - Version 4.4.4.  Here we go!  DO NOT MERGE

Make is so.

Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0

9 years ago"KTU84M"
The Android Automerger [Wed, 7 May 2014 18:43:55 +0000 (11:43 -0700)]
"KTU84M"

9 years ago"KTU84L"
The Android Automerger [Thu, 1 May 2014 20:19:30 +0000 (13:19 -0700)]
"KTU84L"

9 years ago"KTV31"
The Android Automerger [Thu, 1 May 2014 20:18:54 +0000 (13:18 -0700)]
"KTV31"

9 years agoKTU84K
The Android Automerger [Wed, 30 Apr 2014 21:29:59 +0000 (14:29 -0700)]
KTU84K

9 years agoKTU84J
The Android Automerger [Wed, 23 Apr 2014 18:18:11 +0000 (11:18 -0700)]
KTU84J

9 years ago"KTU84I"
The Android Automerger [Tue, 22 Apr 2014 22:04:49 +0000 (15:04 -0700)]
"KTU84I"

10 years ago"KTU84H"
The Android Automerger [Thu, 17 Apr 2014 20:56:37 +0000 (13:56 -0700)]
"KTU84H"

10 years ago"KTU84G"
The Android Automerger [Tue, 8 Apr 2014 23:13:30 +0000 (16:13 -0700)]
"KTU84G"

10 years agoKTU84F
The Android Automerger [Tue, 1 Apr 2014 22:11:42 +0000 (15:11 -0700)]
KTU84F

10 years ago"KTU84E"
The Android Automerger [Fri, 28 Mar 2014 16:01:42 +0000 (09:01 -0700)]
"KTU84E"

10 years ago"KTU84D"
The Android Automerger [Fri, 28 Mar 2014 04:57:18 +0000 (21:57 -0700)]
"KTU84D"

10 years ago"KTU84C"
The Android Automerger [Fri, 28 Mar 2014 02:59:11 +0000 (19:59 -0700)]
"KTU84C"

10 years ago"KTU84B"
The Android Automerger [Thu, 27 Mar 2014 20:41:30 +0000 (13:41 -0700)]
"KTU84B"

10 years ago"KTU84"
The Android Automerger [Wed, 26 Mar 2014 00:07:41 +0000 (17:07 -0700)]
"KTU84"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Wed, 26 Mar 2014 00:06:29 +0000 (17:06 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU83"
The Android Automerger [Mon, 24 Mar 2014 13:02:24 +0000 (06:02 -0700)]
"KTU83"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Mon, 24 Mar 2014 13:00:10 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU79B"
The Android Automerger [Fri, 21 Mar 2014 14:27:58 +0000 (07:27 -0700)]
"KTU79B"

10 years agoSkip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Ying Wang [Fri, 21 Mar 2014 00:28:57 +0000 (17:28 -0700)]
Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS

Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0

10 years ago"KTU79"
The Android Automerger [Thu, 20 Mar 2014 13:01:49 +0000 (06:01 -0700)]
"KTU79"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Thu, 20 Mar 2014 13:00:03 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU78B"
The Android Automerger [Wed, 19 Mar 2014 19:55:30 +0000 (12:55 -0700)]
"KTU78B"

10 years ago"KTU78"
The Android Automerger [Wed, 19 Mar 2014 13:01:25 +0000 (06:01 -0700)]
"KTU78"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Wed, 19 Mar 2014 13:00:30 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU77"
The Android Automerger [Tue, 18 Mar 2014 13:01:24 +0000 (06:01 -0700)]
"KTU77"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Tue, 18 Mar 2014 13:00:05 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU76"
The Android Automerger [Mon, 17 Mar 2014 13:01:59 +0000 (06:01 -0700)]
"KTU76"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Mon, 17 Mar 2014 13:00:24 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU72B"
The Android Automerger [Thu, 13 Mar 2014 19:08:51 +0000 (12:08 -0700)]
"KTU72B"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Thu, 13 Mar 2014 19:08:01 +0000 (12:08 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU72"
The Android Automerger [Thu, 13 Mar 2014 13:01:18 +0000 (06:01 -0700)]
"KTU72"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Thu, 13 Mar 2014 13:00:33 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU71"
The Android Automerger [Wed, 12 Mar 2014 13:01:20 +0000 (06:01 -0700)]
"KTU71"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Wed, 12 Mar 2014 13:00:23 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 11 Mar 2014 21:54:09 +0000 (14:54 -0700)]
4.4.3 is MR2, version boogaloo!

Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26

10 years ago"KTU70"
The Android Automerger [Tue, 11 Mar 2014 13:01:00 +0000 (06:01 -0700)]
"KTU70"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Tue, 11 Mar 2014 13:00:14 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU69"
The Android Automerger [Mon, 10 Mar 2014 13:01:58 +0000 (06:01 -0700)]
"KTU69"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Mon, 10 Mar 2014 13:00:21 +0000 (06:00 -0700)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU65"
The Android Automerger [Thu, 6 Mar 2014 14:01:18 +0000 (06:01 -0800)]
"KTU65"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Thu, 6 Mar 2014 14:00:19 +0000 (06:00 -0800)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU64"
The Android Automerger [Wed, 5 Mar 2014 15:53:51 +0000 (07:53 -0800)]
"KTU64"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Wed, 5 Mar 2014 15:52:35 +0000 (07:52 -0800)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU63"
The Android Automerger [Tue, 4 Mar 2014 14:01:43 +0000 (06:01 -0800)]
"KTU63"

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Tue, 4 Mar 2014 14:00:07 +0000 (06:00 -0800)]
merge in klp-mr2-release history after reset to klp-dev

10 years agoFix version file
The Android Automerger [Mon, 3 Mar 2014 18:38:31 +0000 (10:38 -0800)]
Fix version file

10 years agomerge in klp-mr2-release history after reset to klp-dev
The Android Automerger [Mon, 3 Mar 2014 14:00:03 +0000 (06:00 -0800)]
merge in klp-mr2-release history after reset to klp-dev

10 years ago"KTU58"
The Android Automerger [Thu, 27 Feb 2014 19:06:11 +0000 (11:06 -0800)]
"KTU58"

10 years agoBump version to KTU58
The Android Automerger [Thu, 27 Feb 2014 19:04:50 +0000 (11:04 -0800)]
Bump version to KTU58

10 years agoMakefile used spaces instead of a tab
Michael Runge [Fri, 20 Dec 2013 19:50:16 +0000 (11:50 -0800)]
Makefile used spaces instead of a tab

Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c

10 years agoEnabled incrementals to patch + rename moved files
Michael Runge [Sat, 14 Dec 2013 02:06:28 +0000 (18:06 -0800)]
Enabled incrementals to patch + rename moved files

Change-Id: I551fc5291847e3ace15361c203d86f566c26da97

10 years agoAdd utility function find-files-in-subdirs
Ying Wang [Thu, 5 Dec 2013 00:04:49 +0000 (16:04 -0800)]
Add utility function find-files-in-subdirs

find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.

Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
(cherry picked from commit 85898bca9969ec30c746cc852394bbae0195edbc)

10 years agoAdd Dialer to SDK system image. DO NOT MERGE.
Xavier Ducrohet [Wed, 4 Dec 2013 21:25:31 +0000 (13:25 -0800)]
Add Dialer to SDK system image. DO NOT MERGE.

Change-Id: I4f15482385c869a4ae08d99ae98bffc7c113acd7

10 years ago.1 becomes .2
Dave Langemak [Tue, 3 Dec 2013 23:06:56 +0000 (15:06 -0800)]
.1 becomes .2

Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df

10 years agoadd option to generate two-step recovery files
Doug Zongker [Mon, 25 Nov 2013 22:44:12 +0000 (14:44 -0800)]
add option to generate two-step recovery files

When run with the -2 option, ota_from_target_files will generate a
package (full or incremental) that does some extra reboots in order to
install the new recovery first, so that the rest of the installation
is done with the new recovery.  This can be useful if (say) the
package installation needs some features from the newer kernel.

For incremental packages, the verification phase is still done with
the old recovery.

This is only supported on devices where the misc partition is EMMC
(not MTD).

Two-step packages are slower to install and possibly confusing to
users (they will see their device reboot four times instead of twice),
so only use this option if necessary.

Change-Id: I3267d905e5e8eb1a1eb61bf48255b8b24ffc4ad1

10 years agostore releasetools.py in the target_files zip
Doug Zongker [Fri, 22 Nov 2013 21:29:55 +0000 (13:29 -0800)]
store releasetools.py in the target_files zip

Save the device-specific releasetools.py module in the target_files
zip so that the OTA tools can use it without needing to get it from a
client.

Change-Id: I2dd5f4628290a8f2f56bd519b07d4ca8d92fddcd

10 years agoMerge "Revert "Enable incremental builder to find files that moved, and try to proces...
Dave Langemak [Fri, 22 Nov 2013 01:08:52 +0000 (01:08 +0000)]
Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev

10 years agoRevert "Enable incremental builder to find files that moved, and try to process them...
Michael Runge [Fri, 22 Nov 2013 00:52:51 +0000 (00:52 +0000)]
Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."

This reverts commit 37335b42385970d957d48056145a3d4c4dbc6087.

Change-Id: I61cc125d3b08eaa300a7774b6607dbb43f0e7148

10 years agoMerge "Just a little .1 makes all the difference in the world." into klp-dev
Dianne Hackborn [Thu, 14 Nov 2013 22:53:54 +0000 (22:53 +0000)]
Merge "Just a little .1 makes all the difference in the world." into klp-dev

10 years agoJust a little .1 makes all the difference in the world.
Dianne Hackborn [Thu, 14 Nov 2013 20:06:49 +0000 (12:06 -0800)]
Just a little .1 makes all the difference in the world.

Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497

10 years agomerge in release branch changes (no-op).
Ed Heyl [Wed, 13 Nov 2013 23:19:15 +0000 (15:19 -0800)]
merge in release branch changes (no-op).

10 years ago"KOT43B"
The Android Automerger [Wed, 13 Nov 2013 04:00:54 +0000 (20:00 -0800)]
"KOT43B"

10 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 13 Nov 2013 04:00:37 +0000 (20:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev

10 years ago"KOT43"
The Android Automerger [Wed, 13 Nov 2013 01:25:32 +0000 (17:25 -0800)]
"KOT43"

10 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 13 Nov 2013 01:24:10 +0000 (17:24 -0800)]
merge in klp-mr1-release history after reset to klp-dev

10 years agoMerge "Revert the revert. (its time to sign MR1)" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 00:38:47 +0000 (00:38 +0000)]
Merge "Revert the revert. (its time to sign MR1)" into klp-dev

10 years agoRevert the revert. (its time to sign MR1)
Baligh Uddin [Wed, 13 Nov 2013 00:22:34 +0000 (00:22 +0000)]
Revert the revert. (its time to sign MR1)

Revert "Waiting till post MR0 - this impacts signing tools for MR0."

This reverts commit a7b5c4a7dc77a0896d6314828b9ce85f82d103e8.

Bug: 11334314
Change-Id: I89f8996161e4258b80bf2d0bc7817f0e8e32df13

10 years agoKOT42B
The Android Automerger [Mon, 11 Nov 2013 23:50:17 +0000 (15:50 -0800)]
KOT42B

10 years ago"KOT42"
The Android Automerger [Mon, 11 Nov 2013 18:50:43 +0000 (10:50 -0800)]
"KOT42"

10 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 11 Nov 2013 18:50:07 +0000 (10:50 -0800)]
merge in klp-mr1-release history after reset to klp-dev

10 years ago"KOT41B"
The Android Automerger [Sun, 10 Nov 2013 18:04:50 +0000 (10:04 -0800)]
"KOT41B"

10 years ago"KOT41"
The Android Automerger [Sun, 10 Nov 2013 14:01:59 +0000 (06:01 -0800)]
"KOT41"

10 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Sun, 10 Nov 2013 14:00:23 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev

10 years ago"KOT38D"
The Android Automerger [Fri, 8 Nov 2013 21:46:12 +0000 (13:46 -0800)]
"KOT38D"