OSDN Git Service
Joe Onorato [Tue, 8 May 2012 00:15:15 +0000 (17:15 -0700)]
make product-graph now filtered
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
The Android Open Source Project [Fri, 17 Aug 2012 02:11:19 +0000 (19:11 -0700)]
am
50ec9267: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
50ec926744db8941d0c8f0d017d169d20c1ca3f4':
JOO47B
JOO47
JOO46C
JOO46B
build: register BOARD_HAVE_BLUETOOTH_QCOM
The Android Open Source Project [Fri, 17 Aug 2012 02:09:46 +0000 (19:09 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If22290df508e894617f0acd115fe0661069dcd41
The Android Open Source Project [Fri, 17 Aug 2012 02:01:23 +0000 (19:01 -0700)]
am
2e11b0f0: (-s ours) am
36bec56c: am
dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
2e11b0f07861c41af10b23c477cc6e89fac709ba':
JRO03R
JZO47
JRO03Q
The Android Open Source Project [Fri, 17 Aug 2012 01:59:13 +0000 (18:59 -0700)]
am
36bec56c: am
dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
36bec56c303ff250ba8c571c837531f82411839e':
JRO03R
JZO47
JRO03Q
The Android Open Source Project [Fri, 17 Aug 2012 01:57:26 +0000 (18:57 -0700)]
am
dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
dfab95a150da3014794fc92006c7f44e635ce1f6':
JRO03R
JZO47
JRO03Q
The Android Open Source Project [Fri, 17 Aug 2012 01:55:59 +0000 (18:55 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05
The Android Automerger [Fri, 17 Aug 2012 01:22:16 +0000 (18:22 -0700)]
JRO03R
The Android Automerger [Fri, 17 Aug 2012 00:58:34 +0000 (17:58 -0700)]
JZO47
The Android Automerger [Fri, 17 Aug 2012 00:57:18 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Thu, 16 Aug 2012 23:53:39 +0000 (16:53 -0700)]
am
88ed4fb1: am
732b2ba7: Merge "Don\'t include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev
* commit '
88ed4fb1f3456d6fec4df87a56d66a5c58e2f0d8':
Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
Ying Wang [Thu, 16 Aug 2012 23:52:25 +0000 (16:52 -0700)]
am
732b2ba7: Merge "Don\'t include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev
* commit '
732b2ba79a17ed5c0e4d9d7abb6ec3dfe50d45e8':
Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
Ying Wang [Thu, 16 Aug 2012 23:51:00 +0000 (16:51 -0700)]
Merge "Don't include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev
Ying Wang [Thu, 16 Aug 2012 23:45:01 +0000 (16:45 -0700)]
Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
Bug:
6994483
Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:33:13 +0000 (15:33 -0700)]
am
b2b42bcd: am
2f32c04d: am
d77d8906: am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
b2b42bcd546ec6a36bb464cf53ef35e8d084bb52':
select.mk: Tune ccache options
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:04 +0000 (15:31 -0700)]
am
2f32c04d: am
d77d8906: am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
2f32c04d8c454616bab383e01a4f56a9445cb1c4':
select.mk: Tune ccache options
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:28:47 +0000 (15:28 -0700)]
am
d77d8906: am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
d77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e':
select.mk: Tune ccache options
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:27:54 +0000 (15:27 -0700)]
am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
6020d698f51132cab374e6c96f7da4902f3aa84f':
select.mk: Tune ccache options
The Android Automerger [Thu, 16 Aug 2012 22:21:25 +0000 (15:21 -0700)]
JRO03Q
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:55:25 +0000 (14:55 -0700)]
Merge "select.mk: Tune ccache options"
The Android Automerger [Thu, 16 Aug 2012 20:59:00 +0000 (13:59 -0700)]
JOO47B
Andrew Boie [Mon, 13 Aug 2012 20:45:50 +0000 (13:45 -0700)]
select.mk: Tune ccache options
With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:
* Compiler binary modification time no longer causes cache misses,
as a hash of the compiler binary is taken rather than looking
at the mtime and size
* Header file modification time no longer causes cache misses,
the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative
These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.
Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Ying Wang [Thu, 16 Aug 2012 17:14:23 +0000 (10:14 -0700)]
am
79980776: am
bc415dd5: Support to build emmap_mata.zip in unbundled builds.
* commit '
799807767aacff0067bc10cf8ef7c221dab6ae00':
Support to build emmap_mata.zip in unbundled builds.
Ying Wang [Thu, 16 Aug 2012 17:12:42 +0000 (10:12 -0700)]
am
bc415dd5: Support to build emmap_mata.zip in unbundled builds.
* commit '
bc415dd5eb2a135cbc24c21760338e6294c7a0d3':
Support to build emmap_mata.zip in unbundled builds.
Ying Wang [Wed, 15 Aug 2012 19:22:44 +0000 (12:22 -0700)]
Support to build emmap_mata.zip in unbundled builds.
Bug:
6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
The Android Automerger [Thu, 16 Aug 2012 13:35:51 +0000 (06:35 -0700)]
JOO47
The Android Automerger [Thu, 16 Aug 2012 13:33:17 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Thu, 16 Aug 2012 03:06:18 +0000 (20:06 -0700)]
am
b0a6849a: am
a8352cac: am
0fc8d635: am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
b0a6849a26fd623adc677b8fe13773b6c45151e3':
The zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 03:04:43 +0000 (20:04 -0700)]
am
a8352cac: am
0fc8d635: am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
a8352cac8dae324b9d30751a2e05628db5147f45':
The zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 03:03:54 +0000 (20:03 -0700)]
am
0fc8d635: am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
The zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 03:02:49 +0000 (20:02 -0700)]
am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
f2a618e1df126c6c48622cce948825e923b52dcb':
The zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 02:43:40 +0000 (19:43 -0700)]
Merge "The zoneinfo stuff is no longer legacy."
Elliott Hughes [Thu, 16 Aug 2012 01:34:49 +0000 (18:34 -0700)]
The zoneinfo stuff is no longer legacy.
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
The Android Automerger [Thu, 16 Aug 2012 00:43:36 +0000 (17:43 -0700)]
JOO46C
Ying Wang [Wed, 15 Aug 2012 22:55:19 +0000 (15:55 -0700)]
Merge "Support to build emmap_mata.zip in unbundled builds."
Robert Ly [Fri, 8 Jun 2012 19:21:15 +0000 (12:21 -0700)]
pdk templates for docs
Change-Id: Ic1f780c0a8b62bf6e989dc4e1876e24e4cb6c179
Ying Wang [Wed, 15 Aug 2012 21:17:02 +0000 (14:17 -0700)]
Merge "Add LOCAL_CONLYFLAGS."
Keun young Park [Wed, 15 Aug 2012 21:05:50 +0000 (14:05 -0700)]
Keun young Park [Wed, 15 Aug 2012 21:04:09 +0000 (14:04 -0700)]
Keun young Park [Wed, 15 Aug 2012 20:42:37 +0000 (13:42 -0700)]
fix MIPS build
- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
not under TARGET_OUT_STATIC_LIBRARIES
Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
Keun young Park [Wed, 15 Aug 2012 19:25:39 +0000 (12:25 -0700)]
am
5877c1d1: am
81821821: fix PDK boot issue
* commit '
5877c1d17d34cd2eb039ec904b2bd4eb9fbd5ddd':
fix PDK boot issue
Keun young Park [Wed, 15 Aug 2012 19:24:27 +0000 (12:24 -0700)]
am
81821821: fix PDK boot issue
* commit '
8182182182b878e25d871eb2f683f61796fdd43d':
fix PDK boot issue
Ying Wang [Wed, 15 Aug 2012 19:22:44 +0000 (12:22 -0700)]
Support to build emmap_mata.zip in unbundled builds.
Bug:
6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
The Android Automerger [Wed, 15 Aug 2012 18:47:00 +0000 (11:47 -0700)]
JOO46B
Iliyan Malchev [Wed, 15 Aug 2012 15:12:01 +0000 (08:12 -0700)]
build: register BOARD_HAVE_BLUETOOTH_QCOM
Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com>
Keun young Park [Wed, 15 Aug 2012 18:32:23 +0000 (11:32 -0700)]
fix PDK boot issue
- add missing packages to make it boot
Change-Id: I9a4a635e67a82c326f9eb1eceb86cffc8f59a2d3
Ying Wang [Wed, 15 Aug 2012 17:59:10 +0000 (10:59 -0700)]
Add LOCAL_CONLYFLAGS.
To pass compiler flags
LOCAL_CFLAGS: to both C and C++ files;
LOCAL_CONLYFLAGS: to only C files but not C++ files;
LOCAL_CPPFLAGS: to only C++ file.
LOCAL_CPPFLAGS and LOCAL_CONLYFLAGS can override flags in LOCAL_CFLAGS.
Bug:
6967573
Change-Id: I88d9de0980e451b94bc7ae8c741ea2030eada3e1
Iliyan Malchev [Wed, 15 Aug 2012 16:21:45 +0000 (09:21 -0700)]
am
526097e4: am
0016a9ba: Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
* commit '
526097e48c433c1488871d36bd7024e7b124f4a3':
build: register BOARD_HAVE_BLUETOOTH_QCOM
Iliyan Malchev [Wed, 15 Aug 2012 16:19:57 +0000 (09:19 -0700)]
am
0016a9ba: Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
* commit '
0016a9ba8dfcc91571820087e96cb87b9b9215c4':
build: register BOARD_HAVE_BLUETOOTH_QCOM
Iliyan Malchev [Wed, 15 Aug 2012 16:18:11 +0000 (09:18 -0700)]
Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
The Android Open Source Project [Wed, 15 Aug 2012 15:27:29 +0000 (08:27 -0700)]
am
d792d355: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
d792d355f3828eac7005200395f87e4998ff2adf':
JOO46
JOO45C
JOO45B
JOO45
JOO44B
JOO44
JOO40D
JOO40C
The Android Open Source Project [Wed, 15 Aug 2012 15:26:18 +0000 (08:26 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5103348a4d9516d799377625c905fac66c9c9837
Iliyan Malchev [Wed, 15 Aug 2012 15:12:01 +0000 (08:12 -0700)]
build: register BOARD_HAVE_BLUETOOTH_QCOM
Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Open Source Project [Wed, 15 Aug 2012 15:08:35 +0000 (08:08 -0700)]
am
69c05fc4: (-s ours) am
0062f811: am
1a0f6725: (-s ours) Reconcile with jb-release - do not merge
* commit '
69c05fc44f0bec42f686fbdb512193637e50d9bb':
JRO03P
The Android Open Source Project [Wed, 15 Aug 2012 15:06:43 +0000 (08:06 -0700)]
am
0062f811: am
1a0f6725: (-s ours) Reconcile with jb-release - do not merge
* commit '
0062f811c0727e329bf96a75876a99e661419d0f':
JRO03P
The Android Open Source Project [Wed, 15 Aug 2012 15:05:37 +0000 (08:05 -0700)]
am
1a0f6725: (-s ours) Reconcile with jb-release - do not merge
* commit '
1a0f6725392279ed6b44e97b00315b8173abf454':
JRO03P
The Android Open Source Project [Wed, 15 Aug 2012 15:04:29 +0000 (08:04 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I3ea7d0a8c3865290f404bb24b464fcfb7410dd0e
The Android Automerger [Wed, 15 Aug 2012 13:36:46 +0000 (06:36 -0700)]
JOO46
The Android Automerger [Wed, 15 Aug 2012 13:33:28 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Scott Main [Wed, 15 Aug 2012 01:14:50 +0000 (18:14 -0700)]
am
d493f118: am
d3ee366a: am
021ff2ee: am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
d493f118691ae67dd241775455062ee5ccf58f40':
docs: move home.css into default.css to reduce number of requests
Scott Main [Wed, 15 Aug 2012 01:13:24 +0000 (18:13 -0700)]
am
d3ee366a: am
021ff2ee: am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
d3ee366af2ce12093478c35b14a1160599b27f71':
docs: move home.css into default.css to reduce number of requests
Scott Main [Wed, 15 Aug 2012 01:12:02 +0000 (18:12 -0700)]
am
021ff2ee: am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
021ff2ee388bdb548ae55b349535d14e0423207c':
docs: move home.css into default.css to reduce number of requests
Scott Main [Wed, 15 Aug 2012 01:10:52 +0000 (18:10 -0700)]
am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
9edfa6db8c53ef9515aaeed734bea02c5d65e1e5':
docs: move home.css into default.css to reduce number of requests
Doug Zongker [Tue, 14 Aug 2012 23:53:47 +0000 (16:53 -0700)]
am
d3eb5e5b: am
24cd2803: allow diff program to be selected explicitly
* commit '
d3eb5e5b3648fc3ead3aa4d27124a06875f9878e':
allow diff program to be selected explicitly
The Android Automerger [Tue, 14 Aug 2012 23:52:17 +0000 (16:52 -0700)]
JOO45C
Doug Zongker [Tue, 14 Aug 2012 23:51:40 +0000 (16:51 -0700)]
am
24cd2803: allow diff program to be selected explicitly
* commit '
24cd28032890b1ca7fbc34320a22bd575f59d641':
allow diff program to be selected explicitly
Doug Zongker [Tue, 14 Aug 2012 23:36:15 +0000 (16:36 -0700)]
allow diff program to be selected explicitly
Change-Id: I1d8df9cc3ed35cc5983bc50fc13975db32072dbe
Scott Main [Tue, 14 Aug 2012 22:04:40 +0000 (15:04 -0700)]
docs: move home.css into default.css to reduce number of requests
Change-Id: I156182c5ad1545f570808af565948cbd3c05a3ee
Jesse Hall [Tue, 14 Aug 2012 22:34:46 +0000 (15:34 -0700)]
am
049d1964: am
8513b62f: Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
* commit '
049d1964dc3b0fab51b0f8e3debf6e1cc83c97f9':
Include FusedLocation.apk on sdk builds too
Jesse Hall [Tue, 14 Aug 2012 22:33:05 +0000 (15:33 -0700)]
am
8513b62f: Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
* commit '
8513b62f6acda50db9afc3194165488c44819dd2':
Include FusedLocation.apk on sdk builds too
Jesse Hall [Tue, 14 Aug 2012 22:31:42 +0000 (15:31 -0700)]
Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
The Android Automerger [Tue, 14 Aug 2012 21:58:43 +0000 (14:58 -0700)]
JOO45B
Jesse Hall [Tue, 14 Aug 2012 20:34:10 +0000 (13:34 -0700)]
Include FusedLocation.apk on sdk builds too
Bug:
6969889
Change-Id: Ifda8df58906b3e1d77de0f7de0b1dd07c6bf430f
Ying Wang [Tue, 14 Aug 2012 20:10:23 +0000 (13:10 -0700)]
am
21f803c8: am
27d51bf6: Force out LOCAL_NDK_VERSION.
* commit '
21f803c85a5e5107999d7c3fec9e978d1d776815':
Force out LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 20:09:19 +0000 (13:09 -0700)]
am
27d51bf6: Force out LOCAL_NDK_VERSION.
* commit '
27d51bf6d3cd4189085238503d46a5a570173e1b':
Force out LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 18:08:03 +0000 (11:08 -0700)]
Force out LOCAL_NDK_VERSION.
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
Ying Wang [Tue, 14 Aug 2012 19:20:59 +0000 (12:20 -0700)]
am
cfb189e8: (-s ours) am
54fdb473: Retire LOCAL_NDK_VERSION.
* commit '
cfb189e80d293f2134355ff930f1fd27bd2ad937':
Retire LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 19:13:15 +0000 (12:13 -0700)]
am
54fdb473: Retire LOCAL_NDK_VERSION.
* commit '
54fdb473b656544c75ad06497ecf20a1e8d6b539':
Retire LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 19:07:48 +0000 (12:07 -0700)]
am
ef02ec9e: (-s ours) am
d4f0ffcb: Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
* commit '
ef02ec9e508f0581821ffe820b7d5d899ed56152':
Adopt the new prebuilts/ndk/<number> paths.
Ying Wang [Tue, 14 Aug 2012 18:58:53 +0000 (11:58 -0700)]
am
d4f0ffcb: Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
* commit '
d4f0ffcb6b30c96160667d1757edb9d3692caba8':
Adopt the new prebuilts/ndk/<number> paths.
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:58:38 +0000 (11:58 -0700)]
am
d68ef45f: am
1196c824: am
7159a992: am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
d68ef45f49fab6fd4600f40e119976f22a0ca86b':
Set the AOSP master to be API level 16
Ying Wang [Tue, 14 Aug 2012 17:13:16 +0000 (10:13 -0700)]
Retire LOCAL_NDK_VERSION.
We are now unifying the NDK versions of unbundled native code to always
use the latest NDK.
We don't need the variable LOCAL_NDK_VERSION now.
To build native code with NDK, you need set just LOCAL_SDK_VERSION.
Bug:
6932421
Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:57:19 +0000 (11:57 -0700)]
am
1196c824: am
7159a992: am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
1196c82491e29eed257a44aa7384d8b836657b82':
Set the AOSP master to be API level 16
Ying Wang [Tue, 14 Aug 2012 18:57:01 +0000 (11:57 -0700)]
Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
Ying Wang [Fri, 10 Aug 2012 17:57:37 +0000 (10:57 -0700)]
Adopt the new prebuilts/ndk/<number> paths.
Bug:
6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:55:19 +0000 (11:55 -0700)]
am
7159a992: am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
7159a992ddcda51c91843a29cd1aa30815bc8370':
Set the AOSP master to be API level 16
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:53:40 +0000 (11:53 -0700)]
am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
4eddad550ee81edba01734bf378612ed18841751':
Set the AOSP master to be API level 16
Ying Wang [Tue, 14 Aug 2012 18:08:03 +0000 (11:08 -0700)]
Force out LOCAL_NDK_VERSION.
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
Jean-Baptiste Queru [Tue, 14 Aug 2012 17:51:21 +0000 (10:51 -0700)]
Merge "Set the AOSP master to be API level 16"
Ying Wang [Tue, 14 Aug 2012 17:13:16 +0000 (10:13 -0700)]
Retire LOCAL_NDK_VERSION.
We are now unifying the NDK versions of unbundled native code to always
use the latest NDK.
We don't need the variable LOCAL_NDK_VERSION now.
To build native code with NDK, you need set just LOCAL_SDK_VERSION.
Bug:
6932421
Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa
Jean-Baptiste Queru [Tue, 14 Aug 2012 16:07:33 +0000 (09:07 -0700)]
Set the AOSP master to be API level 16
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
The Android Automerger [Tue, 14 Aug 2012 14:08:55 +0000 (07:08 -0700)]
JOO45
The Android Automerger [Tue, 14 Aug 2012 14:06:10 +0000 (07:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 13 Aug 2012 23:33:55 +0000 (16:33 -0700)]
JOO44B
Ying Wang [Mon, 13 Aug 2012 23:30:15 +0000 (16:30 -0700)]
am
d88c10d7: am
f59a64b7: am
d3d0beca: am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
d88c10d7691f2717a2c1fd0801c9a7798fbe0334':
Move the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 23:27:07 +0000 (16:27 -0700)]
am
f59a64b7: am
d3d0beca: am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
f59a64b7cba7330701b8791698e67abff8afde65':
Move the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)]
am
d3d0beca: am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
d3d0becac9a13836b7c20acba3b21b0625d92324':
Move the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 23:24:11 +0000 (16:24 -0700)]
am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
Move the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 23:08:27 +0000 (16:08 -0700)]
am
721cd087: am
4150db69: am
d7547163: am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
721cd087bd7f02802a0545f8826f5835cc3dea26':
Add mac_permissions.xml dependency.
The Android Automerger [Mon, 13 Aug 2012 23:07:45 +0000 (16:07 -0700)]
JRO03P