Commit graph

10398 commits

Author SHA1 Message Date
The Android Open Source Project
5194366bcd Reconcile with jb-mr1-release - do not merge
Change-Id: I482192b20bde4fcc55f9a781e37256d396c2c9fb
2012-11-09 13:07:03 -08:00
The Android Automerger
8803150a7b JOP40 2012-11-09 12:51:06 -08:00
The Android Automerger
9e819c8a14 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-09 12:50:33 -08:00
The Android Open Source Project
79ab2553a7 Reconcile with jb-mr1-release - do not merge
Change-Id: I5d3a0c41a1626bdf59f75cd8d989d0d725fc4680
2012-11-09 07:19:14 -08:00
The Android Automerger
46527fef4d JOP39B 2012-11-08 17:53:45 -08:00
The Android Automerger
6151f7ee62 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 17:53:10 -08:00
The Android Open Source Project
17e06817a2 Reconcile with jb-mr1-release - do not merge
Change-Id: I1ff0e098597e9de600fbec6b6661206e66a72afc
2012-11-08 14:18:55 -08:00
The Android Automerger
81d04b7a6c JOP39 2012-11-08 13:54:33 -08:00
The Android Automerger
5e98bbbd26 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 13:53:50 -08:00
The Android Open Source Project
d84f02944f Reconcile with jb-mr1-release - do not merge
Change-Id: I0f7fd29de4c05e6b8298814e03ea681699117fae
2012-11-08 08:54:06 -08:00
The Android Automerger
b8162b26e9 JOP38C 2012-11-07 18:05:21 -08:00
The Android Automerger
bba1309df0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 18:04:33 -08:00
Ying Wang
d0b1977f7d am 0138951e: Collapse multiple --extra-packages into one.
* commit '0138951eaffaeaf32f8376959074aabf4ecfaff1':
  Collapse multiple --extra-packages into one.
2012-11-07 16:30:24 -08:00
Ying Wang
0138951eaf Collapse multiple --extra-packages into one.
Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2
2012-11-07 14:07:34 -08:00
The Android Automerger
baa786da15 JOP38B 2012-11-07 13:06:35 -08:00
The Android Automerger
7c4e5df38a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 13:05:41 -08:00
The Android Open Source Project
ab529f1336 Reconcile with jb-mr1-release - do not merge
Change-Id: I6b6342bf7e65019d9efeb2ff138ffb728bbef063
2012-11-07 11:35:01 -08:00
The Android Automerger
4afe3efb73 JOP38 2012-11-07 11:18:45 -08:00
The Android Automerger
c61eca9217 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 11:17:50 -08:00
The Android Open Source Project
b791a5fb79 Reconcile with jb-mr1-release - do not merge
Change-Id: Ie6ab54e92b8261bc8b2fb8819e73631237a04e84
2012-11-07 10:19:37 -08:00
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