Commit Graph

10548 Commits

Author SHA1 Message Date
The Android Automerger
e5eabd42de JOP29 2012-10-29 11:21:19 -07:00
The Android Automerger
a69ca86e99 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-29 11:19:42 -07:00
The Android Automerger
72ec23af4a JOP26B 2012-10-26 18:18:17 -07:00
The Android Automerger
46869982c5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-26 18:17:25 -07:00
The Android Automerger
5e6de3201e JOP26 2012-10-26 16:24:09 -07:00
The Android Automerger
c1f2f71fef merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-26 16:22:28 -07:00
The Android Automerger
eda9d28e79 JOP24G 2012-10-26 13:53:07 -07:00
The Android Automerger
d8e254518b JOP24F 2012-10-25 23:50:30 -07:00
The Android Automerger
c5c150bc91 JOP24E 2012-10-25 21:42:22 -07:00
The Android Automerger
9e85098d87 JOP24D 2012-10-25 14:54:17 -07:00
The Android Automerger
f4f46dcc0d JOP24C 2012-10-25 13:43:53 -07:00
The Android Automerger
444d58845c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-25 13:42:03 -07:00
Scott Main
4e51d8e6d5 am 4810a244: am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '4810a2440c5b9a890f653602164c72c8d0e86750':
  update class header for deprecated info
2012-10-24 19:38:51 -07:00
Scott Main
4810a2440c am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '71e20e2e562957681fdd3965dfc308edcbafa31f':
  update class header for deprecated info
2012-10-24 19:35:37 -07:00
Scott Main
71e20e2e56 am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit 'ef4d10811ae7949357cffcd9aa1dda93c2a582ca':
  update class header for deprecated info
2012-10-24 19:33:16 -07:00
Scott Main
ef4d10811a Merge "update class header for deprecated info" into jb-dev-docs 2012-10-24 19:31:25 -07:00
Scott Main
27ac66542a update class header for deprecated info
Change-Id: I4c41f0bdbac43dc49c99af7bcb5521f7e3278304
2012-10-24 18:50:46 -07:00
The Android Automerger
d125b703ec JOP24B 2012-10-24 16:58:29 -07:00
The Android Automerger
c85f8a27f6 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-24 16:56:44 -07:00
The Android Automerger
2a3cf767b6 JVP15S 2012-10-24 14:59:41 -07:00
Dirk Dougherty
db9ad2da9e am 80ebbc3c: am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '80ebbc3c5fde6d653c92a0288e1967f519b9c9ef':
  Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:39:55 -07:00
Dirk Dougherty
80ebbc3c5f am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '1a13c317627996234a1dfa2c0736733bd1c4c696':
  Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:38:19 -07:00
Dirk Dougherty
1a13c31762 am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit 'a4375a19c6ff958d33d62ee96f6ccdde223b0c7a':
  Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:35:53 -07:00
Dirk Dougherty
a4375a19c6 Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs 2012-10-24 13:33:40 -07:00
The Android Automerger
49b8650c68 JOP24 2012-10-24 06:59:57 -07:00
The Android Automerger
6ccc5c9150 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-24 06:59:03 -07:00
The Android Automerger
7267bb8b2f JOP23E 2012-10-23 23:36:27 -07:00
The Android Automerger
19ef840858 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 23:35:43 -07:00
The Android Automerger
c8a063a043 JOP23D 2012-10-23 21:53:29 -07:00
The Android Automerger
d8a45b1e63 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 21:52:40 -07:00
The Android Automerger
6e0d076469 JVP15R 2012-10-23 20:48:54 -07:00
The Android Automerger
f68ebc3fcc JOP23C 2012-10-23 16:48:15 -07:00
The Android Automerger
788554865d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 16:46:40 -07:00
The Android Automerger
0d92694097 JVP15Q 2012-10-23 15:55:09 -07:00
The Android Automerger
a965f6cb0a JOP23B 2012-10-23 14:38:26 -07:00
The Android Automerger
49401fa9aa merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 14:36:58 -07:00
The Android Automerger
77ed2e3cc2 JVP15P 2012-10-23 12:24:22 -07:00
The Android Automerger
cfe2f529f7 JOP23 2012-10-23 07:00:38 -07:00
The Android Automerger
15ef128d91 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 06:59:11 -07:00
Scott Main
bd027cd4e7 am ab84504b: am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepage
* commit 'ab84504b8a9e24b15af916faa95dcf65685a22a3':
  fix spacing in carousel text for Develop homepage
2012-10-22 20:37:56 -07:00
Scott Main
ab84504b8a am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepage
* commit '6613a2327512f3742d55cf0eb79fc4d52cf9a7cb':
  fix spacing in carousel text for Develop homepage
2012-10-22 20:35:42 -07:00
Scott Main
6613a23275 am 0e585706: fix spacing in carousel text for Develop homepage
* commit '0e585706f0199f9d277e0d099ece682a2ee502ef':
  fix spacing in carousel text for Develop homepage
2012-10-22 20:33:41 -07:00
Scott Main
0e585706f0 fix spacing in carousel text for Develop homepage
Change-Id: If8f95e66b4c1b4918b0d1dea59241d5a17acbfd9
2012-10-22 20:30:22 -07:00
The Android Automerger
887da0a648 JOP22B 2012-10-22 16:43:27 -07:00
The Android Automerger
cb4f3de6cc merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-22 16:41:46 -07:00
The Android Automerger
6bbdd458cf JVP15O 2012-10-22 10:36:59 -07:00
The Android Automerger
fa09c3591e JOP22 2012-10-22 06:59:57 -07:00
The Android Automerger
bb4f58b937 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-22 06:59:03 -07:00
The Android Automerger
417f0e3cd1 JVP15N 2012-10-21 13:33:51 -07:00
The Android Automerger
301ed15df9 JOP21 2012-10-21 06:59:39 -07:00