OSDN Git Service
Daniel Sandler [Fri, 31 Aug 2012 20:38:43 +0000 (13:38 -0700)]
am
7138e336: am
ce9ecf38: Merge "Add basic Dreams set to builds." into jb-mr1-dev
* commit '
7138e336dd753394ec7a008e1836891f6e0b1ca1':
Add basic Dreams set to builds.
Daniel Sandler [Fri, 31 Aug 2012 20:36:25 +0000 (13:36 -0700)]
am
ce9ecf38: Merge "Add basic Dreams set to builds." into jb-mr1-dev
* commit '
ce9ecf38e953e642704c696d6abc26233b0cee05':
Add basic Dreams set to builds.
Daniel Sandler [Fri, 31 Aug 2012 20:34:37 +0000 (13:34 -0700)]
Merge "Add basic Dreams set to builds." into jb-mr1-dev
Daniel Sandler [Fri, 31 Aug 2012 12:22:22 +0000 (08:22 -0400)]
Add basic Dreams set to builds.
Change-Id: I7b7e84a84f9fc6c594662baf4dd991ff9af5f162
Chiao Cheng [Thu, 30 Aug 2012 21:44:28 +0000 (14:44 -0700)]
Merge "Adding OneTimeInitializer to build."
Ying Wang [Thu, 30 Aug 2012 21:16:31 +0000 (14:16 -0700)]
am
18c8d9eb: am
3a6f7589: Add LOCAL_DONT_DELETE_JAR_META_INF
* commit '
18c8d9eb1e0c0776862d554f0834e7ee3018375a':
Add LOCAL_DONT_DELETE_JAR_META_INF
Ying Wang [Thu, 30 Aug 2012 21:14:12 +0000 (14:14 -0700)]
am
3a6f7589: Add LOCAL_DONT_DELETE_JAR_META_INF
* commit '
3a6f7589e8fcc691ec768b1fdcbf0364ff4596f2':
Add LOCAL_DONT_DELETE_JAR_META_INF
Kenny Root [Thu, 30 Aug 2012 20:33:39 +0000 (13:33 -0700)]
am
6180d5c8: am
565de5c9: am
a4f2f34a: am
d6a46969: Add make_ext4fs to all builds
* commit '
6180d5c8f2293e6fee7481d13d45559734c0c1bd':
Add make_ext4fs to all builds
Ying Wang [Thu, 30 Aug 2012 19:59:42 +0000 (12:59 -0700)]
Add LOCAL_DONT_DELETE_JAR_META_INF
To support to not delete META_INF directory from the static Java
libraries.
Change-Id: I720bfa059c43dd457a74a0c60bb6797aa408ecaf
Kenny Root [Thu, 30 Aug 2012 19:16:33 +0000 (12:16 -0700)]
am
565de5c9: am
a4f2f34a: am
d6a46969: Add make_ext4fs to all builds
* commit '
565de5c97c49ece0e6dc8f95833956ae27afe598':
Add make_ext4fs to all builds
Kenny Root [Thu, 30 Aug 2012 19:13:56 +0000 (12:13 -0700)]
am
a4f2f34a: am
d6a46969: Add make_ext4fs to all builds
* commit '
a4f2f34a45a35c5c49308d336b822ea4af4a543d':
Add make_ext4fs to all builds
Kenny Root [Thu, 30 Aug 2012 19:11:40 +0000 (12:11 -0700)]
am
d6a46969: Add make_ext4fs to all builds
* commit '
d6a469693fe77884bc902d6ec8be6f04d7d8e21a':
Add make_ext4fs to all builds
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:49:09 +0000 (11:49 -0700)]
am
a1ffbfc5: am
780364f0: am
9993b126: am
bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
* commit '
a1ffbfc59d2907de13ca820c8d3a83b5097a1e26':
Add make_ext4fs to support installing apps to SD card
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:47:05 +0000 (11:47 -0700)]
am
780364f0: am
9993b126: am
bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
* commit '
780364f0cbd497359dc75b3e1f1e6605a9ec4990':
Add make_ext4fs to support installing apps to SD card
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:44:17 +0000 (11:44 -0700)]
am
9993b126: am
bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
* commit '
9993b1265ec108957c1b4a35bdc62940a350b3e4':
Add make_ext4fs to support installing apps to SD card
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:40:13 +0000 (11:40 -0700)]
am
bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
* commit '
bb369a582b9756347959f6ef389507455f805df1':
Add make_ext4fs to support installing apps to SD card
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:01:29 +0000 (11:01 -0700)]
Merge "Add make_ext4fs to support installing apps to SD card"
Jun Tian [Thu, 30 Aug 2012 02:59:17 +0000 (10:59 +0800)]
Add make_ext4fs to support installing apps to SD card
The default createSecureContainer format is changed from fat32 to ext4 in PackageHelper::CreateSdDir in:
/frameworks/base/core/java/com/android/internal/content/PackageHelper.java
We need to add make_ext4fs into the system image to support installing apps to SD card.
In kernel, we also need to add ext4 filesystem support.
Change-Id: If4817a95663144a6bfaeeed0c7cb081063a0daad
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
Kenny Root [Thu, 9 Aug 2012 19:20:16 +0000 (12:20 -0700)]
Add make_ext4fs to all builds
make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.
(cherry-pick of
720479ea7e6307648c56f61d82ac12d65f218dda)
Bug:
6960586
Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01
Chiao Cheng [Wed, 29 Aug 2012 01:53:00 +0000 (18:53 -0700)]
Adding OneTimeInitializer to build.
Bug:
6993891
Change-Id: Id3c0275846a4dd93d82dcfde0249fec0e226a9bd
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:44:05 +0000 (13:44 -0700)]
am
68d43bfd: am
d4ace138: am
4dc6ed96: am
9eb87b8d: Merge "Add pattern to check for GCC 4.6"
* commit '
68d43bfd402a2dc63da91846972262fd3150d3d4':
Add pattern to check for GCC 4.6
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:44:04 +0000 (13:44 -0700)]
am
6d904be7: am
c8d10774: am
fe95bc0f: am
1d0f5f91: Merge "Include all standard shared library paths in /system/lib"
* commit '
6d904be725b5ed09b815b6c5dff42a12a0974c0c':
Include all standard shared library paths in /system/lib
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:44:03 +0000 (13:44 -0700)]
am
2c83b090: am
d5096c6a: resolved conflicts for merge of
5c903372 to jb-mr1-dev
* commit '
2c83b09034d5be5369168697eab3e825ef13610d':
Use gold linker on x86
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:42:28 +0000 (13:42 -0700)]
am
d4ace138: am
4dc6ed96: am
9eb87b8d: Merge "Add pattern to check for GCC 4.6"
* commit '
d4ace13802810b58de8c744e810dc8e87776d3f0':
Add pattern to check for GCC 4.6
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:42:27 +0000 (13:42 -0700)]
am
c8d10774: am
fe95bc0f: am
1d0f5f91: Merge "Include all standard shared library paths in /system/lib"
* commit '
c8d107740f526c0a63f46106120cdc3a81787879':
Include all standard shared library paths in /system/lib
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:42:26 +0000 (13:42 -0700)]
am
d5096c6a: resolved conflicts for merge of
5c903372 to jb-mr1-dev
* commit '
d5096c6a5c59a0f78833ea86b620bfbedc863aba':
Use gold linker on x86
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:41:09 +0000 (13:41 -0700)]
am
4dc6ed96: am
9eb87b8d: Merge "Add pattern to check for GCC 4.6"
* commit '
4dc6ed96a0612d4693cca5ed5674873754bcb37e':
Add pattern to check for GCC 4.6
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:41:08 +0000 (13:41 -0700)]
am
fe95bc0f: am
1d0f5f91: Merge "Include all standard shared library paths in /system/lib"
* commit '
fe95bc0fd6bf5c45e264740654ee4ad45fcb37d4':
Include all standard shared library paths in /system/lib
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:40:19 +0000 (13:40 -0700)]
resolved conflicts for merge of
5c903372 to jb-mr1-dev
Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:59 +0000 (13:16 -0700)]
am
9eb87b8d: Merge "Add pattern to check for GCC 4.6"
* commit '
9eb87b8d2011e65462ea42de6899158cd35a492a':
Add pattern to check for GCC 4.6
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:58 +0000 (13:16 -0700)]
am
1d0f5f91: Merge "Include all standard shared library paths in /system/lib"
* commit '
1d0f5f914ae1406b976f69c265f0042c0279974e':
Include all standard shared library paths in /system/lib
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:57 +0000 (13:16 -0700)]
am
9e2b4718: Merge "Use gold linker on x86"
* commit '
9e2b4718a0e11a723904ba205a5156bae450be30':
Use gold linker on x86
Ying Wang [Tue, 28 Aug 2012 20:02:44 +0000 (13:02 -0700)]
am
759f05a2: am
6f4de4bd: Allow Java resource in apk.
* commit '
759f05a2cbd6ece18c95bc415bd22f0847540c78':
Allow Java resource in apk.
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:47:34 +0000 (12:47 -0700)]
Merge "Add pattern to check for GCC 4.6"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:46:43 +0000 (12:46 -0700)]
Merge "Include all standard shared library paths in /system/lib"
Ying Wang [Tue, 28 Aug 2012 19:41:46 +0000 (12:41 -0700)]
am
6f4de4bd: Allow Java resource in apk.
* commit '
6f4de4bd13f0acaaa8b7c59e141c28d64aba48f4':
Allow Java resource in apk.
Ying Wang [Tue, 31 Jul 2012 16:40:00 +0000 (09:40 -0700)]
Allow Java resource in apk.
Bug:
6892294
Change-Id: Ib7664e3d9e396dc8ccccecbae9103884014f3ddd
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:27:20 +0000 (12:27 -0700)]
Merge "Use gold linker on x86"
Evgeniy Stepanov [Tue, 21 Aug 2012 11:45:56 +0000 (15:45 +0400)]
Split out ASFLAGS from CFLAGS in Clang config.
Change-Id: I4e3fc3c737fd7c1baff7e30f01d2b26bda557f71
Chris Wren [Tue, 28 Aug 2012 14:13:29 +0000 (07:13 -0700)]
am
00743e38: am
07791f87: Merge "Include stock Dreams in the build." into jb-mr1-dev
* commit '
00743e38849df7fbc5d6a723bbd5e79658941b69':
Include stock Dreams in the build.
Chris Wren [Tue, 28 Aug 2012 14:11:34 +0000 (07:11 -0700)]
am
07791f87: Merge "Include stock Dreams in the build." into jb-mr1-dev
* commit '
07791f870e8af381cef7ba7048bf5b1cf7b7ca9c':
Include stock Dreams in the build.
Chris Wren [Tue, 28 Aug 2012 14:09:44 +0000 (07:09 -0700)]
Merge "Include stock Dreams in the build." into jb-mr1-dev
Pavel Chupin [Tue, 28 Aug 2012 08:20:55 +0000 (12:20 +0400)]
Use gold linker on x86
Patch removes fallback -fuse-ld=bfd for x86 target and
--copy-dt-needed-entries which is not supported by gold linker.
Change-Id: Ie5603f98e3f2f9d4f81678c718e39b130a75d057
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Andrew Hsieh [Tue, 28 Aug 2012 02:49:05 +0000 (10:49 +0800)]
Add pattern to check for GCC 4.6
GCC 4.6 --version can return 4.6.x-google but also simply 4.6
as of https://android-review.googlesource.com/#/c/42028.
Add more pattern to detect it.
Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
Ying Wang [Mon, 27 Aug 2012 23:21:28 +0000 (16:21 -0700)]
am
94aa427b: am
24559290: Keep the emma classes if emma is enabled.
* commit '
94aa427bc0c2893738e8d12f041f68490515517f':
Keep the emma classes if emma is enabled.
Ying Wang [Mon, 27 Aug 2012 23:19:29 +0000 (16:19 -0700)]
am
24559290: Keep the emma classes if emma is enabled.
* commit '
245592908c5be4c841ce7a93cf0c8e9e6a8e5965':
Keep the emma classes if emma is enabled.
Ying Wang [Mon, 27 Aug 2012 23:01:38 +0000 (16:01 -0700)]
Keep the emma classes if emma is enabled.
Change-Id: Ie551d48532c61bf610b12875dc33cfe476625c5e
Ying Wang [Mon, 27 Aug 2012 22:29:46 +0000 (15:29 -0700)]
am
1035fe5c: am
cb616cf7: Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev
* commit '
1035fe5c1b0e170a0500b44879d0185402090a5d':
Automatically add Java resources carried by static Java libraries.
Ying Wang [Mon, 27 Aug 2012 22:28:11 +0000 (15:28 -0700)]
am
cb616cf7: Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev
* commit '
cb616cf73671028708c22bf76e47af515d12f485':
Automatically add Java resources carried by static Java libraries.
Ying Wang [Mon, 27 Aug 2012 22:25:11 +0000 (15:25 -0700)]
Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev
Ying Wang [Thu, 9 Aug 2012 22:20:50 +0000 (15:20 -0700)]
Automatically add Java resources carried by static Java libraries.
Bug:
6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f
Conflicts:
core/package.mk
The Android Open Source Project [Mon, 27 Aug 2012 22:20:28 +0000 (15:20 -0700)]
am
7e7c1a07: (-s ours) am
c1c571ec: am
28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
7e7c1a071f994e6ae5e3e45db2c014927676ee46':
JRO03U
JRO03T
JZO54
The Android Open Source Project [Mon, 27 Aug 2012 22:17:11 +0000 (15:17 -0700)]
am
c1c571ec: am
28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
c1c571ecbf9efe17dbab103d408007e83d94820f':
JRO03U
JRO03T
JZO54
The Android Open Source Project [Mon, 27 Aug 2012 22:13:12 +0000 (15:13 -0700)]
am
28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
28f37bb992853a877980ea0d1040df2e46ee71c1':
JRO03U
JRO03T
JZO54
The Android Open Source Project [Mon, 27 Aug 2012 21:10:49 +0000 (14:10 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Ibe50742a45ef532acf13f4edb8166b6e6c1ef30c
Chiao Cheng [Mon, 27 Aug 2012 20:57:41 +0000 (13:57 -0700)]
Merge "Adding new dialer application to core."
Chiao Cheng [Mon, 27 Aug 2012 20:44:56 +0000 (13:44 -0700)]
Adding new dialer application to core.
Bug:
6993891
Change-Id: I992d2da9a9468a803b45d956f7df16a741162787
Chris Wren [Mon, 27 Aug 2012 20:39:56 +0000 (16:39 -0400)]
Include stock Dreams in the build.
Change-Id: I61953eeb50f8f02845468bc11c723405d5641d7f
Chris Dearman [Thu, 2 Feb 2012 22:16:52 +0000 (14:16 -0800)]
Include all standard shared library paths in /system/lib
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ib33ce42532cc8cedc6f48036a257a2a225c82a69
The Android Automerger [Mon, 27 Aug 2012 19:52:54 +0000 (12:52 -0700)]
JRO03U
Ben Cheng [Mon, 27 Aug 2012 19:32:32 +0000 (12:32 -0700)]
am
0419b446: am
4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev
* commit '
0419b446598f0c3cbf46ef2f2973e043338ac988':
Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
Ben Cheng [Mon, 27 Aug 2012 19:30:36 +0000 (12:30 -0700)]
am
4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev
* commit '
4df0782b3adfd03c167111790fdf5a9de676080c':
Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
Ben Cheng [Mon, 27 Aug 2012 19:27:37 +0000 (12:27 -0700)]
Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev
Ben Cheng [Mon, 27 Aug 2012 19:20:36 +0000 (12:20 -0700)]
Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
Bug
7050760
Change-Id: I05e69b741eaf628ab1d25dec12a953f9f2a3d9a2
The Android Open Source Project [Sat, 25 Aug 2012 14:16:48 +0000 (07:16 -0700)]
am
ff1da09d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ff1da09d3b83e9e821bc51442905771a136dbca1':
JOO54E
JOO54D
JOO54C
JOO54B
JOO54
The Android Open Source Project [Sat, 25 Aug 2012 14:15:30 +0000 (07:15 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I65271947f0e7aef323f59617db1bb1a6744bf31e
Jean-Baptiste Queru [Fri, 24 Aug 2012 21:19:18 +0000 (14:19 -0700)]
am
5cbda9a8: am
414d7e85: am
dbf6ad06: am
713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
* commit '
5cbda9a80c23125ac1fa7d722d948fd59a79f793':
ARM: put crtbegin_so.o at the beginning where it belongs
The Android Automerger [Fri, 24 Aug 2012 20:23:58 +0000 (13:23 -0700)]
JRO03T
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:09:22 +0000 (13:09 -0700)]
am
414d7e85: am
dbf6ad06: am
713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
* commit '
414d7e859a93266c6069d33badd20b9061052806':
ARM: put crtbegin_so.o at the beginning where it belongs
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:06:42 +0000 (13:06 -0700)]
am
dbf6ad06: am
713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
* commit '
dbf6ad0692f98cacf27dc023854b2c5a5575a841':
ARM: put crtbegin_so.o at the beginning where it belongs
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:04:48 +0000 (13:04 -0700)]
am
713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
* commit '
713bac96d628d6ca040fb1fe5d7a8abdcb932553':
ARM: put crtbegin_so.o at the beginning where it belongs
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:00:10 +0000 (13:00 -0700)]
Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
The Android Automerger [Fri, 24 Aug 2012 17:32:57 +0000 (10:32 -0700)]
JOO54E
Ying Wang [Fri, 24 Aug 2012 16:55:05 +0000 (09:55 -0700)]
am
4084c112: am
2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev
* commit '
4084c112e5d073bd0d6875c45939ed7fba62ed14':
Filter out the overridden packages before doing required module expansion.
Ying Wang [Fri, 24 Aug 2012 16:53:47 +0000 (09:53 -0700)]
am
2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev
* commit '
2d39468bee1b2ab1f26e8da9cc0849cab86349ad':
Filter out the overridden packages before doing required module expansion.
Ying Wang [Fri, 24 Aug 2012 16:52:19 +0000 (09:52 -0700)]
Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:38:50 +0000 (07:38 -0700)]
am
d163c8ed: am
781a83ae: am
83af736f: am
5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '
d163c8eda25ff1c2e4de5a981331ab7e77aaeea1':
Fix reporting wrong error message for zipalign output file
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:36:50 +0000 (07:36 -0700)]
am
781a83ae: am
83af736f: am
5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '
781a83ae1261520d65a0f2a714c06bd1ac1917b7':
Fix reporting wrong error message for zipalign output file
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:30:00 +0000 (07:30 -0700)]
am
83af736f: am
5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '
83af736f28c03bcac552f83bc645433925135c7e':
Fix reporting wrong error message for zipalign output file
The Android Automerger [Fri, 24 Aug 2012 08:19:29 +0000 (01:19 -0700)]
JOO54D
The Android Automerger [Fri, 24 Aug 2012 04:31:01 +0000 (21:31 -0700)]
JZO54
The Android Automerger [Fri, 24 Aug 2012 04:30:08 +0000 (21:30 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Fri, 24 Aug 2012 00:52:52 +0000 (17:52 -0700)]
JOO54C
Jean-Baptiste Queru [Thu, 23 Aug 2012 22:09:15 +0000 (15:09 -0700)]
am
5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '
5ac65f869601df5e73fb84b67e57af8ef95cc3bf':
Fix reporting wrong error message for zipalign output file
Ying Wang [Thu, 23 Aug 2012 22:08:34 +0000 (15:08 -0700)]
Filter out the overridden packages before doing required module expansion.
Bug:
6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:52:40 +0000 (14:52 -0700)]
Merge "Fix reporting wrong error message for zipalign output file"
The Android Automerger [Thu, 23 Aug 2012 21:19:08 +0000 (14:19 -0700)]
JOO54B
Victoria Lease [Thu, 23 Aug 2012 19:01:25 +0000 (12:01 -0700)]
am
6a36e75d: am
f8c154f4: Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev
* commit '
6a36e75d63869f8adcd72c43364318118c3715f5':
getsdcardpath, getscreenshotpath, getlastscreenshot
Victoria Lease [Thu, 23 Aug 2012 18:59:32 +0000 (11:59 -0700)]
am
f8c154f4: Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev
* commit '
f8c154f4b0b402968a911bf2c00ea40d252ccb60':
getsdcardpath, getscreenshotpath, getlastscreenshot
Victoria Lease [Thu, 23 Aug 2012 18:58:01 +0000 (11:58 -0700)]
Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev
The Android Automerger [Thu, 23 Aug 2012 13:35:16 +0000 (06:35 -0700)]
JOO54
The Android Automerger [Thu, 23 Aug 2012 13:33:27 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Thu, 23 Aug 2012 01:30:51 +0000 (18:30 -0700)]
am
6ea5b287: am
685ae6dc: Merge "Allow target arch in tapas parameters." into jb-mr1-dev
* commit '
6ea5b28784235f6279d680c5f6c4d0504ac6b5d6':
Allow target arch in tapas parameters.
Ying Wang [Thu, 23 Aug 2012 01:28:49 +0000 (18:28 -0700)]
am
685ae6dc: Merge "Allow target arch in tapas parameters." into jb-mr1-dev
* commit '
685ae6dc36b1e4d003f90d499812270405f5e1f9':
Allow target arch in tapas parameters.
Ying Wang [Thu, 23 Aug 2012 01:27:08 +0000 (18:27 -0700)]
Merge "Allow target arch in tapas parameters." into jb-mr1-dev
The Android Open Source Project [Wed, 22 Aug 2012 22:37:15 +0000 (15:37 -0700)]
am
5b82523d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
5b82523d357ffbd542a7274601d2cece380a7e54':
JOO53B
JOO53
The Android Open Source Project [Wed, 22 Aug 2012 22:34:35 +0000 (15:34 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic793753dd46086b8966181ad8f540e104c1deacc
Ying Wang [Wed, 22 Aug 2012 22:27:37 +0000 (15:27 -0700)]
am
d19511a6: am
c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev
* commit '
d19511a6657efc7f1a7e544df04f076223f8fe65':
Support EMMA_INSTRUMENT in both full and unbundled builds.
Ying Wang [Wed, 22 Aug 2012 22:21:18 +0000 (15:21 -0700)]
am
c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev
* commit '
c3a4cfe9b5d241f605435b1b239d5d6b13226288':
Support EMMA_INSTRUMENT in both full and unbundled builds.
Ying Wang [Wed, 22 Aug 2012 22:19:28 +0000 (15:19 -0700)]
Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev