OSDN Git Service
Doug Zongker [Thu, 2 Aug 2012 22:17:15 +0000 (15:17 -0700)]
am
42caec28: am
1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev
* commit '
42caec28ab1393853c342a989ec844846235013f':
add extra args to mkbootimg
Keun young Park [Thu, 2 Aug 2012 22:09:30 +0000 (15:09 -0700)]
am
0eeeab73: am
15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
* commit '
0eeeab736e3047cec89d69d2e3f034bef83bbc60':
keep PLATFORM_ZIP specified explicitly
The Android Open Source Project [Thu, 2 Aug 2012 22:08:59 +0000 (15:08 -0700)]
am
f6b165e0: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f6b165e0232c315d91c3ba2c394da27234012fd9':
JOO33
JOO32C
JOO33
Doug Zongker [Thu, 2 Aug 2012 22:07:50 +0000 (15:07 -0700)]
am
1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev
* commit '
1e845d33af68673f0a6712c9c22dc2c37eebbc9d':
add extra args to mkbootimg
Doug Zongker [Thu, 2 Aug 2012 22:06:10 +0000 (15:06 -0700)]
Merge "add extra args to mkbootimg" into jb-mr1-dev
Doug Zongker [Thu, 2 Aug 2012 21:46:42 +0000 (14:46 -0700)]
add extra args to mkbootimg
Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations
of mkbootimg from within make, and to store it in the target_files so
it can be used by future invocations of img_from_target_files and
ota_from_target_files.
Bug:
6918260
Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1
Keun young Park [Thu, 2 Aug 2012 21:56:37 +0000 (14:56 -0700)]
am
15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
* commit '
15b2b0f711a824f4e4e8b72584b1fb8d19b3f123':
keep PLATFORM_ZIP specified explicitly
Keun young Park [Thu, 2 Aug 2012 21:29:05 +0000 (14:29 -0700)]
Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
Keun young Park [Thu, 2 Aug 2012 19:51:59 +0000 (12:51 -0700)]
keep PLATFORM_ZIP specified explicitly
- the old behaviour was to override with default one, which makes
trying different sets of platform.zip difficult if default one exists
Change-Id: I4c8ac2e44d9e7b48f77d628cce3edb20fbdf27e4
The Android Open Source Project [Thu, 2 Aug 2012 18:26:09 +0000 (11:26 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If85f28cdbccda3f78297d611fb01a38ee310e208
The Android Automerger [Thu, 2 Aug 2012 15:18:45 +0000 (08:18 -0700)]
JOO33
The Android Automerger [Thu, 2 Aug 2012 15:18:08 +0000 (08:18 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 2 Aug 2012 14:06:08 +0000 (07:06 -0700)]
JOO32C
The Android Automerger [Thu, 2 Aug 2012 14:00:53 +0000 (07:00 -0700)]
JOO33
The Android Automerger [Thu, 2 Aug 2012 14:00:32 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 22:42:40 +0000 (15:42 -0700)]
am
63776ca7: am
cdbf0292: Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev
* commit '
63776ca7d9c1014b629b382cc7126d2a6802ee6f':
add missing telephony libs for PDK mini config
Keun young Park [Wed, 1 Aug 2012 22:40:44 +0000 (15:40 -0700)]
am
cdbf0292: Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev
* commit '
cdbf0292e435b46c764c19cba956b5f2e0d70751':
add missing telephony libs for PDK mini config
Keun young Park [Wed, 1 Aug 2012 22:39:11 +0000 (15:39 -0700)]
Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev
The Android Open Source Project [Wed, 1 Aug 2012 22:15:44 +0000 (15:15 -0700)]
am
eaa83bbd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
eaa83bbd9ff40ff428ef0c6f5eea1f0ddf8a7ff4':
JOO32
The Android Open Source Project [Wed, 1 Aug 2012 22:13:27 +0000 (15:13 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I80d33df61bb9c1f1293c71d1d01a1e510e2ce693
Keun young Park [Wed, 1 Aug 2012 22:02:35 +0000 (15:02 -0700)]
add missing telephony libs for PDK mini config
Change-Id: I3a3b5d920a03e90a64d0fb78b168d9f6dac12a99
Roman Nurik [Wed, 1 Aug 2012 21:55:28 +0000 (14:55 -0700)]
am
2ff5d876: am
f5bd3bce: am
2461af44: am
c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit '
2ff5d8765ce1de04b8be8cdd4772ef42563e41ad':
Improve print stylesheet for d.a.c.
Keun young Park [Wed, 1 Aug 2012 21:52:54 +0000 (14:52 -0700)]
am
110f0f69: am
fad81e89: Merge "add symbol files to PDK release for debugging" into jb-mr1-dev
* commit '
110f0f69e99f9ef9fde26073b41da9ec01f4120f':
add symbol files to PDK release for debugging
Roman Nurik [Wed, 1 Aug 2012 21:52:39 +0000 (14:52 -0700)]
am
f5bd3bce: am
2461af44: am
c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit '
f5bd3bce6706a8662827e037337fb84608d9b67f':
Improve print stylesheet for d.a.c.
Keun young Park [Wed, 1 Aug 2012 21:49:45 +0000 (14:49 -0700)]
am
fad81e89: Merge "add symbol files to PDK release for debugging" into jb-mr1-dev
* commit '
fad81e8997ad73d805f903a656347bcc863b69f5':
add symbol files to PDK release for debugging
Roman Nurik [Wed, 1 Aug 2012 21:48:36 +0000 (14:48 -0700)]
am
2461af44: am
c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit '
2461af44c1c1e2684b56e7c9c62fb69cc42b10e5':
Improve print stylesheet for d.a.c.
Keun young Park [Wed, 1 Aug 2012 20:08:55 +0000 (13:08 -0700)]
Merge "add symbol files to PDK release for debugging" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 00:13:20 +0000 (17:13 -0700)]
add symbol files to PDK release for debugging
- app_process is not in PDK, and this makes native debugging difficult
So provide symbol file instead of source
Bug:
6774048
Change-Id: I1a3a86cf64d8f1d22cdb3a22714f508de963099b
Roman Nurik [Wed, 1 Aug 2012 19:41:10 +0000 (12:41 -0700)]
am
c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit '
c9e30dce7c7709a1d8b54bd9f2037e5fc8ff992f':
Improve print stylesheet for d.a.c.
Roman Nurik [Wed, 1 Aug 2012 19:39:18 +0000 (12:39 -0700)]
Merge "Improve print stylesheet for d.a.c." into jb-dev
Roman Nurik [Wed, 1 Aug 2012 17:37:40 +0000 (10:37 -0700)]
Improve print stylesheet for d.a.c.
- Improve printed page margins
- Hide navigational elements
- Print link URLs
- Improve spacing on key elements
Change-Id: Ic487e00636b1d06f15d7a29b4162c9e31f5569b1
Scott Main [Wed, 1 Aug 2012 19:18:29 +0000 (12:18 -0700)]
am
6ac86dc2: am
72972445: am
b736e07c: am
2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.
* commit '
6ac86dc231f6006374fb95978340e2fd98c0b8c9':
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Scott Main [Wed, 1 Aug 2012 19:16:34 +0000 (12:16 -0700)]
am
72972445: am
b736e07c: am
2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.
* commit '
72972445f24edd218db45df51045091455b63b7a':
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Scott Main [Wed, 1 Aug 2012 19:15:24 +0000 (12:15 -0700)]
am
b736e07c: am
2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.
* commit '
b736e07cbb9b0b3c0ccdc6352a10b36d244aebbc':
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Scott Main [Wed, 1 Aug 2012 19:12:51 +0000 (12:12 -0700)]
am
2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.
* commit '
2ccbd3f8d44bbc9b7a542144751767fe093083e7':
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Scott Main [Wed, 1 Aug 2012 19:05:12 +0000 (12:05 -0700)]
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Change-Id: Iccde983bf31338752f83ac72c0cdc543b4faf12a
The Android Automerger [Wed, 1 Aug 2012 14:18:49 +0000 (07:18 -0700)]
JOO32
The Android Automerger [Wed, 1 Aug 2012 14:18:30 +0000 (07:18 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Tue, 31 Jul 2012 22:04:04 +0000 (15:04 -0700)]
am
a6db845d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a6db845d24104eca99a0174af9fcaa713e838517':
JOO31B
JOO31
The Android Open Source Project [Tue, 31 Jul 2012 22:02:29 +0000 (15:02 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2c181ef0dd06df0086bd941ccf69b5c6aca437d0
The Android Open Source Project [Tue, 31 Jul 2012 21:53:26 +0000 (14:53 -0700)]
am
768ebe51: (-s ours) am
2a5f755a: am
8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
768ebe51f4490cd8a84a42b13f84ba5e6a366d11':
JZO31
JRO03N
JRO03M
The Android Open Source Project [Tue, 31 Jul 2012 21:51:16 +0000 (14:51 -0700)]
am
2a5f755a: am
8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
2a5f755a794b2ce4d4027804bcb1af6ece714933':
JZO31
JRO03N
JRO03M
The Android Open Source Project [Tue, 31 Jul 2012 21:49:13 +0000 (14:49 -0700)]
am
8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
8665eb732364b31506719dcce99237e13cc87866':
JZO31
JRO03N
JRO03M
The Android Open Source Project [Tue, 31 Jul 2012 21:47:40 +0000 (14:47 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I62fe0d8e8c927ef31e1d3cd44775a7018828af95
Ying Wang [Tue, 31 Jul 2012 21:16:05 +0000 (14:16 -0700)]
Merge "Allow Java resource in apk."
The Android Automerger [Tue, 31 Jul 2012 21:08:19 +0000 (14:08 -0700)]
JZO31
The Android Automerger [Tue, 31 Jul 2012 21:07:00 +0000 (14:07 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 31 Jul 2012 20:09:31 +0000 (13:09 -0700)]
JOO31B
Scott Main [Tue, 31 Jul 2012 19:49:13 +0000 (12:49 -0700)]
am
ff8d3674: am
37132103: am
a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev
* commit '
ff8d3674abc99c0c45543ade969aec803a71177a':
add script to create links on topic landing page for first doc that use the doc's title
Scott Main [Tue, 31 Jul 2012 19:47:42 +0000 (12:47 -0700)]
am
37132103: am
a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev
* commit '
37132103a2d60c7ceb0ede1f34d8b3c633d7c09e':
add script to create links on topic landing page for first doc that use the doc's title
Scott Main [Tue, 31 Jul 2012 19:45:28 +0000 (12:45 -0700)]
am
a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev
* commit '
a8d7485de2d43e2c9c77ed62638174742bc66d1f':
add script to create links on topic landing page for first doc that use the doc's title
Scott Main [Tue, 31 Jul 2012 19:43:28 +0000 (12:43 -0700)]
Merge "add script to create links on topic landing page for first doc that use the doc's title" into jb-dev
Ying Wang [Tue, 31 Jul 2012 16:40:00 +0000 (09:40 -0700)]
Allow Java resource in apk.
Bug:
6892294
Change-Id: I093bddf7326d600689ff2ec3318741a5270751cc
The Android Automerger [Tue, 31 Jul 2012 15:18:14 +0000 (08:18 -0700)]
JRO03N
The Android Open Source Project [Tue, 31 Jul 2012 14:51:15 +0000 (07:51 -0700)]
Sync with jb-mr1-dev
Change-Id: I31e76b5a358c14d5194eaf02b08a728d1ca9b4c5
The Android Automerger [Tue, 31 Jul 2012 14:35:49 +0000 (07:35 -0700)]
JOO31
The Android Automerger [Tue, 31 Jul 2012 14:35:14 +0000 (07:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dianne Hackborn [Tue, 31 Jul 2012 00:38:04 +0000 (17:38 -0700)]
This branch is now JB MR1 development.
Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
Scott Main [Fri, 27 Jul 2012 01:00:14 +0000 (18:00 -0700)]
add script to create links on topic landing page for first doc that use the doc's title
Change-Id: Iec86a5b9fa7dcd9246d6e8958f17e0022e0963a8
The Android Automerger [Mon, 30 Jul 2012 22:51:31 +0000 (15:51 -0700)]
JRO03M
The Android Open Source Project [Mon, 30 Jul 2012 22:03:25 +0000 (15:03 -0700)]
Reconcile with jb-mr1-release
Change-Id: I8a58307dd78dc6fa26d197408853e4f717b5bae9
The Android Automerger [Mon, 30 Jul 2012 16:46:30 +0000 (09:46 -0700)]
JOO30B
The Android Automerger [Mon, 30 Jul 2012 16:45:58 +0000 (09:45 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 30 Jul 2012 14:15:33 +0000 (07:15 -0700)]
JOO30
Ed Heyl [Mon, 30 Jul 2012 05:37:03 +0000 (22:37 -0700)]
am
68bd94e2: am
3d71b0c7: Merge "Add new vendors" into jb-mr1-dev
* commit '
68bd94e288985af0de983950e6fb98bfea62f19f':
Add new vendors
Ed Heyl [Mon, 30 Jul 2012 05:33:18 +0000 (22:33 -0700)]
am
3d71b0c7: Merge "Add new vendors" into jb-mr1-dev
* commit '
3d71b0c7e2c28008ba9658df0138008d66bd5d4a':
Add new vendors
Ed Heyl [Sun, 29 Jul 2012 23:35:27 +0000 (16:35 -0700)]
Merge "Add new vendors" into jb-mr1-dev
Shih-wei Liao [Sun, 29 Jul 2012 18:15:48 +0000 (11:15 -0700)]
am
06f20f02: am
b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.
* commit '
06f20f0253bcbf7fd3079f6f80413aaabf91732d':
Add "abcc" (bitcode compiler) and "libportable" into system.img.
Shih-wei Liao [Sun, 29 Jul 2012 18:13:35 +0000 (11:13 -0700)]
am
b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.
* commit '
b09d26a496609fd569e94f2cfbb289ba5ea4c247':
Add "abcc" (bitcode compiler) and "libportable" into system.img.
Shih-wei Liao [Sat, 28 Jul 2012 01:04:07 +0000 (18:04 -0700)]
Add "abcc" (bitcode compiler) and "libportable" into system.img.
BUG=
6886348. NDK on llvm requires bitcode compiler and libportable.
Change-Id: I6d45575518f312860e99e87d7b6eabc4ae7802fd
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:41:30 +0000 (15:41 -0700)]
Add new vendors
Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e
Elliott Hughes [Fri, 27 Jul 2012 23:24:29 +0000 (16:24 -0700)]
am
7450e4f7: am
b286b76d: am
f833e0a7: am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
7450e4f7e6c2f6f78ddd8197606ebb807ca54dba':
Now zoneinfo prebuilts are Android modules.
The Android Open Source Project [Fri, 27 Jul 2012 23:23:41 +0000 (16:23 -0700)]
am
749ba850: am
b1418f47: am
024e9ab7: Reconcile with jb-mr0-release jb-release
* commit '
749ba85040ce608c8cc92207a7503249110fd706':
JZO26
JRO03L
JRO03K
JRO03J
JRO24
JRO03I
JZO24
Elliott Hughes [Fri, 27 Jul 2012 22:55:35 +0000 (15:55 -0700)]
am
b286b76d: am
f833e0a7: am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
b286b76da7d0b3de6f12664aad0cdc146c736cd1':
Now zoneinfo prebuilts are Android modules.
Elliott Hughes [Fri, 27 Jul 2012 22:51:16 +0000 (15:51 -0700)]
am
f833e0a7: am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
f833e0a780d576be76520c1d0b51035f589cec0b':
Now zoneinfo prebuilts are Android modules.
The Android Open Source Project [Fri, 27 Jul 2012 22:49:17 +0000 (15:49 -0700)]
am
b1418f47: am
024e9ab7: Reconcile with jb-mr0-release jb-release
* commit '
b1418f47dcf37c3d50b7c76e657ac00ce47d0618':
JZO26
JRO03L
JRO03K
JRO03J
JRO24
JRO03I
JZO24
Elliott Hughes [Fri, 27 Jul 2012 22:47:34 +0000 (15:47 -0700)]
am
b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."
* commit '
b9c2a66a4897b9be02d53f36bf9d212141c2dfb0':
Now zoneinfo prebuilts are Android modules.
The Android Open Source Project [Fri, 27 Jul 2012 22:47:19 +0000 (15:47 -0700)]
am
3166fd6a: Reconcile with jb-mr1-release
* commit '
3166fd6ad9a893f26e4f881328243fdfd8c6c029':
JOO26B
JOO26
JOO25
JOO24B
JOO24
The Android Open Source Project [Fri, 27 Jul 2012 22:45:19 +0000 (15:45 -0700)]
am
024e9ab7: Reconcile with jb-mr0-release jb-release
* commit '
024e9ab796609334a209062d449ddb4a73eb925e':
JZO26
JRO03L
JRO03K
JRO03J
JRO24
JRO03I
JZO24
The Android Open Source Project [Fri, 27 Jul 2012 22:44:32 +0000 (15:44 -0700)]
Reconcile with jb-mr1-release
Change-Id: I9132cf02a61b153013bd0c7e8d2a5e9dd3161ca4
The Android Open Source Project [Fri, 27 Jul 2012 21:49:57 +0000 (14:49 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: I8b44c9fafc5d0a2c0d6ad959c5e2ed0ae02b3f54
Elliott Hughes [Fri, 27 Jul 2012 21:14:57 +0000 (14:14 -0700)]
Merge "Now zoneinfo prebuilts are Android modules."
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.
(cherry-picked from
101d32ebb80f5f015781b98cb53739e8ad933cb4.)
Bug:
6857263
Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:21:43 +0000 (10:21 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:16:49 +0000 (10:16 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:14:48 +0000 (10:14 -0700)]
Jean-Baptiste Queru [Fri, 27 Jul 2012 17:05:22 +0000 (10:05 -0700)]
Merge "Fix build."
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
The Android Automerger [Fri, 27 Jul 2012 00:50:34 +0000 (17:50 -0700)]
JZO26
The Android Automerger [Fri, 27 Jul 2012 00:49:20 +0000 (17:49 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]
JRO03L
Ying Wang [Thu, 26 Jul 2012 22:56:13 +0000 (15:56 -0700)]
Now zoneinfo prebuilts are Android modules.
Bug:
6857263
Change-Id: I793f596926de485646ed9724d2b365a51fcf489f
Ying Wang [Thu, 26 Jul 2012 22:33:07 +0000 (15:33 -0700)]
am
89fa2850: Add clean step to introduce the newly added BUILD_EMULATOR.
* commit '
89fa2850cc3fd602b5ec2d049516459b6348f8b6':
Add clean step to introduce the newly added BUILD_EMULATOR.
Ying Wang [Thu, 26 Jul 2012 22:28:43 +0000 (15:28 -0700)]
Add clean step to introduce the newly added BUILD_EMULATOR.
Change-Id: I0de0625a12af0b98d6288df03024268326b909bf
Ying Wang [Thu, 26 Jul 2012 22:16:02 +0000 (15:16 -0700)]
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
The Android Automerger [Thu, 26 Jul 2012 17:28:15 +0000 (10:28 -0700)]
JOO26B
Ying Wang [Thu, 26 Jul 2012 17:15:21 +0000 (10:15 -0700)]
Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
Ed Heyl [Thu, 26 Jul 2012 15:04:38 +0000 (08:04 -0700)]
am
f8a30598: resolved conflict in mergre to goog/master
* commit '
f8a30598925855cb387511d32a5b3388ebc908c8':
Joe Onorato [Thu, 26 Jul 2012 15:04:29 +0000 (08:04 -0700)]
OSDN Git Service
