The Android Open Source Project
|
7d091828d9
|
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I98737a9d0c206077d1faac71b40a14157f575d82
|
2012-12-05 11:08:38 -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 |
|
Ying Wang
|
19cc22bc9c
|
Move numeric api files from frameworks/base to prebuilts/sdk
So they can be used in unbundled builds.
Bug: 7296240
Change-Id: I5f176322dec30323f365188fb3e379def60dc1b8
|
2012-12-04 15:07:34 -08:00 |
|
Ying Wang
|
ae5979bd24
|
Merge "Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too"
|
2012-12-03 18:33:54 -08:00 |
|
Ying Wang
|
fe3f62d06b
|
Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
|
2012-12-03 18:24:55 -08:00 |
|
Chris Wren
|
dba068e1ff
|
am f28aae60: am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
* commit 'f28aae60adb462bba0cfe26ccf9ca80121ca1b7d':
unbundle photo dreams into the GalleryGoogle package
|
2012-12-03 18:01:14 -08:00 |
|
Chris Wren
|
f28aae60ad
|
am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
* commit 'abc791fc5723bee48763a67a497ae25ac203b65b':
unbundle photo dreams into the GalleryGoogle package
|
2012-12-03 17:59:25 -08:00 |
|
Chris Wren
|
abc791fc57
|
am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
* commit '801a079269d78e29c105462518dd4876dd031b2e':
unbundle photo dreams into the GalleryGoogle package
|
2012-12-03 17:56:51 -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 |
|
Ying Wang
|
36d46e6e12
|
am d3a561da: am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
* commit 'd3a561da10406b482107a052c9c60cf1be80e930':
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
|
2012-12-03 16:09:35 -08:00 |
|
Ying Wang
|
d3a561da10
|
am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
* commit 'f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
|
2012-12-03 16:07:25 -08:00 |
|
Ying Wang
|
f8b804f8c5
|
Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
|
2012-12-03 16:00:27 -08:00 |
|
The Android Open Source Project
|
73fba4f6d3
|
am b1ba5ec9: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'b1ba5ec9cf1477010fa4bd151aad80eedd8a8c0c':
JDP64B
|
2012-12-03 16:00:07 -08:00 |
|
The Android Open Source Project
|
b1ba5ec9cf
|
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I1dacc7eb56c438ce9ab211ebdc1b19860bddc0c9
|
2012-12-03 15:58:04 -08:00 |
|
The Android Automerger
|
6d302128db
|
JDP64B
|
2012-12-03 15:54:56 -08:00 |
|
The Android Automerger
|
e21aec999d
|
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
2012-12-03 15:54:17 -08:00 |
|
Ying Wang
|
96aa714534
|
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
|
2012-12-03 15:49:13 -08:00 |
|
Jean-Baptiste Queru
|
fb28a3a4e5
|
resolved conflicts for merge of 0f4e3718 to master
Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
|
2012-12-03 15:05:25 -08:00 |
|
Jean-Baptiste Queru
|
0f4e3718df
|
Merge d2e4c25e
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
|
2012-12-03 14:46:37 -08:00 |
|
Dianne Hackborn
|
d2e4c25e3f
|
am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
* commit 'b7157909185968064db922bff6d7b1baabe305f4':
Obviously JB MR1.1 should be Android 4.2.2.
|
2012-12-03 14:26:03 -08:00 |
|
Dianne Hackborn
|
b715790918
|
Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
|
2012-12-03 14:24:04 -08:00 |
|
Robert Ly
|
04fc926d1e
|
am 70b80f2a: am 7bfd28d7: am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
* commit '70b80f2a9efb7ff52e6ece8626cc13c222474d90':
fix docs.js bug where changeApiLevel is getting called
|
2012-12-03 13:07:35 -08:00 |
|
Robert Ly
|
c60c594c1d
|
am b1202d15: am 54c59287: am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
* commit 'b1202d1512440b9122fc5a318222825af7787ca5':
docs: support google css class for reference docs
|
2012-12-03 13:07:34 -08:00 |
|
Robert Ly
|
70b80f2a9e
|
am 7bfd28d7: am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
* commit '7bfd28d74468845b5d2ef0db7753ef1e0075a575':
fix docs.js bug where changeApiLevel is getting called
|
2012-12-03 13:03:41 -08:00 |
|
Robert Ly
|
b1202d1512
|
am 54c59287: am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
* commit '54c59287722c354f7a8d326e8d5d144cef715b6e':
docs: support google css class for reference docs
|
2012-12-03 13:03:40 -08:00 |
|
Robert Ly
|
7bfd28d744
|
am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
* commit '4bfc9991b49fe2e4e2e77b61c4abe7e38eea6777':
fix docs.js bug where changeApiLevel is getting called
|
2012-12-03 13:00:45 -08:00 |
|
Robert Ly
|
54c5928772
|
am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
* commit 'fd3b957b4a63504e31801367056a0fb954e15c9c':
docs: support google css class for reference docs
|
2012-12-03 13:00:44 -08:00 |
|
Robert Ly
|
4bfc9991b4
|
am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
* commit '5c0f9e996a819806e5f088ded011bd30ef9c46d7':
fix docs.js bug where changeApiLevel is getting called
|
2012-12-03 12:59:24 -08:00 |
|
Robert Ly
|
fd3b957b4a
|
am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
* commit 'f88a53d5c309adca37210b86e5eb88a4c2706406':
docs: support google css class for reference docs
|
2012-12-03 12:59:24 -08:00 |
|
Robert Ly
|
5c0f9e996a
|
Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
|
2012-12-03 12:58:15 -08:00 |
|
Robert Ly
|
f88a53d5c3
|
Merge "docs: support google css class for reference docs" into jb-mr1-dev
|
2012-12-03 12:57:50 -08:00 |
|
Robert Ly
|
67d75f16f4
|
fix docs.js bug where changeApiLevel is getting called
Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca
|
2012-12-03 12:55:48 -08:00 |
|
Scott Main
|
bc09aed1be
|
am b1fb4417: am f8ea5ec7: am 838b0856: am df08adae: docs: add "Google Services" search tab
* commit 'b1fb4417131e2e511f7df426edcda34114674d66':
docs: add "Google Services" search tab
|
2012-12-03 11:59:40 -08:00 |
|
Scott Main
|
b1fb441713
|
am f8ea5ec7: am 838b0856: am df08adae: docs: add "Google Services" search tab
* commit 'f8ea5ec7cd4a20d4d0c56e12a790fc7b00dd42eb':
docs: add "Google Services" search tab
|
2012-12-03 11:57:24 -08:00 |
|
Scott Main
|
f8ea5ec7cd
|
am 838b0856: am df08adae: docs: add "Google Services" search tab
* commit '838b0856405949c03bd27f08441755055d2b4b89':
docs: add "Google Services" search tab
|
2012-12-03 11:55:05 -08:00 |
|
Scott Main
|
838b085640
|
am df08adae: docs: add "Google Services" search tab
* commit 'df08adae5b003bfb056341254c35a16ec9295afe':
docs: add "Google Services" search tab
|
2012-12-03 11:53:28 -08:00 |
|
Robert Ly
|
06884f596c
|
docs: support google css class for reference docs
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
|
2012-12-03 11:50:38 -08:00 |
|
The Android Open Source Project
|
07e91d269d
|
am b0dd2733: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'b0dd273382349e5a4ed95be405928d0bd76f10db':
JDP64
JDP60E
JDP60D
|
2012-12-03 11:36:37 -08:00 |
|
The Android Open Source Project
|
b0dd273382
|
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I297fc033ce22b086d98c050e91c8c2dc262c56c9
|
2012-12-03 11:33:55 -08:00 |
|
Dianne Hackborn
|
aa48e74b60
|
Obviously JB MR1.1 should be Android 4.2.2.
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
|
2012-12-03 11:07:37 -08:00 |
|
Scott Main
|
df08adae5b
|
docs: add "Google Services" search tab
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
|
2012-12-03 08:54:37 -08:00 |
|
Chris Wren
|
d2827ae0a8
|
unbundle photo dreams into the GalleryGoogle package
Bug: 7559766
Change-Id: I805ba625b6bfc4378ffabfa1d09edab1930dc913
|
2012-12-03 11:36:55 -05:00 |
|
The Android Automerger
|
dc64b2eb71
|
JDP64
|
2012-12-03 06:08:05 -08:00 |
|
The Android Automerger
|
e4ac051c63
|
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
2012-12-03 06:06:24 -08:00 |
|
The Android Automerger
|
58089996ac
|
JDP60E
|
2012-12-01 17:21:58 -08:00 |
|
Scott Main
|
2b1fa59c74
|
am 2a2eb040: am a5d5c010: am 408067be: am 8fa5351c: show build info only for android docs (not google)
* commit '2a2eb040a640ca3ef2f9b10d0449a431bad3ced1':
show build info only for android docs (not google)
|
2012-11-30 20:28:41 -08:00 |
|
Scott Main
|
2a2eb040a6
|
am a5d5c010: am 408067be: am 8fa5351c: show build info only for android docs (not google)
* commit 'a5d5c0101052b6fb468233a5bbfe075527c2018b':
show build info only for android docs (not google)
|
2012-11-30 20:26:54 -08:00 |