85ab41eb6b
am fb959d01: am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
...
* commit 'fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
docs: add the ability to pause the carousel
2013-01-14 21:13:27 -08:00
fb959d01d5
am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
...
* commit '474b3f1198223b61f912c29d2e5c069dcfe322e0':
docs: add the ability to pause the carousel
2013-01-14 21:10:48 -08:00
474b3f1198
am eb41035f: docs: add the ability to pause the carousel
...
* commit 'eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
docs: add the ability to pause the carousel
2013-01-14 21:07:29 -08:00
eb41035fcf
docs: add the ability to pause the carousel
...
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
2013-01-14 20:47:40 -08:00
2cb5a36421
JDQ10
2013-01-10 11:57:20 -08:00
baf217cce5
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-01-10 11:56:40 -08:00
4dc0571826
JDQ09
2013-01-09 15:48:26 -08:00
2cb0583163
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-01-09 15:47:20 -08:00
18ae42f3c8
am 468a239d: am 8d0a978a: am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '468a239d0cc522623f1896b3837092f629393292':
docs: update analytics script to support event tracking
2013-01-08 18:59:29 -08:00
468a239d0c
am 8d0a978a: am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking
2013-01-08 18:56:40 -08:00
8d0a978aea
am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '869f3d1f68194b5962070394882b85f46a415c4c':
docs: update analytics script to support event tracking
2013-01-08 18:49:51 -08:00
869f3d1f68
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
2013-01-08 18:47:45 -08:00
ae3ee424e1
docs: update analytics script to support event tracking
...
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
2013-01-08 18:45:08 -08:00
038908a736
am b81bc684: am 7a184cb7: Merge "Change Email2 reference back to Email"
...
* commit 'b81bc6842e6743e548a76a1c2f2ac59b4f080b10':
Change Email2 reference back to Email
2013-01-08 08:17:19 -08:00
b81bc6842e
am 7a184cb7: Merge "Change Email2 reference back to Email"
...
* commit '7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
Change Email2 reference back to Email
2013-01-08 08:13:50 -08:00
7a184cb70f
Merge "Change Email2 reference back to Email"
2013-01-08 07:55:50 -08:00
15df8356ec
Change Email2 reference back to Email
...
Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-01-08 21:48:41 +08:00
71195ec71f
am d01d0bf8: am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"
...
* commit 'd01d0bf86c2309a7a950549c9c124b303c0c3f82':
core/Makefile: Allow specification of file locations
2013-01-04 15:30:28 -08:00
d01d0bf86c
am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"
...
* commit '58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
core/Makefile: Allow specification of file locations
2013-01-04 15:28:20 -08:00
58a87c5c01
Merge "core/Makefile: Allow specification of file locations"
2013-01-04 15:01:49 -08:00
a40166d11c
am 5455455a: am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools.
...
* commit '5455455a3e550821b381d061803133c82956d7ec':
Add simg2img and e2fsck to the otatools.
2013-01-04 15:01:18 -08:00
5455455a3e
am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools.
...
* commit 'a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
Add simg2img and e2fsck to the otatools.
2013-01-04 14:59:20 -08:00
a6f10400e1
am 7dc45a8b: Add simg2img and e2fsck to the otatools.
...
* commit '7dc45a8bdc744db4d9c742dc21bfe328ad9ba10f':
Add simg2img and e2fsck to the otatools.
2013-01-04 14:55:21 -08:00
7dc45a8bdc
Add simg2img and e2fsck to the otatools.
...
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
2013-01-04 14:43:18 -08:00
fa61ff093e
core/Makefile: Allow specification of file locations
...
If multiple build targets use a common recovery.fstab or system.prop,
this allows them to live in a centralized location and not be copied
or symlinked to the device directories.
Change-Id: I7aeb31ed9dc9b43a5e2c9e46fe582b10cba71b24
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-01-04 11:45:38 -08:00
96045fb584
am f09b7a0e: Merge "SignApk: perform the whole file signature in a single streaming pass."
...
* commit 'f09b7a0eaa0aa2ae6a1d0e1cf0f701f1f56e0cda':
SignApk: perform the whole file signature in a single streaming pass.
2013-01-03 15:12:43 -08:00
f09b7a0eaa
Merge "SignApk: perform the whole file signature in a single streaming pass."
2013-01-03 14:50:36 -08:00
29706d155a
SignApk: perform the whole file signature in a single streaming pass.
...
Author: Koushik Dutta <koushd@gmail.com>
Change-Id: I58a68fa4bd4c0c3bb0e025d4311186195fb90e5a
2013-01-03 14:00:40 -08:00
2d867bd207
am 57a5e52d: Merge "add multiple key support to signapk"
...
* commit '57a5e52d3692b5f7e4008c8e6aa591aee67de130':
add multiple key support to signapk
2013-01-02 14:45:12 -08:00
57a5e52d36
Merge "add multiple key support to signapk"
2013-01-02 13:49:02 -08:00
b14c97621b
add multiple key support to signapk
...
Support signing .apks (but not OTA packages) with multiple keys.
Bug: 7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
2013-01-02 13:31:00 -08:00
dd319cef3f
am 26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS"
...
* commit '26f47aba2d973bc1cc459a63df7bd0eec799f4ff':
Switch to GCC 4.7 for X86 and MIPS
2012-12-21 15:51:44 -08:00
26f47aba2d
Merge "Switch to GCC 4.7 for X86 and MIPS"
2012-12-21 15:43:56 -08:00
f631572908
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Iff920fa574533c1c22a8c1408291f43e81ab7a2f
2012-12-21 14:10:50 -08:00
5a6a0faa2a
JDP82
2012-12-21 13:47:17 -08:00
3b40691fb0
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-21 13:46:40 -08:00
9b2ef22372
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ic86ea3815748a11695d10b369d957ebdf647ab57
2012-12-21 07:59:28 -08:00
098a5968fa
Switch to GCC 4.7 for X86 and MIPS
...
Change-Id: I1c2021a15f53e064baf69084894c114289ef7c54
2012-12-21 09:23:05 +08:00
0c3379a819
JDP81B
2012-12-20 16:17:20 -08:00
e0545662db
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-20 16:17:02 -08:00
8f7ac8caa6
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I522981a273e1844811c7a53ca76c75a3e3365b77
2012-12-20 15:46:18 -08:00
74bb088c75
JDP81
2012-12-20 14:31:50 -08:00
72857f3ee7
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-20 14:31:01 -08:00
97654bc68f
am db3da9bb: am c9cea375: am 707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scro
...
* commit 'db3da9bbc62be22d96cdf61f02afe271174f50be':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:31:12 -08:00
db3da9bbc6
am c9cea375: am 707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway
...
* commit 'c9cea375c3c66df33f4535e986c00a68f390ac62':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:29:21 -08:00
c9cea375c3
am 707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscr
...
* commit '707909f2e0fb9ccc0db859ec075a3557f5265e56':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:25:37 -08:00
707909f2e0
Merge "docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce." into jb-mr1-dev
2012-12-19 19:23:32 -08:00
b8d06a55e0
docs: don't allow setting the sidenav fixed if the doc body is
...
shorter than the sidenav. Scrolling won't be possible in this case
anyway, but this change fixes a glitch that happens on OSX Lion because
it will allow scrolling anyway for the overscroll bounce.
Change-Id: I1be1c170e327f3cdfe81076a473f74425b8bd080
2012-12-19 18:42:16 -08:00
e57594a693
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I6f627ab7e473280d29846f3523d8cfe9b648df7d
2012-12-19 14:33:27 -08:00
4505bf3c29
JDP80B
2012-12-19 14:30:14 -08:00
Scott Main