OSDN Git Service
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:56:29 +0000 (15:56 -0700)]
am
06b1a47f: am
d3d78a30: am
a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
* commit '
06b1a47fe19699e8cb94fd6a007f82f3b41119fe':
gcc 4.6 requires --copy-dt-needed-entries
Ying Wang [Tue, 12 Jun 2012 22:52:58 +0000 (15:52 -0700)]
Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK.
Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:52:54 +0000 (15:52 -0700)]
am
d3d78a30: am
a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
* commit '
d3d78a30a4f8dd40fa055577ea2708ab34606cec':
gcc 4.6 requires --copy-dt-needed-entries
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:50:19 +0000 (15:50 -0700)]
am
a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
* commit '
a11ad6c2b3cdf13581c4329679cd3d2952323f6d':
gcc 4.6 requires --copy-dt-needed-entries
Stephen Hines [Tue, 12 Jun 2012 22:38:21 +0000 (15:38 -0700)]
Merge "EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds."
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:24:17 +0000 (15:24 -0700)]
Merge "gcc 4.6 requires --copy-dt-needed-entries"
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:16:28 +0000 (15:16 -0700)]
am
12d24b5a: resolved conflicts for merge of
76af0657 to jb-dev-plus-aosp
* commit '
12d24b5aaba0752239401fc2c8b579e3b8ae97dd':
full_x86: use telephony profile
Jean-Baptiste Queru [Tue, 12 Jun 2012 21:57:27 +0000 (14:57 -0700)]
resolved conflicts for merge of
76af0657 to jb-dev-plus-aosp
Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
Jean-Baptiste Queru [Tue, 12 Jun 2012 21:43:56 +0000 (14:43 -0700)]
am
0c6b27fe: Merge "full_x86: use telephony profile"
* commit '
0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd':
full_x86: use telephony profile
Jean-Baptiste Queru [Tue, 12 Jun 2012 21:36:04 +0000 (14:36 -0700)]
Merge "full_x86: use telephony profile"
Bruce Beare [Tue, 1 May 2012 21:38:18 +0000 (14:38 -0700)]
full_x86: use telephony profile
Author: Bruce Beare <bruce.j.beare@intel.com>
Change-Id: I3c086f3f38049e9a7cc2e653aa0ee0d2a2ca1a79
Stephen Hines [Mon, 11 Jun 2012 21:53:34 +0000 (14:53 -0700)]
EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds.
Change-Id: I463217aef573a28069469514ad94cd85a7f38bea
Jamie Gennis [Tue, 12 Jun 2012 20:14:45 +0000 (13:14 -0700)]
am
82c11cac: am
f3b1395a: Merge "Add atrace to core.mk" into jb-dev
* commit '
82c11caca04bc4e14e0a33057f484635dc1ae8dc':
Add atrace to core.mk
Jamie Gennis [Tue, 12 Jun 2012 19:41:26 +0000 (12:41 -0700)]
am
f3b1395a: Merge "Add atrace to core.mk" into jb-dev
* commit '
f3b1395a41a1f882fac74b8a55723af8f77535d0':
Add atrace to core.mk
Jean-Baptiste Queru [Tue, 12 Jun 2012 15:07:50 +0000 (08:07 -0700)]
am
ddb70678: am
5b7633be: am
06e515dd: Merge "This patch addresses the following issues:"
* commit '
ddb706785bd96fe7b450779ab41d1276939ee9fa':
This patch addresses the following issues:
Jean-Baptiste Queru [Tue, 12 Jun 2012 15:05:22 +0000 (08:05 -0700)]
am
5b7633be: am
06e515dd: Merge "This patch addresses the following issues:"
* commit '
5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
This patch addresses the following issues:
Jean-Baptiste Queru [Tue, 12 Jun 2012 15:02:30 +0000 (08:02 -0700)]
am
06e515dd: Merge "This patch addresses the following issues:"
* commit '
06e515dd77731c1752b2ea3b1b586bcd893f0927':
This patch addresses the following issues:
Jean-Baptiste Queru [Tue, 12 Jun 2012 14:47:48 +0000 (07:47 -0700)]
Merge "This patch addresses the following issues:"
Ying Wang [Mon, 11 Jun 2012 23:43:40 +0000 (16:43 -0700)]
Don't build userdata.img in tests build.
Bug:
6035501
Change-Id: Ie1a0804f7fcc54383f2d8b97ac4583000e67cec5
Jamie Gennis [Mon, 11 Jun 2012 19:04:24 +0000 (12:04 -0700)]
Merge "Add atrace to core.mk" into jb-dev
The Android Open Source Project [Mon, 11 Jun 2012 16:23:02 +0000 (09:23 -0700)]
am
40b72470: Reconcile with jb-release
* commit '
40b72470c1c65d1febf18d3c5731bb4d2d27a284':
JRN72
JRN69D
JRN69C
JRN69B
JRN69
JRN68B
The Android Open Source Project [Mon, 11 Jun 2012 16:20:38 +0000 (09:20 -0700)]
Reconcile with jb-release
Change-Id: Ib5c6014cd943de49130829c7c7c68eebdaccd1f9
The Android Automerger [Mon, 11 Jun 2012 14:09:29 +0000 (07:09 -0700)]
JRN72
The Android Automerger [Mon, 11 Jun 2012 13:59:30 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 8 Jun 2012 22:52:35 +0000 (15:52 -0700)]
JRN69D
Jamie Gennis [Thu, 7 Jun 2012 23:40:30 +0000 (16:40 -0700)]
Add atrace to core.mk
This change adds the atrace binary and init.trace.rc to the system image for
all builds.
Bug:
6513400
Change-Id: Ib979f4b6ffe799ab56e66fc3acfad754d216c576
The Android Automerger [Fri, 8 Jun 2012 21:17:42 +0000 (14:17 -0700)]
JRN69C
The Android Automerger [Fri, 8 Jun 2012 18:41:12 +0000 (11:41 -0700)]
JRN69B
Eino-Ville Talvala [Fri, 8 Jun 2012 16:40:30 +0000 (09:40 -0700)]
am
5b401f8b: am
e245ecdc: Merge "Add LegacyCamera to SDK product" into jb-dev
* commit '
5b401f8b8b8d498a87dcfcfc29e00746c794e70d':
Add LegacyCamera to SDK product
Ying Wang [Fri, 8 Jun 2012 16:37:54 +0000 (09:37 -0700)]
resolved conflicts for merge of
5c0ee702 to master
Change-Id: I6bdcc87482c45988d410a4c4d0abc43a1416277e
Eino-Ville Talvala [Fri, 8 Jun 2012 16:34:52 +0000 (09:34 -0700)]
am
e245ecdc: Merge "Add LegacyCamera to SDK product" into jb-dev
* commit '
e245ecdc0a87fb198894995ffbc4e6fec8d812f8':
Add LegacyCamera to SDK product
Eino-Ville Talvala [Fri, 8 Jun 2012 16:32:27 +0000 (09:32 -0700)]
Merge "Add LegacyCamera to SDK product" into jb-dev
Ying Wang [Fri, 8 Jun 2012 16:27:08 +0000 (09:27 -0700)]
am
79d39a30: am
874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"
* commit '
79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b':
Fix generic build on Max OS X 10.7 Lion
Ying Wang [Fri, 8 Jun 2012 16:24:19 +0000 (09:24 -0700)]
am
874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"
* commit '
874563f92e18d54d9088408104cc28d35971f189':
Fix generic build on Max OS X 10.7 Lion
Ying Wang [Fri, 8 Jun 2012 16:00:05 +0000 (09:00 -0700)]
Merge "Fix generic build on Max OS X 10.7 Lion"
The Android Automerger [Fri, 8 Jun 2012 15:27:09 +0000 (08:27 -0700)]
JRN69
The Android Automerger [Fri, 8 Jun 2012 15:15:37 +0000 (08:15 -0700)]
merge in jb-release history after reset to jb-dev
SangWook Han [Fri, 8 Jun 2012 05:55:05 +0000 (14:55 +0900)]
Fix generic build on Max OS X 10.7 Lion
Recover variable build_mac_version which is removed on
commit
644dc16 and added on commit
9ce06f1.
Without this, ranlib libSDL.a is executed on Lion which
causes build fail of emulator-arm.
Change-Id: I06144a288921f8f968ef457999398c1b9152d4aa
Ying Wang [Thu, 7 Jun 2012 03:33:26 +0000 (20:33 -0700)]
Tweak cflags for building with SDK 10.6.
Change-Id: I4db9949577591ef6756812769f04cfaddd876faf
Keun young Park [Thu, 7 Jun 2012 23:34:25 +0000 (16:34 -0700)]
am
fe8cddea: am
efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
* commit '
fe8cddea28bc5a5266ede2bd10b482dbe840c0bf':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
Keun young Park [Thu, 7 Jun 2012 23:31:14 +0000 (16:31 -0700)]
am
efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
* commit '
efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
The Android Automerger [Thu, 7 Jun 2012 22:55:50 +0000 (15:55 -0700)]
JRN68B
Keun young Park [Thu, 7 Jun 2012 00:19:29 +0000 (17:19 -0700)]
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media
Bug:
6623618
Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
Raphael Moll [Thu, 7 Jun 2012 20:12:04 +0000 (13:12 -0700)]
am
748f9e38: am
b53a073d: am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
748f9e3804834610a59081db4c2952dcb7ee00d4':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 20:08:58 +0000 (13:08 -0700)]
am
b53a073d: am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
b53a073ddb3a5036f41ea2956792991b7a46da02':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 20:06:23 +0000 (13:06 -0700)]
am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
e375c940b9210ea514227b0ee8cfb896d7f11d93':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 19:26:08 +0000 (12:26 -0700)]
Merge "SDK: Use "strip -x" for atree."
Ying Wang [Thu, 7 Jun 2012 19:03:46 +0000 (12:03 -0700)]
am
f1e424a6: am
3da13457: am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
f1e424a63658eb15ba61ca2eb8f0df38733188fe':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 19:02:06 +0000 (12:02 -0700)]
am
3da13457: am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
3da13457cfa46cf7d46b57c00f387c7c310b2dba':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 19:00:21 +0000 (12:00 -0700)]
am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
4b030617e74405779c657b98fa2b2e521adf4908':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 18:25:37 +0000 (11:25 -0700)]
Merge "XCode 4.3+ compatibility check-in"
Al Sutton [Thu, 7 Jun 2012 18:10:13 +0000 (19:10 +0100)]
XCode 4.3+ compatibility check-in
XCode 4.3 and later use a different location for SDKs. This check in
ensures the build checks for the new location as well as the old one.
Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241
Signed-off-by: Al Sutton <al@funkyandroid.com>
Nick Kralevich [Thu, 7 Jun 2012 16:45:59 +0000 (09:45 -0700)]
Merge "arm: add -D_FORTIFY_SOURCE=1 to the default cflags"
Nick Kralevich [Mon, 4 Jun 2012 22:30:24 +0000 (15:30 -0700)]
arm: add -D_FORTIFY_SOURCE=1 to the default cflags
Add additional compile and runtime buffer overflow detection to
Android. As of today, Android supports additional buffer overflow
detection for the following libc functions:
* memcpy
* memmove
* strcpy
* strcat
* strncpy
* strncat
Support for additional functions will be added to bionic libc in
future code changes.
Please see
* http://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html
* http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
for information on these features.
Change-Id: I1a281a4bac20009f4730dd8d8b798fa107576230
The Android Open Source Project [Thu, 7 Jun 2012 14:51:44 +0000 (07:51 -0700)]
am
9561c9cc: Reconcile with jb-release nakasi-factoryrom-release
* commit '
9561c9cc767ef34f692da62211c0d2488d31966c':
JRN68
JRN67D
JRN67C
JRN67B
JRN67
JRN66C
JRN66B
JRN66
JRN65B
JRN65
JRN64
JFN53N take two
JFN53N
JFN53M
JRN61B
JRN61
JFN53L
JFN53K
JRN60B
The Android Open Source Project [Thu, 7 Jun 2012 14:48:48 +0000 (07:48 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ifb66dc982a827827f324018084f0c6f191cb3769
The Android Automerger [Thu, 7 Jun 2012 14:09:17 +0000 (07:09 -0700)]
JRN68
The Android Automerger [Thu, 7 Jun 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Raphael Moll [Thu, 7 Jun 2012 02:33:31 +0000 (19:33 -0700)]
SDK: Use "strip -x" for atree.
Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.
Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
The Android Automerger [Wed, 6 Jun 2012 23:50:19 +0000 (16:50 -0700)]
JRN67D
The Android Automerger [Wed, 6 Jun 2012 23:14:11 +0000 (16:14 -0700)]
JRN67C
Keun young Park [Wed, 6 Jun 2012 22:55:05 +0000 (15:55 -0700)]
am
d3da15a5: am
6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '
d3da15a5eec963e03441d17725b925226c89193f':
add mini.mk for common configurations for mini products
Keun young Park [Wed, 6 Jun 2012 22:51:24 +0000 (15:51 -0700)]
am
6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '
6aae80a8d500084466c7e6d90769dda9a5b20507':
add mini.mk for common configurations for mini products
Keun young Park [Wed, 6 Jun 2012 22:47:24 +0000 (15:47 -0700)]
Merge "add mini.mk for common configurations for mini products" into jb-dev
Keun young Park [Mon, 4 Jun 2012 17:47:31 +0000 (10:47 -0700)]
add mini.mk for common configurations for mini products
- it is used for generic pdk release
Bug:
6540216
Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
Ying Wang [Wed, 6 Jun 2012 16:47:25 +0000 (09:47 -0700)]
am
f521a8e8: am
6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev
* commit '
f521a8e888a425dcd5fff70d18d14c9324e2d3aa':
Clean common intermediate files if overlay changed
Ying Wang [Wed, 6 Jun 2012 16:44:17 +0000 (09:44 -0700)]
am
6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev
* commit '
6afbda9f07821deed6eb110247ab56fb47dfc775':
Clean common intermediate files if overlay changed
Ying Wang [Wed, 6 Jun 2012 16:41:10 +0000 (09:41 -0700)]
Merge "Clean common intermediate files if overlay changed" into jb-dev
The Android Automerger [Wed, 6 Jun 2012 16:13:38 +0000 (09:13 -0700)]
JRN67B
The Android Automerger [Wed, 6 Jun 2012 14:08:29 +0000 (07:08 -0700)]
JRN67
The Android Automerger [Wed, 6 Jun 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 5 Jun 2012 23:25:02 +0000 (16:25 -0700)]
JRN66C
Joe Onorato [Tue, 5 Jun 2012 23:06:45 +0000 (16:06 -0700)]
am
d7d0afca: Add the ability in a product spec file to have modules installed for specific variants.
* commit '
d7d0afcaea24b0fb0cb37dca921a5ff52fd2485b':
Add the ability in a product spec file to have modules installed for specific variants.
Alon Albert [Tue, 5 Jun 2012 23:01:32 +0000 (16:01 -0700)]
am
e79fbc3b: Add support for building specific modules with mmm using the following syntax: Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words:
* commit '
e79fbc3bcceba381383e0bc0acbbe3df49d5682a':
Add support for building specific modules with mmm using the following syntax: Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words:
Joe Onorato [Tue, 5 Jun 2012 22:54:09 +0000 (15:54 -0700)]
Add the ability in a product spec file to have modules installed for specific variants.
Change-Id: Ifa5eb2e15b3d3e5007378ec00efc4aec3e9a3b99
Alon Albert [Wed, 30 Nov 2011 20:40:19 +0000 (12:40 -0800)]
Add support for building specific modules with mmm using the following syntax:
Build all modules: mmm dir
Build a single module: mmm dir:module
Build multiple modules: mmm dir:module1,module2
Or in other words:
Change-Id: I2bb91205ed31fda0cb88d8e584bbae63044962a5
Ying Wang [Tue, 5 Jun 2012 22:44:21 +0000 (15:44 -0700)]
resolved conflicts for merge of
9f4d00b9 to master
Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5
Raghu Gandham [Tue, 5 Jun 2012 22:33:37 +0000 (15:33 -0700)]
This patch addresses the following issues:
1. Fix a typo.
2. Include libffi in the MIPS list of Product Packages.
3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
Ying Wang [Tue, 5 Jun 2012 22:25:39 +0000 (15:25 -0700)]
am
e534e2eb: am
47450542: Merge "Use Mac OS X SDK 10.6."
* commit '
e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
Use Mac OS X SDK 10.6.
Ying Wang [Tue, 5 Jun 2012 22:23:30 +0000 (15:23 -0700)]
am
47450542: Merge "Use Mac OS X SDK 10.6."
* commit '
47450542a3d07eb79c80035c701638b1f07eb1c0':
Use Mac OS X SDK 10.6.
Ying Wang [Tue, 5 Jun 2012 22:14:52 +0000 (15:14 -0700)]
Merge "Use Mac OS X SDK 10.6."
Ying Wang [Fri, 25 May 2012 22:14:12 +0000 (15:14 -0700)]
Use Mac OS X SDK 10.6.
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
Eino-Ville Talvala [Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)]
Add LegacyCamera to SDK product
Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
Ying Wang [Tue, 5 Jun 2012 18:36:09 +0000 (11:36 -0700)]
We want to clean *darwin-x86* obj files.
Change-Id: Iec204cfe39cde5434a8d09d8328d315d3c9abfcb
Ying Wang [Tue, 5 Jun 2012 18:20:54 +0000 (11:20 -0700)]
Merge "Use Mac OS X SDK 10.6."
The Android Automerger [Tue, 5 Jun 2012 17:47:19 +0000 (10:47 -0700)]
JRN66B
Jean-Baptiste Queru [Tue, 5 Jun 2012 16:55:14 +0000 (09:55 -0700)]
am
c9f8b8d1: am
90beb4f1: Add some known binary owners
* commit '
c9f8b8d17ea17f722157aa58014dc1f1168996c1':
Add some known binary owners
Jean-Baptiste Queru [Tue, 5 Jun 2012 15:23:19 +0000 (08:23 -0700)]
am
90beb4f1: Add some known binary owners
* commit '
90beb4f155f9e0a7508854ded5b2c3dd87d702f5':
Add some known binary owners
Jean-Baptiste Queru [Tue, 5 Jun 2012 15:08:03 +0000 (08:08 -0700)]
Add some known binary owners
Bug:
6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
The Android Automerger [Tue, 5 Jun 2012 14:00:37 +0000 (07:00 -0700)]
JRN66
The Android Automerger [Tue, 5 Jun 2012 13:59:01 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Fri, 25 May 2012 04:05:19 +0000 (21:05 -0700)]
Clean common intermediate files if overlay changed
This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.
This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.
Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
The Android Automerger [Mon, 4 Jun 2012 22:36:50 +0000 (15:36 -0700)]
JRN65B
The Android Automerger [Mon, 4 Jun 2012 13:08:33 +0000 (06:08 -0700)]
JRN65
The Android Automerger [Mon, 4 Jun 2012 12:59:24 +0000 (05:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 3 Jun 2012 13:12:07 +0000 (06:12 -0700)]
JRN64
The Android Automerger [Sun, 3 Jun 2012 12:59:39 +0000 (05:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 2 Jun 2012 16:28:34 +0000 (09:28 -0700)]
am
0fb728b6: am
28a18175: Don\'t use .. to reference the target file.
* commit '
0fb728b65ab2199e0273af1217711aa46d6504c6':
Don't use .. to reference the target file.
Ying Wang [Sat, 2 Jun 2012 16:26:47 +0000 (09:26 -0700)]
am
28a18175: Don\'t use .. to reference the target file.
* commit '
28a181759079c34f8776f98f553e56554b527069':
Don't use .. to reference the target file.
Ying Wang [Sat, 2 Jun 2012 16:22:31 +0000 (09:22 -0700)]
Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61