Commit Graph

10628 Commits

Author SHA1 Message Date
The Android Automerger
c3102ba02e JOP37B 2012-11-06 18:04:47 -08:00
The Android Automerger
e68753b20f merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 18:03:47 -08:00
Xavier Ducrohet
83c3110c40 am 1818ea8a: Add dev settings to emulator.
* commit '1818ea8ae0f49a8c4c24413034dcd3fc34d80414':
  Add dev settings to emulator.
2012-11-06 17:09:17 -08:00
Xavier Ducrohet
1818ea8ae0 Add dev settings to emulator.
Change-Id: I0f92257c0a6ac92f3bce4ad004c3e2414ef0f9da
2012-11-06 17:03:52 -08:00
The Android Open Source Project
34d12aaf7a Reconcile with jb-mr1-release - do not merge
Change-Id: I2c8f0cf7f655c624f2c72ed967dba6b071e8fe6e
2012-11-06 13:26:37 -08:00
The Android Automerger
d67bdb4b10 JOP37 2012-11-06 13:14:19 -08:00
The Android Automerger
9e6a170b3a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 13:13:17 -08:00
The Android Open Source Project
25e3f42871 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ie4f29093944bea7faa6eb3b3afaf098336c761ba
2012-11-06 08:49:43 -08:00
The Android Automerger
39737e6a2d JOP36 2012-11-05 18:40:05 -08:00
The Android Automerger
bbb59782b7 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:38:31 -08:00
The Android Automerger
ff344406ee JOP34 2012-11-03 11:32:00 -07:00
The Android Automerger
38a8607dd9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-03 11:31:19 -07:00
The Android Automerger
fdb9350e9d JOP33 2012-11-02 17:35:24 -07:00
The Android Automerger
9aca04c75b merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-02 17:34:17 -07:00
The Android Automerger
a6d6187841 JOP32C 2012-11-02 14:46:32 -07:00
The Android Automerger
3618379ed8 JOP32B 2012-11-01 23:43:31 -07:00
The Android Automerger
3de803e46a JOP32 2012-11-01 19:06:39 -07:00
The Android Automerger
11f0918510 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-01 19:04:59 -07:00
Robert Ly
5a6e240748 am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '0900e42e488eec40dd40c6e82a9823ca338b11b5':
  add css animation videos
2012-11-01 17:33:03 -07:00
Robert Ly
0900e42e48 am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '12e6b988cbe32fda61957ed87bfb30337c2b8f9d':
  add css animation videos
2012-11-01 17:31:20 -07:00
Robert Ly
12e6b988cb am e896e344: Merge "add css animation videos" into jb-dev-docs
* commit 'e896e3447145859371d2b7172122faabe44d10e2':
  add css animation videos
2012-11-01 17:28:28 -07:00
Robert Ly
e896e34471 Merge "add css animation videos" into jb-dev-docs 2012-11-01 17:26:34 -07:00
Robert Ly
d78354d35b add css animation videos
Change-Id: I2e51cfce1af378e03a9ac40be76ab55e61d19f24
2012-11-01 17:13:44 -07:00
The Android Automerger
2d0ea5bee3 JOP31 2012-10-31 18:35:54 -07:00
The Android Automerger
6a9426cb14 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-31 18:33:46 -07:00
The Android Automerger
b3a7adffba JOP30C 2012-10-30 21:53:41 -07:00
The Android Automerger
773c4ad252 JOP30B 2012-10-30 20:13:08 -07:00
The Android Automerger
0bd5295f0f merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 20:11:57 -07:00
The Android Automerger
24ffc43235 JOP30 2012-10-30 08:53:55 -07:00
The Android Automerger
d11e0ff637 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 08:52:22 -07:00
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