OSDN Git Service
The Android Automerger [Tue, 16 Apr 2013 14:49:12 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Mon, 15 Apr 2013 17:49:00 +0000 (10:49 -0700)]
am
1a34a19f: Reconcile with jb-mr2-release - do not merge
* commit '
1a34a19fb668dc40cd7573393e8777c78434e6e5':
"JWR15"
JWR11G
JWR11F
JWR11E
JWR11D
"JWR11C"
JWR11B
The Android Open Source Project [Mon, 15 Apr 2013 17:45:43 +0000 (10:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I49eb0fa91c0c510075419629195dcb27b9359e7d
The Android Automerger [Mon, 15 Apr 2013 14:52:28 +0000 (07:52 -0700)]
"AAR15"
The Android Automerger [Mon, 15 Apr 2013 14:49:20 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Mon, 15 Apr 2013 12:57:31 +0000 (05:57 -0700)]
"JWR15"
The Android Automerger [Mon, 15 Apr 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sat, 13 Apr 2013 01:15:42 +0000 (18:15 -0700)]
JWR11G
The Android Automerger [Fri, 12 Apr 2013 23:20:46 +0000 (16:20 -0700)]
JWR11F
The Android Automerger [Fri, 12 Apr 2013 21:32:07 +0000 (14:32 -0700)]
JWR11E
Ying Wang [Fri, 12 Apr 2013 21:14:36 +0000 (14:14 -0700)]
Allow to set BUILD_EMULATOR outside the core build system.
For example, you can set it as enviromental variable, command line
makefile variable, or board config variable.
Change-Id: I5a4dbb70270cb4952109b5d96fbbf61eb2603502
The Android Automerger [Fri, 12 Apr 2013 18:30:53 +0000 (11:30 -0700)]
JWR11D
The Android Automerger [Fri, 12 Apr 2013 14:51:55 +0000 (07:51 -0700)]
"AAR12"
The Android Automerger [Fri, 12 Apr 2013 14:49:28 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Fri, 12 Apr 2013 06:22:16 +0000 (23:22 -0700)]
"JWR11C"
Jeff Sharkey [Fri, 12 Apr 2013 00:18:35 +0000 (17:18 -0700)]
am
f416da98: am
021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
* commit '
f416da980218b0c61bed1bcaa0048a5e8f7285a1':
DO NOT MERGE. Fix build by removing old file.
Jeff Sharkey [Fri, 12 Apr 2013 00:14:48 +0000 (17:14 -0700)]
am
021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
* commit '
021aa4cefe03fd7cca5ee4baf25a562c6f6cda20':
DO NOT MERGE. Fix build by removing old file.
Jeff Sharkey [Fri, 12 Apr 2013 00:12:00 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
Jeff Sharkey [Thu, 11 Apr 2013 22:37:13 +0000 (15:37 -0700)]
DO NOT MERGE. Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
Ying Wang [Thu, 11 Apr 2013 23:03:48 +0000 (16:03 -0700)]
am
f59e2624: am
14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
* commit '
f59e2624b33a428bbe484168ac4f96ca36a6c32e':
Get rid of the liblog hack.
Ying Wang [Thu, 11 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am
14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
* commit '
14ae6e87c9822018e7fc139f66e60b4db6b08edb':
Get rid of the liblog hack.
Ying Wang [Thu, 11 Apr 2013 22:56:20 +0000 (22:56 +0000)]
Merge "Get rid of the liblog hack." into jb-mr2-dev
Dianne Hackborn [Thu, 11 Apr 2013 22:39:25 +0000 (22:39 +0000)]
Merge "Fix build by removing old file."
Jeff Sharkey [Thu, 11 Apr 2013 22:37:13 +0000 (15:37 -0700)]
Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
Doug Zongker [Thu, 11 Apr 2013 22:02:15 +0000 (22:02 +0000)]
Merge "SignApk: update SignApk to support SHA256withRSA signing"
The Android Automerger [Thu, 11 Apr 2013 21:44:38 +0000 (14:44 -0700)]
JWR11B
The Android Automerger [Thu, 11 Apr 2013 16:25:07 +0000 (09:25 -0700)]
"AAR11"
The Android Automerger [Thu, 11 Apr 2013 16:22:11 +0000 (09:22 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Thu, 11 Apr 2013 14:47:12 +0000 (07:47 -0700)]
am
c1213473: Reconcile with jb-mr2-release - do not merge
* commit '
c1213473de0890856341bed09ef08b14603ddb30':
"JWR11"
JWR10C
The Android Open Source Project [Thu, 11 Apr 2013 14:44:59 +0000 (07:44 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I55884a9acd85fee2a3b45f5262b074731ca9ea16
The Android Automerger [Thu, 11 Apr 2013 12:57:18 +0000 (05:57 -0700)]
"JWR11"
The Android Automerger [Thu, 11 Apr 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Thu, 11 Apr 2013 05:12:53 +0000 (22:12 -0700)]
am
c9bdff96: am
3e556091: Support to dist unbundled files for bundled build
* commit '
c9bdff96ca4270cc6f626298b05e13f92ad00551':
Support to dist unbundled files for bundled build
Ying Wang [Thu, 11 Apr 2013 05:09:47 +0000 (22:09 -0700)]
am
3e556091: Support to dist unbundled files for bundled build
* commit '
3e55609134381cadfc3b69657a5598dc3d8f2e35':
Support to dist unbundled files for bundled build
Ying Wang [Thu, 11 Apr 2013 02:17:41 +0000 (19:17 -0700)]
Support to dist unbundled files for bundled build
Usage:
LOCAL_DIST_BUNDLED_BINARIES := true
The dist files will include the jni shared libraries and the apk with
jni libraries stripped.
Bug:
8181626
Change-Id: I4a047d786ad35b948b4ad7a51adf37321dbe395c
The Android Automerger [Thu, 11 Apr 2013 02:07:13 +0000 (19:07 -0700)]
JWR10C
Ying Wang [Wed, 10 Apr 2013 06:27:57 +0000 (23:27 -0700)]
Get rid of the liblog hack.
Bug:
8580410
Change-Id: I3ece860673eb52a2db1421db4492c9b1807dda6e
The Android Open Source Project [Wed, 10 Apr 2013 22:34:45 +0000 (15:34 -0700)]
am
a934e35c: Reconcile with jb-mr2-release - do not merge
* commit '
a934e35ce9dfd05fc368b8b26820c344587b9734':
JWR10B
The Android Open Source Project [Wed, 10 Apr 2013 22:31:33 +0000 (15:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I7df2e132b28a7491cab9dbb36f64c8058f60a0e9
Ying Wang [Wed, 10 Apr 2013 22:16:51 +0000 (15:16 -0700)]
am
a752c965: am
c04a8282: Revert "Get rid of the liblog hack."
* commit '
a752c965fe5d77ae6488a39685269db757dbf4f7':
Revert "Get rid of the liblog hack."
Ying Wang [Wed, 10 Apr 2013 22:14:23 +0000 (15:14 -0700)]
am
c04a8282: Revert "Get rid of the liblog hack."
* commit '
c04a8282229b624eb3aff506fb72e5fcf27b258f':
Revert "Get rid of the liblog hack."
Ying Wang [Wed, 10 Apr 2013 22:11:43 +0000 (22:11 +0000)]
Revert "Get rid of the liblog hack."
This reverts commit
7636578729ffcd02bfb5158db884f559a52d8905
Change-Id: I32f2acce5f99cb97eae986dfeba6d5d25378aefa
The Android Automerger [Wed, 10 Apr 2013 19:46:43 +0000 (12:46 -0700)]
AAR10B
The Android Automerger [Wed, 10 Apr 2013 19:18:38 +0000 (12:18 -0700)]
JWR10B
Ying Wang [Wed, 10 Apr 2013 17:13:08 +0000 (10:13 -0700)]
am
43d5f927: am
76365787: Get rid of the liblog hack.
* commit '
43d5f927c1c8f7f1a7fad431560044565b5415b9':
Get rid of the liblog hack.
Ying Wang [Wed, 10 Apr 2013 17:09:06 +0000 (10:09 -0700)]
am
76365787: Get rid of the liblog hack.
* commit '
7636578729ffcd02bfb5158db884f559a52d8905':
Get rid of the liblog hack.
The Android Open Source Project [Wed, 10 Apr 2013 17:08:30 +0000 (10:08 -0700)]
am
8d4e5f11: Reconcile with jb-mr2-release - do not merge
* commit '
8d4e5f1166118f3c2c5e1c83e03fc4f38088aa52':
"JWR10"
JWR09C
JWR09B
"JWR09"
JWR08B
The Android Open Source Project [Wed, 10 Apr 2013 17:05:13 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id8df255f1ee96ac589ce42c921ff5098c9507331
Doug Zongker [Wed, 10 Apr 2013 16:19:32 +0000 (09:19 -0700)]
SignApk: update SignApk to support SHA256withRSA signing
Change-Id: I849b05addba69b74c9b0b65de5b24dd233e57d7c
The Android Automerger [Wed, 10 Apr 2013 14:52:50 +0000 (07:52 -0700)]
"AAR10"
The Android Automerger [Wed, 10 Apr 2013 14:49:19 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Wed, 10 Apr 2013 12:57:46 +0000 (05:57 -0700)]
"JWR10"
The Android Automerger [Wed, 10 Apr 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 06:27:57 +0000 (23:27 -0700)]
Get rid of the liblog hack.
Bug:
8580410
Change-Id: I4b437d10522ee66c7883faacfaf7e30abede394c
Ying Wang [Wed, 10 Apr 2013 06:25:31 +0000 (23:25 -0700)]
Ying Wang [Wed, 10 Apr 2013 06:25:30 +0000 (23:25 -0700)]
am
bbb058ab: am
fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
* commit '
bbb058abc5e4870d09ed795a11a81576c20337f5':
Revert "Add liblog"
Ying Wang [Wed, 10 Apr 2013 05:37:04 +0000 (22:37 -0700)]
Ying Wang [Wed, 10 Apr 2013 05:37:04 +0000 (22:37 -0700)]
am
fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
* commit '
fd068148d64cabd318a7d426840c5127f7a91160':
Revert "Add liblog"
Ying Wang [Wed, 10 Apr 2013 05:33:58 +0000 (22:33 -0700)]
Add liblog
Bug:
8580410
Change-Id: Id3c26ff084950f8cbfa87f4425747ee322de7624
Ying Wang [Wed, 10 Apr 2013 05:32:37 +0000 (05:32 +0000)]
Merge "Revert "Add liblog"" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:32:21 +0000 (05:32 +0000)]
Revert "Add liblog"
This reverts commit
8722580d90840352883a84d1ca882e50220f3959
Change-Id: Iafdbb7f540a53ddc9dc2e21c0afddb62c44c4af8
Ying Wang [Wed, 10 Apr 2013 05:25:07 +0000 (22:25 -0700)]
am
c54a1845: am
134ec88c: Merge "Add liblog" into jb-mr2-dev
* commit '
c54a184547994f698a7b24d98bb3d46577e4ccce':
Add liblog
Ying Wang [Wed, 10 Apr 2013 05:17:07 +0000 (22:17 -0700)]
am
134ec88c: Merge "Add liblog" into jb-mr2-dev
* commit '
134ec88c943ad0453d5716edceacca46a621e026':
Add liblog
Ying Wang [Wed, 10 Apr 2013 05:12:00 +0000 (05:12 +0000)]
Merge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 04:41:48 +0000 (21:41 -0700)]
Add liblog
Bug:
8580410
Change-Id: I45e17b786b8d221a071b5de2432bb1367e245fb4
The Android Automerger [Tue, 9 Apr 2013 23:00:25 +0000 (16:00 -0700)]
JWR09C
Robert Ly [Tue, 9 Apr 2013 21:26:00 +0000 (14:26 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:45:43 +0000 (13:45 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:43:50 +0000 (13:43 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:40:36 +0000 (13:40 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:37:01 +0000 (13:37 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:33:28 +0000 (13:33 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:29:57 +0000 (13:29 -0700)]
am
a4d2d0ef: s.a.c templates
* commit '
a4d2d0ef551f443445a1dffb05f530de32b01fb3':
s.a.c templates
Robert Ly [Tue, 9 Apr 2013 18:26:12 +0000 (11:26 -0700)]
s.a.c templates
Change-Id: Ia6554ba55d10af10227cde336026b51a27307aa0
The Android Automerger [Tue, 9 Apr 2013 17:05:04 +0000 (10:05 -0700)]
JWR09B
The Android Automerger [Tue, 9 Apr 2013 14:52:18 +0000 (07:52 -0700)]
"AAR09"
The Android Automerger [Tue, 9 Apr 2013 14:49:21 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Tue, 9 Apr 2013 12:57:13 +0000 (05:57 -0700)]
"JWR09"
The Android Automerger [Tue, 9 Apr 2013 12:55:14 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 9 Apr 2013 01:53:50 +0000 (18:53 -0700)]
JWR08B
Dianne Hackborn [Tue, 9 Apr 2013 00:05:32 +0000 (17:05 -0700)]
am
aad80a82: am
51ebc822: Merge "Add new media command to build." into jb-mr2-dev
* commit '
aad80a822604db0d751e1bcc3e6ad09fe783e199':
Add new media command to build.
Dianne Hackborn [Mon, 8 Apr 2013 22:37:39 +0000 (15:37 -0700)]
am
51ebc822: Merge "Add new media command to build." into jb-mr2-dev
* commit '
51ebc822c1cf7cc206d5a6acc98b8a3f06227426':
Add new media command to build.
Dianne Hackborn [Mon, 8 Apr 2013 22:35:34 +0000 (22:35 +0000)]
Merge "Add new media command to build." into jb-mr2-dev
The Android Open Source Project [Mon, 8 Apr 2013 20:40:29 +0000 (13:40 -0700)]
am
bdd47e50: Reconcile with jb-mr2-release - do not merge
* commit '
bdd47e503cf336cce34ac941c07726377396826d':
"JWR08"
JWR04C
JWR04B
"JWR04"
JWR03B
The Android Open Source Project [Mon, 8 Apr 2013 20:35:34 +0000 (13:35 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic29dadd7db4775b7812868535dd2c510a64f0591
The Android Automerger [Mon, 8 Apr 2013 14:53:42 +0000 (07:53 -0700)]
"AAR08"
The Android Automerger [Mon, 8 Apr 2013 14:49:33 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Mon, 8 Apr 2013 12:58:37 +0000 (05:58 -0700)]
"JWR08"
The Android Automerger [Mon, 8 Apr 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Sat, 6 Apr 2013 04:10:47 +0000 (21:10 -0700)]
am
8537b614: am
4996c807: Merge "Fix the win_sdk build."
* commit '
8537b6145ad275d6fb40e5be4286ff43eaace868':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 04:07:24 +0000 (21:07 -0700)]
am
e63604e3: resolved conflicts for merge of
2321482e to jb-mr2-dev-plus-aosp
* commit '
e63604e3a8b6114067bb1604797a04ae84ca7cc5':
Switch to prebuilt bison
Ying Wang [Sat, 6 Apr 2013 04:06:19 +0000 (21:06 -0700)]
am
4996c807: Merge "Fix the win_sdk build."
* commit '
4996c8073e87dd9e361b385d8aeb121f4c36a221':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 04:04:23 +0000 (21:04 -0700)]
resolved conflicts for merge of
2321482e to jb-mr2-dev-plus-aosp
Change-Id: I1b144cdf6774df95c0507cc5751d7def240cf645
Ying Wang [Sat, 6 Apr 2013 02:51:24 +0000 (02:51 +0000)]
Merge "Fix the win_sdk build."
Ying Wang [Sat, 6 Apr 2013 02:51:05 +0000 (02:51 +0000)]
Merge "Switch to prebuilt bison"
Ying Wang [Sat, 6 Apr 2013 01:51:32 +0000 (18:51 -0700)]
Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
Ying Wang [Sat, 6 Apr 2013 02:00:00 +0000 (19:00 -0700)]
am
31e588e4: am
dd75a03d: Fix the win_sdk build.
* commit '
31e588e4e1f7fa4223d01999150c7e2a71c797ac':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 01:57:06 +0000 (18:57 -0700)]
am
dd75a03d: Fix the win_sdk build.
* commit '
dd75a03d35499c34db913e886dbed5c37f5ce6d8':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 01:51:32 +0000 (18:51 -0700)]
Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
Ying Wang [Sat, 6 Apr 2013 01:02:16 +0000 (18:02 -0700)]
Switch to prebuilt bison
Bug:
8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
OSDN Git Service
