Scott Main
ae3ee424e1
docs: update analytics script to support event tracking
...
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
2013-01-08 18:45:08 -08:00
Ying Wang
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
Ying Wang
7dc45a8bdc
Add simg2img and e2fsck to the otatools.
...
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
2013-01-04 14:43:18 -08:00
The Android Automerger
5a6a0faa2a
JDP82
2012-12-21 13:47:17 -08:00
The Android Automerger
3b40691fb0
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-21 13:46:40 -08:00
The Android Automerger
0c3379a819
JDP81B
2012-12-20 16:17:20 -08:00
The Android Automerger
e0545662db
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-20 16:17:02 -08:00
The Android Automerger
74bb088c75
JDP81
2012-12-20 14:31:50 -08:00
The Android Automerger
72857f3ee7
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-20 14:31:01 -08:00
Scott Main
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
Scott Main
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
Scott Main
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
The Android Automerger
4505bf3c29
JDP80B
2012-12-19 14:30:14 -08:00
The Android Automerger
da35afa180
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-19 14:29:53 -08:00
The Android Automerger
e551d6b45e
JDP80
2012-12-19 13:51:26 -08:00
The Android Automerger
76db451c3f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-19 13:50:46 -08:00
Chad Jones
341d8f8ee6
Bump version to JDP79B
2012-12-18 19:40:22 -08:00
Ying Wang
5f97f2b6d6
am 6a6c1121
: Run e2fsck on built sparse images.
...
* commit '6a6c11215bdf3f114ed3589ede4bda006adacf7e':
Run e2fsck on built sparse images.
2012-12-18 15:28:50 -08:00
The Android Automerger
e40ae3abe9
JDP79
2012-12-18 15:19:35 -08:00
The Android Automerger
aa7a07b0f6
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-18 15:19:02 -08:00
The Android Automerger
714d7c7db5
JDP78
2012-12-17 20:50:14 -08:00
The Android Automerger
87fefda594
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-17 20:49:28 -08:00
The Android Automerger
20bfc920bf
JDP75
2012-12-14 13:56:39 -08:00
The Android Automerger
9d1c9df4ea
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-14 13:56:02 -08:00
The Android Automerger
127f6a2fd4
JDP74
2012-12-13 15:31:33 -08:00
The Android Automerger
c79811b516
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-13 15:30:36 -08:00
The Android Automerger
ba45cc19c9
JDP73
2012-12-12 15:06:52 -08:00
The Android Automerger
082e6dcd9a
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-12 15:06:00 -08:00
The Android Open Source Project
16cb8655bd
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I8c4ba6b279cebcc46d7b7cb71c81f1de96962ca9
2012-12-12 07:38:42 -08:00
The Android Automerger
29132ce84b
JDP72B
2012-12-11 23:59:23 -08:00
The Android Automerger
2710dcbac8
JDP72
2012-12-11 15:57:10 -08:00
The Android Automerger
bd2e0d776c
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-11 15:56:16 -08:00
Ying Wang
6a6c11215b
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-12-11 14:57:39 -08:00
The Android Automerger
acb046abd0
JOP40F
2012-12-11 13:59:16 -08:00
The Android Automerger
aa81ebb808
JDP71B
2012-12-10 19:34:09 -08:00
The Android Automerger
77072f9d6f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-10 19:33:28 -08:00
The Android Automerger
80998ee71f
JDP71
2012-12-10 13:06:33 -08:00
The Android Automerger
8af65fef4b
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-10 13:05:46 -08:00
The Android Automerger
be247ab34a
JDP68
2012-12-07 13:26:40 -08:00
The Android Automerger
bc9ff47216
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-07 13:26:02 -08:00
The Android Automerger
c536a0fe50
JDP67B
2012-12-06 19:36:51 -08:00
The Android Automerger
4bca2f516c
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-06 19:35:57 -08:00
The Android Automerger
1e34606fff
JDP67
2012-12-06 10:40:18 -08:00
The Android Automerger
3e50c966a9
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-06 10:39:05 -08:00
The Android Automerger
2f74b6d8cc
JDP66
2012-12-05 10:28:18 -08:00
The Android Automerger
f2f1d7f8f2
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-05 10:27:36 -08:00
The Android Automerger
582c34b60e
JDP65
2012-12-04 20:00:08 -08:00
The Android Automerger
1de9eda618
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-04 19:58:36 -08:00
Chris Wren
801a079269
Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
2012-12-03 17:54:34 -08:00
The Android Automerger
6d302128db
JDP64B
2012-12-03 15:54:56 -08:00