The Android Automerger
|
b3e5a0ec1c
|
IML60C
|
2011-11-29 17:08:24 -08:00 |
|
The Android Automerger
|
71a53c5328
|
IML60B
|
2011-11-29 15:28:27 -08:00 |
|
The Android Automerger
|
fad12ed790
|
IML60
|
2011-11-29 12:05:06 -08:00 |
|
The Android Automerger
|
158cf177dc
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-11-29 12:02:12 -08:00 |
|
The Android Open Source Project
|
c99c8c0814
|
Reconcile with ics-mr0-release
Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5
|
2011-11-29 07:54:00 -08:00 |
|
Tor Norbye
|
3997910eea
|
am 5dd51bde: Build fix - include sdk/lint in build. do not merge.
* commit '5dd51bde0b0b4a8ca6d1b6a8da1f6739197999a2':
Build fix - include sdk/lint in build. do not merge.
|
2011-11-28 13:37:17 -08:00 |
|
Tor Norbye
|
5dd51bde0b
|
Build fix - include sdk/lint in build. do not merge.
(cherry picked from commit 4377cc701a)
Change-Id: I28dd89ad6471c82d344ecf88cecb2b96361b2050
|
2011-11-28 13:07:53 -08:00 |
|
The Android Automerger
|
2fc337b236
|
IML59
|
2011-11-28 12:25:45 -08:00 |
|
The Android Automerger
|
86a99673f5
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-11-28 12:21:20 -08:00 |
|
The Android Automerger
|
9101da9742
|
ICL53C
|
2011-11-26 12:29:48 -08:00 |
|
Marius Renn
|
b1df701ed8
|
Google Add-On API Documentation Fixes (5429077)
We no longer want a reference directory, but rather
maps_api and effects_api directories.
Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
|
2011-11-23 18:08:51 -08:00 |
|
The Android Open Source Project
|
070e712fb3
|
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6
|
2011-11-23 09:23:46 -08:00 |
|
The Android Automerger
|
4e776f342a
|
ITL41G
|
2011-11-22 21:50:14 -08:00 |
|
The Android Automerger
|
13315dd2ca
|
ICL53B
|
2011-11-22 16:14:07 -08:00 |
|
The Android Automerger
|
28693b2b04
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-11-22 16:13:00 -08:00 |
|
The Android Open Source Project
|
24215999d0
|
Reconcile with ics-mr0-release
Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc
|
2011-11-22 15:23:59 -08:00 |
|
The Android Automerger
|
54aa08fdbb
|
ICL53
|
2011-11-22 14:29:10 -08:00 |
|
The Android Automerger
|
fee376bcd6
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-11-22 14:26:36 -08:00 |
|
The Android Open Source Project
|
5cd44bd38f
|
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie25ab898e849e7d52c08796cd7f1bea6f12d6bd1
|
2011-11-22 13:19:59 -08:00 |
|
The Android Automerger
|
a96f6f55b8
|
IML52C
|
2011-11-22 12:02:47 -08:00 |
|
The Android Automerger
|
2f3d9f53dc
|
IML53
|
2011-11-22 11:58:43 -08:00 |
|
The Android Automerger
|
41b9a903c2
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-11-22 11:55:18 -08:00 |
|
The Android Automerger
|
8f83247ceb
|
IML52B
|
2011-11-21 19:29:29 -08:00 |
|
The Android Automerger
|
4509757007
|
IML52
|
2011-11-21 17:45:13 -08:00 |
|
The Android Automerger
|
3538ad9af2
|
ITL41F
|
2011-11-21 17:40:35 -08:00 |
|
The Android Automerger
|
eb3f2c1c08
|
ITL41E
|
2011-11-21 13:41:52 -08:00 |
|
The Android Automerger
|
0d2a077ab0
|
ICL52
|
2011-11-21 13:08:17 -08:00 |
|
The Android Automerger
|
104cca7377
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-11-21 13:06:53 -08:00 |
|
Bart Sears
|
bb0e59be7c
|
resolved conflicts for merge of aca203ff to ics-mr1
Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149
|
2011-11-20 21:11:32 -08:00 |
|
Bart Sears
|
aca203ffb6
|
ICS MR0.1 will be version 4.0.2 - do not merge
Change-Id: I35db6befcdfc421da8eb959285e61856c7ed2826
|
2011-11-19 17:52:21 -08:00 |
|
The Android Automerger
|
886cfbff0e
|
ICL49B
|
2011-11-18 22:02:22 -08:00 |
|
The Android Automerger
|
ca93af6ab1
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-11-18 22:00:45 -08:00 |
|
The Android Open Source Project
|
1ca1730b88
|
Reconcile with ics-mr0-release
Change-Id: I134c060024841405d83b92a700bfe05aeb5d86b5
|
2011-11-18 15:49:35 -08:00 |
|
The Android Automerger
|
4c38d0cc8f
|
ICL49
|
2011-11-18 15:38:37 -08:00 |
|
The Android Automerger
|
2cec7c9554
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-11-18 15:36:30 -08:00 |
|
The Android Open Source Project
|
409670e9fa
|
Reconcile with ics-mr0-release
Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834
|
2011-11-18 13:12:21 -08:00 |
|
The Android Automerger
|
1b87ad32c3
|
IML48C
|
2011-11-18 12:45:55 -08:00 |
|
Svetoslav Ganov
|
700b18cc72
|
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
|
2011-11-18 10:11:28 -08:00 |
|
The Android Automerger
|
03fa097654
|
ICL48B
|
2011-11-17 17:50:39 -08:00 |
|
The Android Automerger
|
ab2931ed87
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-11-17 17:47:41 -08:00 |
|
The Android Automerger
|
d23e92b201
|
IML48B
|
2011-11-17 16:41:53 -08:00 |
|
The Android Open Source Project
|
77b2771bd2
|
Reconcile with ics-mr0-release
Change-Id: I42fcd347d98058118f225dedd011cb2fac76bbb6
|
2011-11-17 15:36:45 -08:00 |
|
Svetoslav Ganov
|
155d855cee
|
Add the support libraries to the platform documentation (build).
Added path to the support libraries.
bug: 5629339
Change-Id: Id414597046c528617313881ea857134512d1c2ba
|
2011-11-17 15:13:56 -08:00 |
|
The Android Automerger
|
d51de46758
|
IML48
|
2011-11-17 06:48:58 -08:00 |
|
The Android Automerger
|
fdca9356cc
|
merge in ics-mr1-release history after reset to ics-mr1
|
2011-11-17 06:45:32 -08:00 |
|
The Android Automerger
|
4d68222658
|
ICL48
|
2011-11-17 06:29:27 -08:00 |
|
The Android Automerger
|
0cd5c97949
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-11-17 06:27:12 -08:00 |
|
The Android Automerger
|
19adeff1bb
|
IML47B
|
2011-11-16 16:29:26 -08:00 |
|
The Android Open Source Project
|
44d7d24f97
|
No-op merge from ics-mr0
Change-Id: Ibbdd04c5626976293b9e6170e9e1f844cb6582a5
|
2011-11-16 09:10:38 -08:00 |
|
The Android Open Source Project
|
7f3c884831
|
Reconcile with ics-factoryrom-2-release
Change-Id: I2059be2fb54d852023cb4e4b96493ff6a934ffe0
|
2011-11-16 08:55:32 -08:00 |
|