OSDN Git Service
Scott Main [Wed, 25 Jul 2012 05:05:48 +0000 (22:05 -0700)]
am
42950013: am
54d2a9b9: add bottom-margin to div-based notes
* commit '
42950013b7b80a085443d99c1676912f1398b752':
add bottom-margin to div-based notes
Scott Main [Wed, 25 Jul 2012 05:01:18 +0000 (22:01 -0700)]
am
54d2a9b9: add bottom-margin to div-based notes
* commit '
54d2a9b9ec90d3e4697f7915a183d8cfcc7e20b0':
add bottom-margin to div-based notes
Scott Main [Tue, 24 Jul 2012 21:54:32 +0000 (14:54 -0700)]
add bottom-margin to div-based notes
Change-Id: I4c74ab362b00bfb68093a975171f777e3fb5eef9
Scott Main [Tue, 24 Jul 2012 02:52:35 +0000 (19:52 -0700)]
am
905a015c: am
06cb5c73: Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
* commit '
905a015c99816122e92d5e59f02efab8e2194958':
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
Ying Wang [Tue, 24 Jul 2012 02:49:48 +0000 (19:49 -0700)]
resolved conflicts for merge of
a8df6091 to master
Change-Id: I2d088c09738b34f72c2efa030304fca28ad0e791
Scott Main [Mon, 23 Jul 2012 21:38:57 +0000 (14:38 -0700)]
am
06cb5c73: Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
* commit '
06cb5c73f3f62a2da0138d3f55e19c47a2632182':
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
Scott Main [Mon, 23 Jul 2012 21:34:34 +0000 (14:34 -0700)]
Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
Change-Id: I0283e2634713d3fb6c99b465687c605e32a776f3
Ying Wang [Mon, 23 Jul 2012 17:32:54 +0000 (10:32 -0700)]
am
28437aac: Add LOCAL_SOURCE_FILES_ALL_GENERATED support
* commit '
28437aac999eb04d1698d9a6de87a25b5b772da6':
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
Ying Wang [Thu, 19 Jul 2012 21:38:43 +0000 (14:38 -0700)]
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
Set "LOCAL_SOURCE_FILES_ALL_GENERATED := true" if you want to build a
Java library from only generated source files, without any static
source files. Previously this is not allowed.
This is needed by building api stub libraries, which have only source
files of generated stub files.
Bug:
6814443
Change-Id: Idb2ae9c71a473b796154a03ef07a3403461c4f3c
Scott Main [Thu, 19 Jul 2012 18:14:58 +0000 (11:14 -0700)]
am
a24cd5eb: am
b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev
* commit '
a24cd5ebf0476c003fa97acb8eedbc9939166bca':
docs: further specify design docs' list styles to fix uls appearing like ols
Scott Main [Thu, 19 Jul 2012 18:13:41 +0000 (11:13 -0700)]
am
b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev
* commit '
b72b7b84b6c0c3a59da6f34531b362782090cabf':
docs: further specify design docs' list styles to fix uls appearing like ols
Scott Main [Thu, 19 Jul 2012 18:03:41 +0000 (11:03 -0700)]
Merge "docs: further specify design docs' list styles to fix uls appearing like ols" into jb-dev
Scott Main [Thu, 19 Jul 2012 18:01:27 +0000 (11:01 -0700)]
docs: further specify design docs' list styles to fix uls appearing like ols
Change-Id: I203daeafb390532e34687338d5c3d4a307ba680f
The Android Open Source Project [Thu, 19 Jul 2012 15:52:00 +0000 (08:52 -0700)]
am
2e5ae987: Reconcile with jb-mr0-release jb-release
* commit '
2e5ae9873c4f62f90342cd042eff457c7e1103f0':
JZO18
JZO17
JRO03H
JRO03G
JRO03F
JRO03E
JRO03D
JZO11
JZO10
The Android Open Source Project [Thu, 19 Jul 2012 15:35:48 +0000 (08:35 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b
The Android Automerger [Thu, 19 Jul 2012 04:45:08 +0000 (21:45 -0700)]
JZO18
The Android Automerger [Thu, 19 Jul 2012 04:44:37 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Scott Main [Thu, 19 Jul 2012 03:17:48 +0000 (20:17 -0700)]
am
3fae8d4e: am
71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug:
6843654" into jb-dev
* commit '
3fae8d4e5685e604cc1dcc3c72745d6b521cfdc1':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug:
6843654
Scott Main [Thu, 19 Jul 2012 03:17:47 +0000 (20:17 -0700)]
am
57267e56: am
55163c88: Doc change: add links to the More menu.
* commit '
57267e567f011d9db838b1a46be1290e563d6f77':
Doc change: add links to the More menu.
Scott Main [Thu, 19 Jul 2012 03:14:58 +0000 (20:14 -0700)]
am
71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug:
6843654" into jb-dev
* commit '
71b28a600e52922a7a18b990f256b2fa104d32e8':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug:
6843654
Scott Main [Thu, 19 Jul 2012 03:14:03 +0000 (20:14 -0700)]
am
55163c88: Doc change: add links to the More menu.
* commit '
55163c882e8d97d48f58f8ac86c394ce07548d8c':
Doc change: add links to the More menu.
Scott Main [Wed, 18 Jul 2012 23:59:41 +0000 (16:59 -0700)]
Merge "docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug:
6843654" into jb-dev
Scott Main [Wed, 18 Jul 2012 23:53:22 +0000 (16:53 -0700)]
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries.
bug:
6843654
Change-Id: I5fee7426d8ad404a5f03f37297fe72009df30de7
Scott Main [Wed, 18 Jul 2012 23:18:25 +0000 (16:18 -0700)]
Doc change: add links to the More menu.
Change-Id: I77e848f86278781b0a44eb672ea711e00352fde5
Colin Cross [Wed, 18 Jul 2012 23:00:48 +0000 (16:00 -0700)]
pdk: add telephony-common and mms-common
Factory test apps may need to compile against telephony-common and
mms-common, include the jars in the pdk platform.zip.
Change-Id: Ic3533ec42115150b94298f15acd877ef61c6660c
Scott Main [Tue, 17 Jul 2012 21:11:53 +0000 (14:11 -0700)]
am
e09cf926: am
1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs
* commit '
e09cf926325c78b4c2885df83003d1e1c812f94c':
docs: bring back min-height for nav-x for proper height of secondary tabs
Wink Saville [Tue, 17 Jul 2012 21:08:45 +0000 (14:08 -0700)]
am
e84d651d: (-s ours) am
c4e790dc: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
* commit '
e84d651df1d8e1e5ab951719b997ee65345b363d':
Create telephony-common and mms-common - DO NOT MERGE
Scott Main [Tue, 17 Jul 2012 20:22:25 +0000 (13:22 -0700)]
am
1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs
* commit '
1d62fa807e1ac2c4f9ad8f31f34809ec97e975ed':
docs: bring back min-height for nav-x for proper height of secondary tabs
Scott Main [Tue, 17 Jul 2012 20:15:12 +0000 (13:15 -0700)]
docs: bring back min-height for nav-x for proper height of secondary tabs
Change-Id: I865195b9fde9ec64fbe2c083c0d3617a55b54a0f
The Android Automerger [Tue, 17 Jul 2012 19:34:10 +0000 (12:34 -0700)]
JZO17
Wink Saville [Tue, 17 Jul 2012 19:33:21 +0000 (12:33 -0700)]
am
c4e790dc: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
* commit '
c4e790dc6474566799012728f9e67f5d794975b4':
Create telephony-common and mms-common - DO NOT MERGE
The Android Automerger [Tue, 17 Jul 2012 19:29:00 +0000 (12:29 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 17 Jul 2012 19:27:31 +0000 (12:27 -0700)]
JRO03H
Wink Saville [Sat, 30 Jun 2012 23:13:26 +0000 (16:13 -0700)]
Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
Keun young Park [Tue, 17 Jul 2012 16:38:38 +0000 (09:38 -0700)]
Merge "add TestingCamera to mini for generic PDK"
Scott Main [Tue, 17 Jul 2012 01:41:46 +0000 (18:41 -0700)]
am
b8910812: am
a214d84f: docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
* commit '
b8910812fdd0bb2105738b6b24fc0b9e4b201956':
docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
Scott Main [Tue, 17 Jul 2012 01:38:14 +0000 (18:38 -0700)]
am
a214d84f: docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
* commit '
a214d84ff82bb3ae279b1f2c8ece5f65656b5e5c':
docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
Scott Main [Tue, 17 Jul 2012 00:14:40 +0000 (17:14 -0700)]
docs: upgrades to search.
Fix history navigation functionality.
Faster ajax requery while typing.
Ignore ENTER key when performing requery to avoid reload.
Improve results reveal with minimum height for proper div.
Change-Id: Ie50a6d7bdf58ad3e17dd15d30dcec973a123b7bf
Scott Main [Mon, 16 Jul 2012 22:50:13 +0000 (15:50 -0700)]
am
8f4df715: am
220c3449: docs: adjust spacing for collapsible sections (release notes)
* commit '
8f4df715b8a74b9df1b0560d910f1dabd86dbf9d':
docs: adjust spacing for collapsible sections (release notes)
Scott Main [Mon, 16 Jul 2012 22:46:46 +0000 (15:46 -0700)]
am
220c3449: docs: adjust spacing for collapsible sections (release notes)
* commit '
220c34492ae24f79f9b4a4fe15051360c8505807':
docs: adjust spacing for collapsible sections (release notes)
Scott Main [Mon, 16 Jul 2012 22:40:17 +0000 (15:40 -0700)]
docs: adjust spacing for collapsible sections (release notes)
Change-Id: I68c8429e0e18bff50463b40f163df6a89ac8730a
The Android Automerger [Mon, 16 Jul 2012 19:15:57 +0000 (12:15 -0700)]
JRO03G
Keun young Park [Mon, 16 Jul 2012 19:15:54 +0000 (12:15 -0700)]
add TestingCamera to mini for generic PDK
Change-Id: I8a04c48e173d8742bf852d242e2efc0577287608
The Android Automerger [Fri, 13 Jul 2012 21:19:15 +0000 (14:19 -0700)]
JRO03F
The Android Automerger [Fri, 13 Jul 2012 20:38:41 +0000 (13:38 -0700)]
JRO03E
Jean-Baptiste Queru [Fri, 13 Jul 2012 19:16:38 +0000 (12:16 -0700)]
Jean-Baptiste Queru [Fri, 13 Jul 2012 19:13:54 +0000 (12:13 -0700)]
Merge
2f16ba59
Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc
The Android Automerger [Fri, 13 Jul 2012 00:26:25 +0000 (17:26 -0700)]
JRO03D
Justin Ho [Thu, 12 Jul 2012 23:21:00 +0000 (16:21 -0700)]
Android 4.1.2 version bump
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
Guang Zhu [Thu, 12 Jul 2012 16:36:35 +0000 (09:36 -0700)]
am
96d9fa29: resolved conflicts for merge of
ef1335ed to jb-dev-plus-aosp
* commit '
96d9fa29cd1ff48b733eb090e99fe165d194d313':
use default shell (mksh) in emulator
The Android Automerger [Thu, 12 Jul 2012 06:17:54 +0000 (23:17 -0700)]
JZO11
The Android Automerger [Thu, 12 Jul 2012 06:16:01 +0000 (23:16 -0700)]
JZO10
The Android Automerger [Thu, 12 Jul 2012 06:11:59 +0000 (23:11 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Guang Zhu [Thu, 12 Jul 2012 02:36:17 +0000 (19:36 -0700)]
resolved conflicts for merge of
ef1335ed to jb-dev-plus-aosp
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
Guang Zhu [Thu, 12 Jul 2012 01:35:08 +0000 (18:35 -0700)]
use default shell (mksh) in emulator
remove the override to use ash as shell so that mksh is the
default in 'generic' product type
Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
Wink Saville [Thu, 12 Jul 2012 01:08:21 +0000 (18:08 -0700)]
Merge commit '
c16c9454' into mit
* commit '
c16c9454':
Create telephony-common and mms-common
Wink Saville [Sat, 30 Jun 2012 23:13:26 +0000 (16:13 -0700)]
Create telephony-common and mms-common
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
The Android Open Source Project [Wed, 4 Jul 2012 23:49:44 +0000 (16:49 -0700)]
am
69cfe57a: Reconcile with jb-release
* commit '
69cfe57ae5b0dd7aaab924df38bddee131cba2a5':
JRO03C
The Android Open Source Project [Wed, 4 Jul 2012 23:48:36 +0000 (16:48 -0700)]
Reconcile with jb-release
Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da
The Android Automerger [Wed, 4 Jul 2012 20:53:25 +0000 (13:53 -0700)]
JRO03C
Doug Zongker [Tue, 3 Jul 2012 22:57:57 +0000 (15:57 -0700)]
Merge "make SignApk faster for OTA packages"
Doug Zongker [Tue, 3 Jul 2012 22:03:04 +0000 (15:03 -0700)]
make SignApk faster for OTA packages
Change to the default compression level instead of the max compression
level for OTA packages (-w): it's much faster and the difference in
output size is usually negligible.
Bug:
6778962
Change-Id: I82a6acc19be8b3289fd84c8c15f03ebeb7a1ce63
Scott Main [Tue, 3 Jul 2012 21:18:10 +0000 (14:18 -0700)]
am
a4d57eab: am
38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
* commit '
a4d57eab27139af93ecdb4b0eb8ec8c5193b7c80':
docs: fix search suggestions and other script bugs for offline docs
Scott Main [Tue, 3 Jul 2012 21:15:43 +0000 (14:15 -0700)]
am
38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
* commit '
38f19c21258592faefa652d4871d570e151a2a53':
docs: fix search suggestions and other script bugs for offline docs
The Android Open Source Project [Tue, 3 Jul 2012 21:11:45 +0000 (14:11 -0700)]
am
cb2657d3: Reconcile with jb-release
* commit '
cb2657d378d90e2375bdf8a15e35ec1de70ef67b':
JRO03B
4.1.1
Scott Main [Tue, 3 Jul 2012 21:10:57 +0000 (14:10 -0700)]
Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
The Android Open Source Project [Tue, 3 Jul 2012 21:09:18 +0000 (14:09 -0700)]
Reconcile with jb-release
Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec
Jean-Baptiste Queru [Tue, 3 Jul 2012 21:09:05 +0000 (14:09 -0700)]
am
f17d1b34: Ignore version change from jb-dev
* commit '
f17d1b34d3b109796492459dfe78530b6d04b967':
4.1.1
Scott Main [Tue, 3 Jul 2012 21:06:22 +0000 (14:06 -0700)]
docs: fix search suggestions and other script bugs for offline docs
Change-Id: I3f9404695966b99be1c8ed36249788e448399296
Jean-Baptiste Queru [Tue, 3 Jul 2012 21:04:28 +0000 (14:04 -0700)]
Ignore version change from jb-dev
Change-Id: Ia04c4664cba4abdef04f0949713f4c76281713d8
The Android Automerger [Tue, 3 Jul 2012 21:00:39 +0000 (14:00 -0700)]
JRO03B
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
Ed Heyl [Tue, 3 Jul 2012 20:57:52 +0000 (13:57 -0700)]
Merge "4.1.1" into jb-dev
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
The Android Open Source Project [Tue, 3 Jul 2012 20:33:11 +0000 (13:33 -0700)]
am
9c94579f: Reconcile with jb-release
* commit '
9c94579f0e2a345b01685ac3decf7f3d11f763f4':
JRO02D
The Android Open Source Project [Tue, 3 Jul 2012 20:30:52 +0000 (13:30 -0700)]
Reconcile with jb-release
Change-Id: I23dd2b4acc6d2ca20756d6d674272a2721843d20
The Android Automerger [Tue, 3 Jul 2012 19:58:46 +0000 (12:58 -0700)]
JRO02D
The Android Automerger [Tue, 3 Jul 2012 19:50:47 +0000 (12:50 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Tue, 3 Jul 2012 19:20:50 +0000 (12:20 -0700)]
am
9ffe27e0: am
9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."
* commit '
9ffe27e013c84e036d5e38b02edf3ca12f7405a8':
This property is set when HAVE_SELINUX:=true during build.
Ying Wang [Tue, 3 Jul 2012 19:16:03 +0000 (12:16 -0700)]
am
9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."
* commit '
9e38d6bf1bf78a00d8f4288e6444be358a70a692':
This property is set when HAVE_SELINUX:=true during build.
The Android Open Source Project [Tue, 3 Jul 2012 19:14:19 +0000 (12:14 -0700)]
am
14c31bdc: Reconcile with jb-release
* commit '
14c31bdc30d115113575b75abfe01a639a3a6a12':
JRO02C
JRO02B
JRO02
The Android Open Source Project [Tue, 3 Jul 2012 19:11:41 +0000 (12:11 -0700)]
Reconcile with jb-release
Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11
Ying Wang [Tue, 3 Jul 2012 18:30:30 +0000 (11:30 -0700)]
Merge "This property is set when HAVE_SELINUX:=true during build."
William Roberts [Tue, 3 Jul 2012 01:55:14 +0000 (18:55 -0700)]
This property is set when HAVE_SELINUX:=true during build.
This will provide a convenient method for determing build
configuration when in the Java layer. For instance, this will
be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68
to determine if the Settings app should display the SE Linux
status.
Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f
The Android Automerger [Tue, 3 Jul 2012 02:03:14 +0000 (19:03 -0700)]
JRO02C
The Android Automerger [Tue, 3 Jul 2012 01:58:01 +0000 (18:58 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 23:25:03 +0000 (16:25 -0700)]
JRO02B
The Android Automerger [Mon, 2 Jul 2012 23:16:18 +0000 (16:16 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 20:00:27 +0000 (13:00 -0700)]
JRO02
The Android Automerger [Mon, 2 Jul 2012 19:53:12 +0000 (12:53 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 30 Jun 2012 03:22:20 +0000 (20:22 -0700)]
am
d512fda4: am
e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
* commit '
d512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259':
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
Ying Wang [Sat, 30 Jun 2012 03:19:50 +0000 (20:19 -0700)]
am
e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
* commit '
e42ed0ba1571f20866609710ba7c73fd138c0405':
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
Ying Wang [Sat, 30 Jun 2012 02:55:06 +0000 (19:55 -0700)]
Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
The Android Open Source Project [Sat, 30 Jun 2012 01:30:23 +0000 (18:30 -0700)]
am
5081af57: Reconcile with jb-release
* commit '
5081af57d369e1e6de09f67836bff0d40cda711e':
JRN90
The Android Open Source Project [Sat, 30 Jun 2012 01:28:17 +0000 (18:28 -0700)]
Reconcile with jb-release
Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25
The Android Automerger [Fri, 29 Jun 2012 22:57:58 +0000 (15:57 -0700)]
JRN90
The Android Automerger [Fri, 29 Jun 2012 22:47:16 +0000 (15:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Fri, 29 Jun 2012 15:16:22 +0000 (08:16 -0700)]
am
8ef65998: Reconcile with jb-release
* commit '
8ef65998f4025378eda0cec70ff38a1b8a5633db':
JRN89B
JRN89
JRN88
JRN87
The Android Open Source Project [Fri, 29 Jun 2012 15:13:34 +0000 (08:13 -0700)]
Reconcile with jb-release
Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc
The Android Automerger [Fri, 29 Jun 2012 00:16:17 +0000 (17:16 -0700)]
JRN89B