Xin Li
96da0608b4
DO NOT MERGE ANYWHERE - Update mirror-goog-studio-master-dev to use main branch.
...
Bug: b/289400079
Change-Id: I94b205dbd2ccbe0e6e391a0395f4eb946770cb2f
2023-07-31 09:32:04 -07:00
Joe Baker-Malone
f2a9b4fc07
Update skia to the version used in S
...
Test: //tools/base/dynamic-layout-inspector:skiaparser_tests
Bug: none
Change-Id: Ied900fe8751084666568fde2c6f233abf60b6c57
2020-11-16 13:22:59 -08:00
Ivan Gavrilovic
bcaddfb536
Remove desugar for studio-master-dev manifest
...
Bug: 76097571
Test: existing
Change-Id: I5227fcbaeda1534c0c064dd5c4d999844de715ca
2020-11-04 17:15:20 +00:00
Ivan Gavrilovic
3f628bd677
Remove dx from the manifest
...
This project is not used any more in
studio-master-dev.
Bug: 76094524
Test: existing
Change-Id: I3436c31e370e0366cdce5df8e775f8a79c402841
2020-11-04 10:12:14 +00:00
Ivan Gavrilovic
25833b8a5f
Avoid symlink for .editorconfig
...
This does not work on mac.
Bug: n/a
Test: using IJ on mac
Change-Id: I03ddf605640996349a58603722d076666eec3ec5
2020-10-26 21:05:49 +00:00
Jerome Gaillard
44bf0b1b75
Update frameworks/layoutlib revision
...
Change-Id: I5d5f92e4362c2ac5ca7e72fba1ee909b9bf7cfee
2020-10-20 18:40:41 +01:00
Jerome Gaillard
5f36c2bbf9
Update frameworks/layoutlib revision
...
Change-Id: Idb603ddc1d383272e4243b58ded0f681e7af8cb4
2020-10-15 16:32:29 +01:00
David Herman
debd08a3a8
Pin googletest to a specific revision
...
A recent update to googletest is breaking our tests, because we were
referencing the master revision, which is always kept up to date.
For now, we resolve this by pinning to a version grabbed from a few
weeks ago, when things were still working.
The error was:
```
tools/base/profiler/native/perfd/cpu/trace_manager_test.cc:
error: use of undeclared identifier 'DoAll'
.WillOnce(DoAll(SaveArg<0>(&cmd_1), Return(true)))
^
```
Change-Id: Ic2e1e803a51b8a3818ff56312b31a3bc4d7b2ca5
2020-09-15 00:36:58 +00:00
Ivan Gavrilovic
60b2aadd80
Symlink .editorconfig to subdirs
...
Symlink under tools/ was impacting tools/idea which
was not the intention. This change symlinks .editorconfig
under all projects included in AGP build.
Change-Id: I49a54d0684a0ac521b80d947ca8125f08ada5d63
2020-09-07 17:16:18 +01:00
Isaac Chai
c60f899350
Update frameworks/layoutlib revision
...
Change-Id: I7e5e889baab812536145f0343b1c76796cc79167
2020-09-03 17:21:59 -07:00
TreeHugger Robot
3626ea56ad
Merge "Update frameworks/layoutlib revision" into studio-master-dev
2020-08-26 11:17:13 +00:00
Emre Kultursay
308ed73092
Add darwin python to studio-master-dev manifest
...
Running new LLDB versions on darwin needs a new
version of Python that will be taken from prebuilts.
Bug: 161949938
Change-Id: I5b8a617fd3b9a8afec293409b15f9d7b41147e2a
2020-08-20 14:23:54 +03:00
Jerome Gaillard
d55ac5ce91
Update frameworks/layoutlib revision
...
Change-Id: Idac24e6b95bbfe02c44358202b7a2ae047a7b255
2020-08-19 14:13:33 +01:00
Bruno Buss
c06fc8cf14
Merge "Update perfetto version to support custom allocators" into studio-master-dev
2020-08-10 14:19:54 +00:00
Ivan Gavrilovic
5466f5c60b
Symlink .editorconfig from buildSrc to tools/
...
Bug: n/a
Test: existing
Change-Id: Icba55d2cfc6d00514df6963fab2113f76dc3e516
2020-08-07 14:05:25 +01:00
Emre Kultursay
a0736a0ae9
Use prebuilts/python from studio-master-dev branch
...
After the recent merges (Change I76fdc2d and Change If7d6647), the
contents of studio-master-dev and lldb-master-dev branches are identical
for prebuilts/python/[windows-x86|linux=x86]. Therefore, this should be
a no-functional-change.
Bug: 161271741
Test: No specific tests; ran studio_build.sh
Change-Id: Ib6aef2b1510b20932f868f6b9590a267e200226a
2020-08-04 16:46:08 +00:00
Joshua Gilpatrick
6210ac3222
Update perfetto version to support custom allocators
...
Custom allocator support in heapprofd is going to ship
in the gamessdk. To support custom allocators in studio
we need to update the perfetto config we import.
Test: locally + coverage in perfetto branch
Bug: 151355530
Change-Id: I03941f828cd6b1831a0a176adbb94e7eb6f9d993
2020-08-04 08:06:12 -07:00
Isaac Chai
b8eeeb2c7c
Update frameworks/layoutlib revision
...
Change-Id: I84fc79e332574bcb17e17380f151df9d128a0141
2020-07-20 11:39:00 -07:00
Emre Kultursay
56513dcbaf
Remove projects that depend on lldb-master-dev
...
...except Python, which will be handled in a different way.
Test: Existing tests.
Bug: 161271741
Change-Id: Ie95a8eb58232a531737c3551e99709fc8efb7046
2020-07-16 16:12:16 -07:00
Jerome Gaillard
606529971b
Update frameworks/layoutlib revision
...
Change-Id: Ia61abbca1bd7fb5fa0aa4b965d01e0fa8365edfe
2020-07-08 18:43:34 +01:00
Jerome Gaillard
457f7ce749
Update frameworks/layoutlib revision
...
Change-Id: I214f32c42e64d00e88b684e4b9ed21cada9cf56f
2020-07-02 12:51:20 +01:00
Joe Baker-Malone
5e959052b5
Use skia from R, try two
...
The Q skia code can't parse R skps, but (apparently) the other way does
work. So, using skia from R for now.
Test: none
Bug: none
Change-Id: Ie3d682e0aafed096af797cdea652ba86e29e9bb0
2020-06-25 18:50:36 -07:00
Joe Baker-Malone
6e595b697c
Merge "Revert "Use skia from R"" into studio-master-dev
2020-06-26 00:35:08 +00:00
Joe Baker-Malone
b3e5c33259
Revert "Use skia from R"
...
Revert "Update skia to the version used in R"
Revert submission 11981479-skia-r
Reason for revert: broken on mac
Reverted Changes:
Ia9610c47e:Update skia to the version used in R
Iffa9a1047:Use skia from R
Change-Id: Ia13a656c62cd3a98e10b4edb0926ea6e97a57926
2020-06-26 00:31:42 +00:00
TreeHugger Robot
3a5909e847
Merge "Use skia from R" into studio-master-dev
2020-06-25 21:46:52 +00:00
Esteban de la Canal
fd327b31d2
Add intellij-sdk project to manifests
...
Bug: 156497102
Change-Id: Ia9d13cd3418d4fb3e7084447885286e4dda53787
2020-06-20 11:29:31 -07:00
Chris Warrington
6768e4c020
Add gradle-recipes project to manifest
...
It will contain examples on how to use Android Gradle Plugin APIs.
Bug: 156614086
Test: N/A
Change-Id: I465d8efbbe8068227d02df46df074c95d9f751a8
2020-06-08 11:53:40 +01:00
Esteban de la Canal
4b0d4b08be
Adds studio-sdk manifest
...
This will be used to isolate IntelliJ code when building the platform
Change-Id: I572e22bb9806671f9c3594220712632339ea0b80
2020-06-05 00:29:04 +00:00
Jerome Gaillard
62597857e5
Update frameworks/layoutlib revision
...
Change-Id: Id2b5349dc30b380de0d24c70d40de6e506011651
2020-06-01 15:36:25 +01:00
Jerome Gaillard
82d267630d
Update frameworks/layoutlib revision
...
Change-Id: I6b2aca94eaf3b0756cfffc23253f32a01e73b1db
2020-05-15 16:46:39 +01:00
Jerome Gaillard
72a8f39f54
Update frameworks/layoutlib revision
...
Change-Id: I19bfff6c3a35c01cd4189b998cd92af5b9d8f4fa
2020-05-11 15:31:05 +01:00
Jerome Gaillard
68540920f6
Update frameworks/layoutlib revision
...
Change-Id: Ib6a035052c36dc7a884a54a2fa4e5983e004db5f
2020-04-29 17:58:53 +01:00
Joshua Gilpatrick
31526dda16
Update perfetto version to support building with MSVC 2019
...
A fix was made to the perfetto branch to allow building
bazel with 2019 build tools.
Change aosp/1287054
This is synced to a later change due to a breakage in
trace_processor that we depeending on aosp/1294096 fixes that.
Test: locally tested perfetto changes, perfetto branch has test.
Bug: 153566906
Change-Id: I0ec08a3f25537a30c96626fd12ca5b9aebbcd9b5
2020-04-23 11:04:35 -07:00
Sergey Vasilinets
0808a88f9a
Roll external/dexter
...
This new version of slicer contains a bug fix in entry hooks with with array parameters,
when instrumented method is large. This fix is needed by app inspection.
bug: 153006865
Change-Id: Ieef647b2ad2485ea86f62407cd00c5d2b3d41b1a
2020-04-14 20:19:38 +00:00
Jerome Gaillard
de1736d099
Update frameworks/layoutlib revision
...
Change-Id: I30c3c8b873e2940a1252c1b6d7b3e06b004ef31b
2020-03-25 11:36:41 +00:00
Joe Baker-Malone
550895f692
Use skia from R
...
The Q skia code can't parse R skps, but (apparently) the other way does
work. So, using skia from R for now.
Test: none
Bug: none
Change-Id: Iffa9a10474764592673e0c38d058c724dde17038
2020-03-11 23:48:45 +00:00
David Herman
3aa7463eab
Delete reference to obsolete google-services project
...
Change-Id: I171b0dd48acfb3bbc06f13adae717b25f66c6bcf
2020-02-10 09:50:04 -08:00
David Herman
11252a0a3a
Update dexter version
...
Bug: 145807282
Test: Covered by other CL in this topic
Change-Id: I8faab7a07c022ce7425d1d89521a0cfb0a21ae18
2020-02-05 17:27:47 -08:00
Bruno Buss
d10aa84845
Bump Perfetto version to 7198615.
...
Bump perfetto to ag/1213957 so it include the following fixes:
* aosp/1210044
* aosp/1210045
* aosp/1212145
* aosp/1212249
Between other improvements, there is this one in particular that allows
TraceProcessor to use way less memory:
* aosp/1215182
Bug: 147806282
Test: manual trace import (for Protos check) + TraceProcessor compilation.
Change-Id: Ifc0950ae722d6ae8f54689cb53db7ab9ca4ebc2f
2020-01-23 15:06:50 +00:00
TreeHugger Robot
28397ab306
Merge "Update frameworks/layoutlib revision" into studio-master-dev
2020-01-14 20:26:58 +00:00
Ruiqi Mao
e258facc51
Add android-emulator prebuilt to repo manifest
...
Emulator binary is used for emulator tests on RBE for Linux
Additional git repository adds 1.5GB to checkout size
Bug: 136178744
Change-Id: I91872cd412c436f56eec08f2492c94288d1f0aee
2020-01-08 13:32:39 -08:00
Jerome Gaillard
78420236ff
Update frameworks/layoutlib revision
...
Change-Id: Icbc0d4ee4613a84347bbf882753f84f23e08061f
2020-01-06 20:00:25 +00:00
Diglett Li
b1d9aa0b50
Merge "Symlink .bazelignore to top level directory." into studio-master-dev
2019-12-13 16:51:23 +00:00
Bruno Buss
8daf190817
Merge "Bump Perfetto to a202f00." into studio-master-dev
2019-12-13 16:18:22 +00:00
Gen Li
3e40386dc0
Symlink .bazelignore to top level directory.
...
Bug: 146000278
Test: N/A
Change-Id: If1b34149261e1c8e6a03c0c5501fe92d1a7d46ed
2019-12-12 12:25:22 -08:00
Bruno Buss
200458e85e
Bump Perfetto to a202f00.
...
Pin platform/external/perfetto to a202f00188556d3387ce41506db54de81945f5ff.
(ag/9816872)
Test: n/a
Bug: 142054929
Change-Id: Ica07d8a03ca385ea474dbf5ea5dfcf15064e37f1
2019-12-05 18:39:57 +00:00
Jerome Gaillard
230e8a66a5
Update frameworks/layoutlib revision
...
Change-Id: If3cd0334c74f4ca0ed6c0e72753978139775d0cb
2019-12-05 17:50:20 +00:00
Sergey Vasilinets
0adc5f8c23
Roll tools/dexter to newer version
...
New version contains new APIs needed by app-inspection
bug: 142729179
Test: N/A
Change-Id: Iaa25a1c4cb2ec8591efbb61b030748e35b2ef130
2019-11-26 15:51:38 +00:00
David Herman
e56cfc75c1
Update Dexter
...
A new API was added, replacing a boolean with an enum, which we'd like
to start carrying forward in existing code.
Bug: N/A
Test: N/A
Change-Id: Iae20c98d02c74743e237c4d4fdf7b8b0cccac45d
2019-11-21 12:22:49 -08:00
David Herman
f6a5d93844
Revert Change Ib4897f24
...
… following the fix by Change I41f126b1.
Change-Id: Icaedea37c645aeae92fac0fafcdf0bb70dd4b18b
Issue: 144590256
2019-11-18 16:00:00 -08:00
Dana Dahlstrom
a928672d96
Pin platform/external/googletest to revision
...
… before AOSP Change I79ae6c68 broke the build on studio-master-dev.
Change-Id: Ib4897f24edcada7c560485e80780f0e316c92667
2019-11-15 14:30:00 -08:00
Jerome Gaillard
482cf29eed
Update frameworks/layoutlib revision
...
Change-Id: Idc2a508c6c27f60f16fb3bfed87b10230edfd127
2019-10-31 11:52:17 +00:00
Jerome Gaillard
83663539f2
Update frameworks/layoutlib revision
...
Change-Id: I5c6a1e13de8f95bd3f015211a1ac5a60e3b4dfae
2019-10-15 12:23:25 +01:00
Fedor Kudasov
997ec7439f
Update frameworks/layoutlib revision
...
Change-Id: I01fb8a2dce1b01ed2d40fcf7f800c3d542f0928c
2019-10-10 17:00:25 +01:00
Joe Baker-Malone
e019aeba49
Copy tools instead of symlinking
...
Test: none
Bug: 141461148
Change-Id: I2eb06d939c5b9b4a4b1bb3ca792cb3f509139e68
2019-09-23 10:22:50 -07:00
Joe Baker-Malone
cc737ee94f
Use clang from studio-master-dev
...
Change-Id: I98185e53b442c861f7bca23923ed8ba34edaad22
2019-09-19 12:03:22 -07:00
Joe Baker-Malone
e4890cbaf0
Add clang
...
Since we aren't branching the clang prebuilts we pin to a specific
version in the manifest. This can be updated to any commit from
mirror-aosp-master if need be.
Note that currently there will be an issue using a more recent version
of the windows clang, since in later versions some of the symlinks
we're creating via repo are checked in, and currently when we sync on
rbe symlinks aren't created correctly (though they are created
correctly when added by repo).
Test: none
Bug: 135278528
Change-Id: I8de9a6e801a5797dd9ace895aac05240ef6a8e08
2019-09-18 15:51:27 -07:00
Jerome Gaillard
f12e853847
Update frameworks/layoutlib revision
...
Change-Id: I8e79df733101cabe71fb3194ef802ae9ffe47a0c
2019-09-04 12:19:02 +01:00
Jerome Gaillard
4fddfbae35
Update frameworks/layoutlib revision
...
Change-Id: Id8377aab5bc17e80d7341fa69b60da09eed2c0f9
2019-08-19 16:09:41 +01:00
Jerome Gaillard
74c1e2c2b4
Update frameworks/layoutlib revision
...
Change-Id: I2afa4559078220ad2dfc6cf0edfa9d4bda4c66d5
2019-07-24 15:09:39 +01:00
diegoperez
3dd4a0187b
Update frameworks/layoutlib revision
...
Change-Id: I895240bb0d81dff43da49b62284c7132880fd46a
2019-07-03 19:35:00 +00:00
Jerome Gaillard
2a09b248f3
Update frameworks/layoutlib revision
...
Change-Id: I10ed992d3f4921c8333f25acc0bd62af16202ed6
2019-06-24 14:54:11 +01:00
Jerome Gaillard
6e58928f7c
Update frameworks/layoutlib revision
...
Change-Id: If64ef7b8e78890f91021913bf9b254f6712cad9d
2019-06-21 16:09:05 +01:00
Joe Baker-Malone
ff53e5e75e
Merge "Add components for skia" into studio-master-dev
2019-06-20 22:19:40 +00:00
Joe Baker-Malone
e3bcebd8e5
Add components for skia
...
Test: none
Bug: 135278528
Change-Id: I1d82d36e772c2c54169a9e977267e2cfe9c5b49d
2019-06-20 12:35:26 -07:00
Joe Baker-Malone
0a171c6158
Add sync-c to project defaults
...
Change-Id: Iace94d70cc929fd9411136e423c51dfdae1a34c3
2019-06-20 18:44:01 +00:00
Adarsh Fernando
f8b5a84016
Adding external/dokka to studio-master-dev
...
Bug:66461786
2019-06-19 14:11:11 -07:00
Jerome Gaillard
910faff4c0
Update frameworks/layoutlib revision
...
Change-Id: Id151b92aef587d59b1be164a12165cc24600e93d
2019-06-13 19:50:35 +01:00
Fedor Kudasov
184a0172c4
Update frameworks/layoutlib revision
...
Change-Id: Ibdb8a656717ee7688adef654601de124780af05b
2019-06-07 07:52:58 +01:00
Joe Baker-Malone
fa2d50a495
Remove swt
...
Test: none
Bug: none
Change-Id: I8f7b776ec5d314cb5f1a1c7f1dd6617247795713
2019-06-04 16:39:23 -07:00
Fedor Kudasov
e08609cb07
Update frameworks/layoutlib revision
...
Change-Id: I6c87ea964e080fca649c68badea0106db74e0646
2019-05-31 12:56:24 +01:00
Jerome Gaillard
a17ea66771
Update frameworks/layoutlib revision
...
Change-Id: I71b31e2beace53f7800fd3b1140db5f8eac100d0
2019-05-28 19:21:50 +01:00
Fedor Kudasov
044a84b40c
Update frameworks/layoutlib revision
...
Change-Id: I5e9a20d0752152de7131973603ed5666e6a59d9c
2019-05-22 16:40:47 +01:00
Fedor Kudasov
27cdf3425a
Update frameworks/layoutlib revision
...
Change-Id: If68cfa37e0eb6a1935aea3ca87e74e987ee4ec22
2019-05-19 13:52:22 +01:00
Jerome Gaillard
0509d5a696
Update frameworks/layoutlib revision
...
Change-Id: Ia867b7ee7c87aa96f285f34d4dc1600a98af7e3c
2019-05-16 20:08:16 +01:00
Jerome Gaillard
cf5c915505
Update frameworks/layoutlib revision
...
Change-Id: I3012133823ce1a25466aab237d9c2bde65f337ca
2019-05-15 14:51:36 +01:00
Jerome Gaillard
36e8782577
Update frameworks/layoutlib revision
...
Change-Id: I2ea7d5d35dc91e1298c47ee32f8c3a4538434be3
2019-05-13 12:02:02 +01:00
Sergey Prigogin
262874102a
Update frameworks/layoutlib revision
...
Change-Id: I481008d71cc26d844b5382388cef622b941910cb
2019-05-11 15:04:44 -07:00
Fedor Kudasov
9029dfb24d
Update frameworks/layoutlib revision
...
Change-Id: I808aa5f3191c3a030123d4c2e4281b7a123d8ba3
2019-05-01 09:31:15 +01:00
Yi Yang
90bf07e99b
Manually sync tools/dexter changes
...
Updated tools/dexter to support new instruction formats, using ART
instruction list as the source of truth.
Bug: 37272822
Change-Id: I4b82602aa91d2fc73fc1251d32258f6e37716486
2019-04-05 15:13:08 -07:00
Jerome Gaillard
9ddee2e8bd
Update frameworks/layoutlib revision
...
Change-Id: I319d7c926c2afdc557c1fb9622208e8b7ddd5faf
2019-04-03 17:05:51 +01:00
Sergey Prigogin
487bbac84b
Merge "Update frameworks/layoutlib revision" into studio-master-dev
2019-04-02 16:50:19 +00:00
Sergey Prigogin
b13a2c77d6
Update frameworks/layoutlib revision
...
Change-Id: I4e3540247199230eb7bd680b799f75fe6129451a
2019-04-01 19:51:50 -07:00
TreeHugger Robot
df5964fa51
Merge "Update perfetto version to support userspace trace events" into studio-master-dev
2019-04-01 23:20:37 +00:00
Sergey Prigogin
d196f9b011
Update frameworks/layoutlib revision
...
Change-Id: I6f1d35362f50d30cc18a2c7819e9f63d4ac3704e
2019-03-29 16:44:16 -07:00
Joshua Gilpatrick
de7d699e10
Update perfetto version to support userspace trace events
...
A number of bug fixes have gone into perfetto since the initial
snapshot, these bug fixes are primiarly around supporting deploying
perfetto to P and running a trace.
Test: locally tested perfetto changes, perfetto branch has test.
Bug: 126401684
Change-Id: I0aa17aa61d44ba1fb3e0dfc5f1526fa7a5de1238
2019-03-29 12:29:44 -07:00
Sergey Prigogin
d39fa673ce
Update frameworks/layoutlib revision
...
Change-Id: Ifeab06cf2b670ce34a04a9ec2c625befb5b991fb
2019-03-08 14:03:14 -08:00
Joshua Gilpatrick
cface71f0d
Add perfetto to the build manifest
...
Change-Id: Ic084d69362d33124db430dc89471cd6d4ded7427
2019-03-06 08:34:01 -08:00
Sergey Prigogin
43cdf97ea4
Update frameworks/layoutlib revision
...
Change-Id: I9be8d3dfb77a458e2daa4d5461ae8281bc93d58f
2019-03-04 09:13:42 -08:00
Dana Dahlstrom
d0c234d71c
Sort open-source projects by path
2019-03-01 18:00:00 -08:00
Dana Dahlstrom
61d1214064
Remove unused project platform/external/flatbuffers
...
Change-Id: I533a20fe9087875a62ff84edb73dfacb85c11426
2019-03-01 16:20:00 -08:00
Sergey Prigogin
0332e1bce4
Update frameworks/layoutlib revision
...
Change-Id: I137798059817c19fdb951d73eaaf5a4d2d865fef
2019-02-27 19:40:55 -08:00
Chris Warrington
987735a640
Remove obsolete performance test projects.
...
Bug: N/A
Test: Unused, existing tests should be unaffected.
Change-Id: I1897427768b03de6c486e1ce033f38bac1ce40f4
2019-02-07 11:14:54 +00:00
Jerome Gaillard
1a691b93e4
Update frameworks/layoutlib revision
...
Change-Id: I23a63e0d5688241c3604050bdb2d536efb8e4529
2019-02-05 16:53:37 +00:00
Sergey Prigogin
c055da71a1
Update frameworks/layoutlib revision
...
Change-Id: I837ec9642aa349f14d2ce135c0d4dae08270ea55
2019-01-28 11:43:16 -08:00
Jerome Gaillard
8297a048f5
Update frameworks/layoutlib revision
...
Change-Id: Ibdccb17721c9c91e9ca0e75c40418ef7454ca0c8
2019-01-08 17:14:51 +00:00
diegoperez
9fcceb3075
Update frameworks/layoutlib revision
...
Change-Id: I2f4b66d2fd97d1017b929044a4af92dbdad3e34d
2018-12-15 18:20:49 +00:00
Jerome Gaillard
a930a0715c
Update frameworks/layoutlib revision
...
Change-Id: I522c59c8949a7cfa22acd9bafed2683279904159
2018-12-12 15:13:28 +00:00
Jerome Gaillard
3006027d6d
Update frameworks/layoutlib revision
...
Change-Id: I9aeb2191221b8491685fe3c6eb55f617572e1ebb
2018-12-10 13:38:33 +00:00
Chris Warrington
ad466cd619
Add external bazel kotlin rules.
...
To allow us to migrate from our custom rules.
Bug: 79738963
Test: Will be used in a subsequent CL.
Change-Id: I8a1d343877dc4aca504faa45475d28341b15c6e6
2018-12-05 17:22:54 +00:00
diegoperez
714667a20d
Update frameworks/layoutlib revision
...
Change-Id: Iaaff98ec7bf04073a24a8bbbcd14696217067a8d
2018-12-05 12:37:01 +00:00
diegoperez
b41fa6424b
Update frameworks/layoutlib revision
...
Change-Id: I2aadb6100bff184ffd1b9c1504fc9a8ac60ce098
2018-12-04 12:12:40 +00:00
Armand Navabi
3f31ae784d
Remove bazel.rc symlink after specifying in bazel wrapper (ag/5429817).
...
This reverts commit 8ef73596c4
2018-11-05 20:42:02 +00:00
Armand Navabi
8ef73596c4
Revert "Remove bazel.rc symlink and instead have CI bots explicitly point to bazelrc file."
...
This reverts commit a547116d1052015822c9514d55e6b29c561788f8.
Reason for revert: This breaks ab/studio-master-dev studio target
because there ant rules that end up calling bazel, and they do not
pass it --bazelrc. Thus, they expect to find the symlinked file that
this change removes. Reverting this means that those bazel commands
will find the bazel.rc in tools.
Change-Id: Ie639adfc611df115e9cba41e5ace93ace7037462
(cherry picked from commit b6c994d4eb488e8fa25676188ca3221281bf1351)
2018-11-02 02:20:41 +00:00
Armand Navabi
93e6ba5af4
Remove bazel.rc symlink and instead have CI bots explicitly point to bazelrc file.
...
Explicitly specified here: ag/5413069
Bug: N/A
Test: N/A
2018-11-01 11:34:29 -07:00
Jerome Gaillard
566845fd60
Update frameworks/layoutlib revision
...
Change-Id: I2f9a900a5f7096e31307cd2ba502d8ce31eadb4f
2018-10-12 11:53:37 +01:00
Jerome Gaillard
05d867fe27
Update frameworks/layoutlib revision
...
Change-Id: I9d7735fb16c435fd1a6f66c775a90f4aaee0f3e2
2018-10-01 19:21:45 +01:00
Jerome Gaillard
c4878b5298
Update frameworks/layoutlib revision
...
Change-Id: Idd5eb9111c7b438238d4708217ddde144b628eb4
2018-09-20 18:46:48 +01:00
Siva Velusamy
d1ce0cbffb
Remove eclipse prebuilts
...
(cherry picked from commit f859205
2018-09-12 21:21:21 -07:00
Dana Dahlstrom
aa71aaaf56
Remove project platform/sdk
...
… unused after Change I5df09ca3.
Change-Id: I62f0d9ecd8167524059eb92ec16c3f5bf725f114
2018-09-12 21:21:21 -07:00
Jerome Gaillard
342132c6b5
Update frameworks/layoutlib revision
...
Change-Id: Ibc324a41ec3930ff19be54eb92a502a133ecdf52
2018-09-12 01:26:57 +01:00
Jerome Gaillard
625f749a9f
Update frameworks/layoutlib revision
...
Change-Id: Ica6be9d29fbc715d6162a3a0772b32c8642ade84
2018-08-30 16:29:45 +01:00
Sergey Prigogin
731e5b6878
Update frameworks/layoutlib revision
...
Change-Id: I5e9c65cbcbd8c111cf4d665d8407a042dade3c1a
2018-08-27 10:49:51 -07:00
Sergey Prigogin
7bca40de20
Update frameworks/layoutlib revision
...
Change-Id: I870f7b4c4dce88dfc15580466703ead4b5c44246
2018-08-13 14:54:03 -07:00
Dana Dahlstrom
199f38465c
Remove project platform/prebuilts/visualcpptools
...
… added by Change I58add41d.
Change-Id: I8391a2308e9f5fd9e3d9867445a708feab118a1b
2018-08-13 10:40:00 -07:00
TreeHugger Robot
62aad2282d
Merge "Add flatbuffer to studio-master-dev" into studio-master-dev
2018-08-09 16:57:46 +00:00
Fabien Sanglard
40db7faad3
Add flatbuffer to studio-master-dev
2018-08-07 15:59:57 -07:00
Dana Dahlstrom
043a95139f
Remove unused project platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8
...
… added by Change I7d0d3853.
Change-Id: Ia1762f8744da05d754de1b28db04072e75bf8e02
2018-08-07 15:30:00 -07:00
Dana Dahlstrom
b0a821b3f7
Remove unused projects added by Change I88826269
...
Change-Id: I8ae2c46997ce91d21735d21d3bf87a4c1fb27cea
2018-08-07 15:30:00 -07:00
Dana Dahlstrom
076a47f772
Remove unused project platform/prebuilts/clang/darwin-x86/sdk/3.5
...
… added by Change I7a237052.
Change-Id: Id11aee01b9a758dfe8853dad74011b01c3d4aa89
2018-08-07 15:30:00 -07:00
Dana Dahlstrom
f87c37032e
Remove unused project prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8
...
… added by commit 37298df
2018-08-07 15:30:00 -07:00
Dana Dahlstrom
5a0752cd9f
Remove unused project prebuilts/sdk
...
… added by Change I1eb4563b.
Change-Id: I6b1141c3357bb0a2fb1313ce70e7961af8fb620a
2018-08-07 10:20:30 -07:00
Dana Dahlstrom
7474d079cd
Remove unused project platform/prebuilts/maven_repo/android
...
… added by Change I88143abb.
Change-Id: If65af0b01fbd5897e027b3709149bde2ce6ba5a3
2018-08-07 09:20:00 -07:00
Dana Dahlstrom
40a546e140
Remove projects platform/prebuilts/clang/host/*
...
These projects were added by Change I64e36421 but referencences to them
removed by Change Idb45fef9.
Change-Id: I8a9e4a4c5622209f2de1ea00b939ee0b3cffd0d8
2018-08-03 18:00:00 -07:00
Dana Dahlstrom
c6f89b7123
Remove unused project platform/external/libunwind
...
… added by Change I4104c354 and perhaps used briefly
until Change Ie26037be.
Change-Id: I9f495ef464431d3acf3fe830769b2287e0d1bab0
2018-08-03 17:42:00 -07:00
Dana Dahlstrom
222dc0d57a
Remove unused project platform/external/iosched
...
… added to studio-master-dev by Change I0d3e4411.
Change-Id: I0a444ae81690d8087f4a2cfdda15fd0f497ea9f1
2018-08-03 17:30:00 -07:00
Dana Dahlstrom
68d54061c2
Remove unused project platform/frameworks/native
...
… inherited from studio-1.3-dev where it was added apparently
mechanically by Change I82a305c3.
Change-Id: I9c21927496d213f6250ef7259f68e312f17826a0
2018-08-03 17:17:17 -07:00
Dana Dahlstrom
f6b097d69d
Remove unused project platform/external/gtest
...
… apparently never added to studio-master-dev,
but inherited from other branches.
Change-Id: If88045a50e2a422fc86c3b4c8e59233de1490571
2018-08-03 17:00:00 -07:00
Dana Dahlstrom
70f481daf5
Remove unused project platform/tools/studio/google/login
...
… whose code was moved to platform/tools/studio/google/cloud/tools by
commit 005f5da.
Change-Id: I0c57f0d0a01f06964139aaa9588a6add7b04dfa5
2018-08-03 11:22:33 -07:00
Dana Dahlstrom
e6d7bc213d
Remove project platform/external/ant-glob
...
… added (on master) by Change I6b5e57b7
and unused by Android Studio builds.
Change-Id: I84199c18485dfeaf24b296583f60c410956d63e2
2018-08-03 09:00:00 -07:00
Dana Dahlstrom
e1f694db5b
Remove unused project platform/external/boringssl
...
… added by Change I06324b8e.
Change-Id: I131752559149b9d207cf26fdebd521a1de981ab7
2018-08-03 09:00:00 -07:00
Dana Dahlstrom
68efd25e0d
Remove unused project platform/external/android-kotlin-demo
...
Issue: 36509693
Change-Id: If41b08707c98a52423ab9a6d03229a00e0ce64a5
2018-08-02 16:00:00 -07:00
Pascal Muetschard
aac8ca7903
Remove the golang.org dependencies from the GPU project.
...
These dependencies are now checked in under the GPU repository's
vendor directory.
(cherry picked from commit 0d7465d
2018-08-02 10:00:00 -07:00
Dana Dahlstrom
3344a381c2
Remove project platform/tools/vendor/microsoft
...
… added (on master) by Change I5b93973c, affected last by Change
Ieab59c1e, and unused by Android Studio builds.
Change-Id: I22a23eb28df597124f8ed9c9ba2474edc232ff9c
2018-08-02 09:30:00 -07:00
Dana Dahlstrom
99fb217fb1
Remove project platform/tools/studio/google/play
...
… which has always been an empty repository.
Change-Id: Ibfcc9e51d734241859cf544e6207a7ff5cf0c3fa
2018-08-01 23:00:00 -07:00
Dana Dahlstrom
95f78367a1
Remove unused project platform/external/smali
...
Change-Id: Ia5c52b8ece4572aa32a22bba8f4b62a42c81c82d
2018-08-01 09:00:00 -07:00
Sergey Prigogin
8315a47f35
Update frameworks/layoutlib revision
...
Change-Id: I86743df75aefe8bf3ed5ea94819757ab558e5432
2018-07-26 15:59:36 -07:00
Sergey Prigogin
9aee1053fb
Update frameworks/layoutlib revision
...
Change-Id: I6cea4632a05f0919da5cc780cb4830c4db989f1b
2018-06-25 04:20:55 +00:00
Jerome Gaillard
16e609f154
Update frameworks/layoutlib revision
...
Change-Id: Ica16d50a4beefacc9b3155ccde5c51c918db9a72
2018-06-06 15:34:11 +01:00
Jerome Gaillard
2ee2ff1062
Update frameworks/layoutlib revision
...
Change-Id: I6f1cf7362e2472a6337a3920ecd32cd029cc6f65
2018-06-05 17:44:53 +01:00
Sergey Prigogin
d1c3644f3b
Update frameworks/layoutlib revision
...
Change-Id: I1bf9e5e47e6568982f0d4f40c0296d011c082b04
2018-05-22 14:25:52 -07:00
Diego Perez
72d6e9c943
Update frameworks/layoutlib revision
...
Change-Id: I9c9a68507321b392e928599c141e7f512197841f
2018-05-15 04:10:12 +01:00
Jerome Gaillard
d9dbab8918
Update frameworks/layoutlib revision
...
Change-Id: Id44c11af9d3263291b87c9f06688e25368739540
2018-05-07 22:49:35 +01:00
Diego Perez
d20fc2e21d
Revert "Update frameworks/layoutlib revision"
...
This reverts commit a242ea3db7
2018-05-07 13:51:25 -07:00
Esteban de la Canal
54baf79562
Fixes incorrect path on project
2018-05-07 13:04:45 -07:00
Esteban de la Canal
d27db0ae1c
New internal only project with build benchmarks.
2018-05-07 12:29:34 -07:00
Jerome Gaillard
a242ea3db7
Update frameworks/layoutlib revision
...
Change-Id: I5ce6e3d73ad018c84815ebd25122d95596c15750
2018-05-05 01:21:42 +01:00
TreeHugger Robot
7c6eb2313f
Merge "Symlink gradle report consolidation script" into studio-master-dev
2018-03-20 18:35:22 +00:00
Dana Dahlstrom
448fd25e82
Remove weird, badly named tools.idea.BUILD file
...
Change-Id: Ife5c8d1166f508a797a2620f617e12b2ccecf92b
2018-03-19 10:12:51 -07:00
Eric Reed
d70d480b5a
Symlink gradle report consolidation script
...
For ease of invocation
Test: N/A
Change-Id: I21929a723005fef34871e9d5ad1dd67fff3f1c41
Test-strategy: all
Bug: 73731093
2018-03-15 00:49:42 +00:00
Bill Yi
1ee603ae93
remove x86_64-linux-glibc2.11-4.* prebuilt
...
BUG:74123870
Test: tools/idea/build_studio.sh
Change-Id: I51bc3c735bd8c6cee6b6b315273940c95436209d
2018-03-14 13:40:07 -07:00
Joshua Gilpatrick
6081f3469e
Adding gflags to studio-master-dev manifest
...
Test: Manually did "repo sync -c -j32"
Fixes: 64765823
Change-Id: I475bf8f9eff3cd0d7898d177e629ffca0a2b14db
2018-03-08 11:29:45 -08:00
Christopher Pilch
6ba199b50c
Adds gitwatcher2 presubmit hook
...
Adds a repo hook that searches a commit for a string matching the same
style gitwatcher2 uses
(https://cs.corp.google.com/piper///depot/google3/experimental/users/jsharkey/gitwatcher2/configs.py )
Test: Ran Locally. Include new unittest.
Bug: 71873475
2018-02-05 19:33:36 -08:00
Andrew Ford
546115aac7
Make python prebuilts not plaform dependent
...
Local builds are actually for all platforms, so we need each platform's
prebuilt to be available.
2018-02-02 16:19:25 -08:00
Diego Perez
961b6999d7
Merge "Revert "Update frameworks/layoutlib revision"" into studio-master-dev
2018-02-01 08:34:34 +00:00
Diego Perez
25544c51d7
Revert "Update frameworks/layoutlib revision"
...
This reverts commit 84ddf118bf
2018-02-01 08:30:32 +00:00
Andrew Ford
d00896ed8a
Add python prebuilt to platform-* groups
2018-01-31 10:51:27 -08:00
Chris Warrington
303d06fc5b
Remove gpu projects from studio-master-dev manifest.
...
Test: existing, they should be unused.
Change-Id: Iaccc445cb8ed8c6b46b6b026bc11bf1cc0075e2a
2018-01-31 12:18:02 +00:00
TreeHugger Robot
9940d1eaa7
Merge "Update frameworks/layoutlib revision" into studio-master-dev
2018-01-30 17:34:02 +00:00
Diego Perez
84ddf118bf
Update frameworks/layoutlib revision
...
Change-Id: I3ae11f7a80c95d25720fc188d746e76133622a95
2018-01-30 16:44:53 +00:00
Chris Warrington
5b6f1773ba
Remove prebuilts/ndk from studio manifest.
...
Change-Id: Iae763861148c02f34364950f503b0841260218c2
2018-01-30 12:32:03 +00:00
Chris Warrington
18d603d992
Add tools/apkzlib separate git project.
...
It Will be removed from tools/base.
Change-Id: Ib31417d065dd2219ca7fa2e67aed4adc6892f384
2018-01-10 17:58:18 +00:00
Alex Klyubin
a0a1f1b332
Use apksig from studio-master-dev branch
...
Up until now, studio-master-dev branch has been using tools/apksig
from master. We now want to insulate studio-master-dev's apksig from
automerges from master. Thus, this commit updates the manifest of
studio-master-dev branch to use tools/apksig from its newly created
studio-master-dev branch. This insulation approach is in line with
most other tools used in the studio-master-dev branch.
2017-12-27 15:38:58 -08:00
Armand Navabi
ffabe635d7
Remove vendor/google from studio-master-dev manifest.
...
The platform/vendor/google project in master is being split (see
go/vendor_google_split). As part of that split we need to move anything we have
in that project to one of the specific projects in that go link. I looked in
that project and we don't have anything. There is a build_trigger directory
and there is a .git file in that directory. This CL will just remove
vendor/google from studio-master-dev checkout. Note, that this is different
than tools/vendor/google which contains adrt.
Bug: 68863888
Test: N/A
Change-Id: Ida010b79726708d865df15104b630aa94e337878
2017-12-07 17:41:47 -08:00
Eugene Zemtsov
2f5e0f450c
Add libunwind mapping for MacOS.
2017-10-30 19:34:05 -07:00
Eugene Zemtsov
c1e59974a2
Add libunwind to the Studio branch
...
libunwind will be used in perfa to get native backtrace.
Resubmitting a8a61aaa1b
2017-10-25 16:47:26 -07:00
Eugene Zemtsov
3c5cf8b2fd
Revert "Add libunwind to the Studio branch".
...
Libunwind has aux folder and it makes windows unhappy.
Will make it linux only repo and reapply
This reverts commit a8a61aaa1b
2017-10-25 23:06:00 +00:00
Eugene Zemtsov
a8a61aaa1b
Add libunwind to the Studio branch
...
libunwind will be used in perfa to get native backtrace.
2017-10-24 18:55:13 -07:00
Yohann Roussel
df48c46e41
Use prebuilts/r8
...
To align with master behavior.
Change-Id: I06205811f6dc2c7e0ee437d17ddc9a2f20fca361
2017-10-24 13:45:36 +02:00
Raluca Sauciuc
7ecdc8b4c2
Update manifest to include external/jetbrains/kotlin
...
Change-Id: I555eb29532619c37dc56b69d2c84ca1c9578941c
2017-10-18 15:27:16 -07:00
Chris Warrington
17174e2cbf
Add the prebuilt remote SDK.
...
Test: manual verification of repo sync.
Issue: b/67884948
Change-Id: I4c13598921e02e4c821b42cb0724fd66bcef3031
2017-10-17 12:53:24 +01:00
Billy Lam
5b23fa4fc1
Add dexter to external
...
The studio-master-dev branch has been moved up to ToT of master
in b/67422727.
Bug: 66220886
2017-10-06 16:29:32 -07:00
TreeHugger Robot
1548cccf37
Merge "Remove hack for running aswb_tests in PSQ." into studio-master-dev
2017-09-14 22:26:27 +00:00
Yohann Roussel
4e7c564b3a
Merge "Remove dependency to external/r8" into studio-master-dev
2017-09-14 17:45:28 +00:00
Yohann Roussel
43c6641dd3
Remove dependency to external/r8
...
Since we're now using the prebuilts.
Change-Id: I57f15c6cc46daa335b21ba32a771f25260547278
2017-09-07 17:11:01 +02:00
Chaoren Lin
e30b0c0a92
Remove hack for running aswb_tests in PSQ.
...
ag/2854651 makes the hack obsolete.
Change-Id: I7c6c557c1d4a27f2f444639aca2aa99c2a085ad9
2017-09-06 16:31:11 -04:00
Karthik Ravindran
5e8d3ab30d
Revert "Fetch CMake 3.8.2 for testing gradle"
...
This reverts commit d42ed6f15a
2017-09-06 18:54:22 +00:00
Karthik Ravindran
d42ed6f15a
Fetch CMake 3.8.2 for testing gradle
...
Test: NA
Change-Id: I9423dbfb3f341e8d2a46f1b33d0d92244d12360f
2017-09-06 09:19:38 -07:00
Karthik Ravindran
c4890a2c3f
Revert "Update to fetch latest cmake"
...
This reverts commit 8a40839b27
2017-09-05 16:15:06 +00:00
Karthik Ravindran
8a40839b27
Update to fetch latest cmake
...
This update to the revision will sync the most recent cmake released
with studio (3.6.0-rc2) and vanilla cmake used for testing-only (3.8.2) in prebuilts folder.
studio-master-dev/prebuilts/cmake/<OS>/3.8.2/
studio-master-dev/prebuilts/cmake/<OS>/<3.6.0-rc2>
Change-Id: I9bcdc653b7053fedd6563b98a06adedde36efe4c
2017-08-25 13:35:51 +00:00
Ivan Gavrilovic
f883efdb43
Update external/android-studio-gradle-test
...
Update to ToT.
Change-Id: I9505f16a5187ea291eac17bea825883b23fcc40e
2017-08-22 17:01:34 +01:00
Eugene Zemtsov
394e79a9a1
Add Visual Studio build toolchain project.
...
We need it to make windows builds hermetic.
Bug: 64451153
2017-08-11 17:25:07 -07:00
Chaoren Lin
13671afe97
Make aswb_tests available from studio.
...
After moving the blaze plugin into its own workspace, we need an entry
point for the PSQ to reach the aswb tests.
Change-Id: Iccc52a3938908f0954c0d60e7f38f0e29caeebf1
2017-07-28 15:08:00 -04:00
kuantung
88fe6189cb
manifest config adding build_trigger project
...
BUG:63938884
2017-07-25 13:13:59 -07:00
Ivan Gavrilovic
8399769e96
Add r8 to studio-master-dev
...
Map r8 to tools/external/r8 dir.
Change-Id: Ibe61471a1b91d874952a095cdcb007a748e25c31
2017-06-19 22:19:50 +00:00
Esteban de la Canal
227aa5e5dc
Merge "Revert "The SDK now has the same path on all platforms"" into studio-master-dev
2017-05-19 18:29:24 +00:00
Esteban de la Canal
9974542fed
Revert "The SDK now has the same path on all platforms"
...
This reverts commit 056f7bc72b
2017-05-19 15:58:42 +00:00
Bill Rassieur
b0582fa4f5
Revert "Temporarily point the manifest to master layoutlib"
...
This reverts commit a7b6cc8445
2017-05-18 14:26:12 +00:00
Diego Perez
a7b6cc8445
Temporarily point the manifest to master layoutlib
...
Until oc-dev is approved, we can use the master source for debugging
Change-Id: Id0b9c127d0e2c2525dd71ac6836162d6f0aed682
2017-05-18 10:45:51 +01:00
Esteban de la Canal
056f7bc72b
The SDK now has the same path on all platforms
...
Using symlinks we can now have the sdk at
//prebuilts/studio/sdk/host
Test: Tested manually on the three platforms.
2017-05-15 12:56:25 -07:00
Raluca Sauciuc
07ec698694
Add platform/external/android-kotlin-demo to studio-master-dev
...
Change-Id: I475cd2851d7842c9be782221600340d9b411ba19
Reviewed-on: https://googleplex-android-review.git.corp.google.com/2147735
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Tor Norbye <tnorbye@google.com >
Reviewed-by: Steve Yegge <stevey@google.com >
2017-04-26 23:22:21 +00:00
Peter Xu
82889a06b1
adt_infra_internal should be in group adt-infra
...
Change-Id: I51ac6161c8ac3b1bce1736681afe00553506abb5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/2037470
Reviewed-by: Peter Xu <peterx@google.com >
Reviewed-by: Armand Navabi <navabi@google.com >
Autosubmit: Peter Xu <peterx@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-03-30 00:11:34 +00:00
Peter Xu
b9bb6f81e3
Switch adt_infra_internal to use studio-master-dev branch.
...
Change-Id: I87a20d203e2b84315730f40645d544cc931322c6
Reviewed-on: https://googleplex-android-review.git.corp.google.com/2030965
Reviewed-by: Peter Xu <peterx@google.com >
Reviewed-by: Andrii Dehtiarov <adehtiarov@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-03-29 18:00:14 +00:00
Diego Perez
6e14bf29b7
Update frameworks/base revision
...
Change-Id: I51dd262da00964afd3622538d18cda471a373f26
Reviewed-on: https://googleplex-android-review.git.corp.google.com/2021340
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-03-28 10:54:49 +00:00
Ivan Gavrilovic
776210bf03
Remove libcore from manifest
...
We do not need it any more, as dx is self-contained.
Change-Id: Ib92efa24f02803716c5414e611367c2348cd3e31
Reviewed-on: https://googleplex-android-review.git.corp.google.com/2009327
Reviewed-by: Chris Warrington <cmw@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-03-22 14:38:58 +00:00
Peter Xu
dd743a0735
prebuilts/tools and external/gradle now up to date.
...
Revert "prebuilts/tools @ studio-master-dev is a year old."
This reverts commit 51be061979https://googleplex-android-review.git.corp.google.com/1971277
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
Reviewed-by: Peter Xu <peterx@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-03-09 21:48:35 +00:00
Ivan Gavrilovic
0ecaea79df
Move desugar into tools/external
...
Change-Id: I469c53a2341e46f4f932cf4be9bdc43d8133ee00
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1964520
Reviewed-by: Jeffrey van Gogh <jvg@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-03-08 08:33:42 +00:00
Esteban de la Canal
51be061979
prebuilts/tools @ studio-master-dev is a year old.
...
Revert "Move two projects on master to studio-master-dev branch."
This reverts commit 1e503d2ccdhttps://googleplex-android-review.git.corp.google.com/1963344
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2017-03-07 00:32:53 +00:00
Armand Navabi
1e503d2ccd
Move two projects on master to studio-master-dev branch.
...
This moves the projects platforms/prebuilts/tools and
platform/tools/external/gradle from the master branch to the newly
created branch on studio-master-dev for these projects. See
http://b/35851893 . This change is necessary for integration with
TreeHugger. See ag/1900410.
Test: Manifest change can be tested as explained in go/manifest
Change-Id: I5ac9ab3091295928879c00b362ff6158561006dc
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1954168
Reviewed-by: Armand Navabi <navabi@google.com >
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-03-06 23:21:31 +00:00
Ivan Gavrilovic
c7e284dc13
Add external/desugar
...
Change-Id: I4e0bf9e8063037487718bc9fa89b2484396a37b0
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1954833
Reviewed-by: Chris Warrington <cmw@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-03-03 11:35:01 +00:00
Ivan Gavrilovic
eaddad591a
Enable libcore on all platforms
...
Change-Id: Ie1b1d485abbe182bb175ba8f3d2462244dcec2c8
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1954892
Reviewed-by: Chris Warrington <cmw@google.com >
2017-03-03 11:24:32 +00:00
Chris Warrington
dbd10e55f3
Switch dx to studio-master-dev branch.
...
Change-Id: I557a4b419828f62b0319108c77579da2dd778e74
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1903182
Reviewed-by: Michal Bendowski <bendowski@google.com >
Reviewed-by: Chris Warrington <cmw@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-02-13 15:12:05 +00:00
David Herman
49e880c12c
Add manifest entry for up-to-date UX icons
...
Reads the contents of the "assets/android-studio-ux-assets/" repository
and maps it locally as "tools/assets/"
Change-Id: I585f3c6db1ffdbf14ee6d8c23f8ae469cbb6f2eb
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1836498
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: J. Eason <easonj@google.com >
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2017-02-01 22:53:14 +00:00
Diego Perez
0a0c3720a7
Update frameworks/base revision
...
Change-Id: Icbba50f493354bfbbe8042ccc08e951b7f355b8d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1848681
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2017-02-01 13:43:45 +00:00
Peter Xu
35e97a3c91
Replace copyfile with linkfile in manifest
...
Repo sync will link instead of copy bazel related files in the manifest.
This change will eliminate the need to copy over said files in a recipe
step. Tested on linux, mac and windows (with administrative privileges).
This change also updates build.gradle and gradle.properties files.
gradlew, gradlew.bat and settings.gradle need to be copied over still
because there is some kind of canonicalization of paths going on and as
a result gradle fails to find some dependencies.
Change-Id: Iffcd248f522df4f89a9b9792a9cc41b4a01950e4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1744960
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Michal Bendowski <bendowski@google.com >
Reviewed-by: Renaud Paquay <rpaquay@google.com >
2017-01-28 03:33:11 +00:00
Michal Bendowski
d89539a3e0
Add clone-depth="1" to all prebuilts repos
...
Change-Id: Ibb4a32c320299ad52e30ed49d22726a1a8a00104
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1738779
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Michal Bendowski <bendowski@google.com >
Reviewed-by: Xavier Ducrohet <xav@google.com >
Tested-by: Michal Bendowski <bendowski@google.com >
2017-01-09 10:59:48 +00:00
Chris Warrington
6eb865063c
Move bazel prebuilts from tools/base to prebuilts/tools.
...
Change-Id: I805ff32999e41ec6612bc5ef0209b8475e235a9d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1728547
Reviewed-by: Michal Bendowski <bendowski@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-12-19 17:38:53 +00:00
Michal Bendowski
8dadcd525e
Copy the bazel.rc file to //tools
...
Change-Id: I58c47a9b2be204e1afbf3848e79c834d88fdc1c0
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1728606
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Chris Warrington <cmw@google.com >
2016-12-19 14:39:26 +00:00
Diego Perez
ac5be5448e
Update frameworks/base revision
...
Change-Id: I5ed80ce82d09af36711108c6e18325fe8e1990bf
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1700344
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-12-13 11:36:39 +00:00
Renaud Paquay
963a4a762e
Don't include "dalvik" and "libcore" on Windows
...
"dalvik" and "libcore" were added in a previous CL
(https://googleplex-android-review.git.corp.google.com/1665776/ )
but that causes "repo sync" to fail on Windows.
The reason is that git fails to sync "libcore" on Windows because
a file (luni/src/test/resources/org/apache/harmony/tests/java/lang/
test?.properties) contains a "? character in its name, which is not
legal on Windows.
The error message during repo sync:
error: unable to create file luni/src/test/resources/org/apache/harmony/tests/java/lang/test?.properties: Invalid argument
Test: Manually verified that "repo sync" works again, Windows builbot
will also hopefully be fixed.
Change-Id: Ib527638ca79aef934cb407983b2f62f2b7ec671e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1670047
Reviewed-by: Renaud Paquay <rpaquay@google.com >
Reviewed-by: Xavier Ducrohet <xav@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-12-01 19:13:39 +00:00
Chris Warrington
8ab7f976a4
Revert "Revert "Add dx sources from aosp master.""
...
This reverts commit da23f57b58https://googleplex-android-review.git.corp.google.com/1665776
Reviewed-by: Chris Warrington <cmw@google.com >
Tested-by: Chris Warrington <cmw@google.com >
Autosubmit: Chris Warrington <cmw@google.com >
Presubmit-Ready: Chris Warrington <cmw@google.com >
2016-11-30 15:55:28 +00:00
Chris Warrington
da23f57b58
Revert "Add dx sources from aosp master."
...
This reverts commit 6f654aa9dchttps://googleplex-android-review.git.corp.google.com/1657474
Reviewed-by: Chris Warrington <cmw@google.com >
Tested-by: Chris Warrington <cmw@google.com >
Autosubmit: Chris Warrington <cmw@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-11-29 16:46:29 +00:00
Chris Warrington
6f654aa9dc
Add dx sources from aosp master.
...
Change-Id: I6aaec7dcccb443867c473289f2a5e2fadbdc3ebc
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1640649
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Dochez <jedo@google.com >
2016-11-29 10:19:53 +00:00
Dana Dahlstrom
c5d607c0f7
Add buildifier presubmit hook
...
Change-Id: Ief65ca235ddfb33a397b28e8a10ab093cd92e44d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1652142
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Dana Dahlstrom <dahlstrom@google.com >
Reviewed-by: Andrii Dehtiarov <adehtiarov@google.com >
2016-11-23 20:16:02 +00:00
Diego Perez
c95d72c0a0
Update frameworks/base revision
...
Change-Id: If0c16793f183ab21dc050ccbe204fb8f55b27eea
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1645237
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Autosubmit: Diego Perez <diegoperez@google.com >
Reviewed-by: Nicolas Roard <nicolasroard@google.com >
2016-11-21 17:34:36 +00:00
Shirley Yuen
ebbf981816
Create studio-master-dev branch in tools/repohooks
...
Bug: 32737350
Change-Id: I7058fd6d11e736fda354abb120963dae93014b7a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1612395
Reviewed-by: Andrii Dehtiarov <adehtiarov@google.com >
Tested-by: Shirley Shuk Yee Yuen <shirleyshukyee@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-11-14 22:51:44 +00:00
Joe Kilner
8a0ac0b729
Exclude ndk from Windows machines due to case sensitivity issues
...
Change-Id: Ic783041dc2cf52c8814809f6afcbb7ef50cbded1
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1590828
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Pascal Muetschard <pmuetschard@google.com >
Reviewed-by: David Herman <davidherman@google.com >
2016-11-03 14:48:24 +00:00
Diego Perez
71e0943d43
Update frameworks/base revision
...
Change-Id: Ib939eb5cc499a64a5d8dde7cd7e03435c020dc59
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1590667
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-11-01 11:52:45 +00:00
Michal Bendowski
ced02ecdf6
Freeze versions of external test projects for benchmarks
...
Change-Id: I54555e04002665150c90c7a5d58260a6f4bcbb60
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1587069
Reviewed-by: Michal Bendowski <bendowski@google.com >
Reviewed-by: Chris Warrington <cmw@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-10-31 12:40:02 +00:00
Andrii Dehtiarov
e555fb4a1f
Configure tools/repohooks in manifest and add GLOBAL-PREUPLOAD.cfg
...
Change-Id: I2605b1138b509b82adc60097f264a48543d65e2b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1586610
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Andrii Dehtiarov <adehtiarov@google.com >
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2016-10-29 22:21:46 +00:00
Diego Perez
e1ea126d7f
Update frameworks/base revision
...
Change-Id: I3baa7b3a55e9b2a2027e7615ffd803b6de698044
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1577729
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-10-27 15:38:36 +00:00
Chris Warrington
0f3da16b64
Add gradle-perf-android-medium.
...
Change-Id: I9ab45eb6b68ed298ecabd35f204e9fcd2c4bafc3
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1551484
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Chris Warrington <cmw@google.com >
Reviewed-by: Michal Bendowski <bendowski@google.com >
2016-10-19 09:36:36 +00:00
Scott Main
2dce4c4c5d
Add doclava project so we can build the ConstraintLayout javadoc
...
Change-Id: Ie7760c17c1bb19fb6d67567ed6cee5bce53bc9f0
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1527472
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Nicolas Roard <nicolasroard@google.com >
2016-10-11 22:02:46 +00:00
Chris Warrington
cf6d24040d
Add android-studio-gradle-test project.
...
Change-Id: I5658c8df5154b7cf45f73a5853ae48beb6e123e2
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1499039
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Chris Warrington <cmw@google.com >
Reviewed-by: Michal Bendowski <bendowski@google.com >
2016-10-10 11:04:47 +00:00
Diego Perez
28ea327313
Update frameworks/base revision
...
Change-Id: Ic8bbf96fab89d8ef53dc0082213245062bf07916
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1506082
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-10-04 11:38:02 +00:00
Diego Perez
da4ed51949
Update frameworks/base revision
...
Change-Id: I48b636409a42813d8b39959efa144f8773e9fd82
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1503257
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-10-04 10:59:12 +00:00
David Herman
c4350806b4
Add googletest reference to studio-master-dev's manifest
...
Change-Id: I64bdba0a86d9aeb7fd04652fb0872b7d7925e861
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1434343
Reviewed-by: David Herman <davidherman@google.com >
Reviewed-by: Dan Albert <danalbert@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-09-12 23:56:47 +00:00
Tomas Lundell
c69fd0a421
Remove aswb project from manifest.
...
It was removed in a previous commit, but has since made a reappearance
in the open source section. Remove once more.
Change-Id: I075b8d1472ad6586555253bc06cecedaa5fe7ddb
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1430638
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2016-09-10 17:47:13 +00:00
Joe Baker-Malone
4f3ac5ec4f
emma seems no longer used
...
Change-Id: I35e71f41679e6144a7cd4eb92485593d7f914bb5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1427286
Reviewed-by: Joe Baker-Malone <jbakermalone@google.com >
Reviewed-by: Raluca Sauciuc <ralucas@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-09-10 04:49:54 +00:00
Joe Baker-Malone
b1de79d10d
Adding back prebuilts needed to build tools component
...
Change-Id: Ie4c68134e17776931dc0f6f7dab20dfa28086c2d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1261146
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Tor Norbye <tnorbye@google.com >
2016-09-10 04:48:16 +00:00
Vlad Albulescu
198f7c0c48
Switch prebuilts/go to master
...
Basically, update to Go 1.7.
Change-Id: Ife0986bc7a33d01ca93c756b242550aea8780de3
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1388770
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Ian Cottrell <iancottrell@google.com >
2016-08-30 10:32:34 +00:00
Alex Klyubin
4dd3cce410
Update manifest to include apksig library
...
The goal is to replace APK signing logic in Android Studio and Gradle
Plugin for Android with the one provided by apksig's ApkSignerEngine.
Bug: 31060257
Change-Id: Ic5742c789ec23a9a6bda1d2e5fa129c74d874111
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1359703
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Alex Klyubin <klyubin@google.com >
2016-08-29 17:57:47 +00:00
David Herman
d00466838a
Update manifest with new dev SDK repositories
...
We now sync on Android SDKs that are checked into:
//tools/vendor/google_prebuilts/studio/sdk/
This also copies over a bazel BUILD file from
//tools/base/bazel/sdk, putting it in the right place where
it defines rules that allow us to write unit tests against
the SDK.
Change-Id: I71d01270754a10374a4e3833df6b9ff42b879965
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1313219
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: David Herman <davidherman@google.com >
2016-08-12 22:27:23 +00:00
David Herman
fe67ba0e34
Revert "Simplify manifest file for studio-master-dev-sdk"
...
This reverts commit 4c723b816chttps://googleplex-android-review.git.corp.google.com/1311702
Reviewed-by: David Herman <davidherman@google.com >
2016-08-10 23:16:03 +00:00
David Herman
4c723b816c
Simplify manifest file for studio-master-dev-sdk
...
The studio-master-dev-sdk branch only needs to pull down the minimum
number of projects that allow it to update the SDK. At this point,
we just check in the SDK folders themselves.
Change-Id: I857c2b5d79894d3e950b58f50293827bf53e32da
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1311024
Reviewed-by: Bill Rassieur <rassb@google.com >
Reviewed-by: David Herman <davidherman@google.com >
2016-08-10 22:27:38 +00:00
estebandlc
a92bd6ee52
Temporarily moves /tools/idea BUILD to /tools
...
Change-Id: Ie52158a001411b8c78b9e1582032dc54d42983a6
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1285082
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Dana Dahlstrom <dahlstrom@google.com >
2016-08-03 23:06:11 +00:00
Dana Dahlstrom
26114b3bc6
Add platform/tools/swing-testing to studio-master-dev
...
Change-Id: Ida962d31c9947eb443e2187c2baf1b8deaa40255
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1287040
Reviewed-by: Raluca Sauciuc <ralucas@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-08-03 22:00:37 +00:00
Diego Perez
7f1a648e10
Update frameworks/base revision
...
Change-Id: Id7cd22c1fcac27a674a85225a6482780f3d6c56e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1285261
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Siva Velusamy <vsiva@google.com >
2016-08-03 13:50:31 +00:00
Diego Perez
a5878184d7
Update frameworks/base revision
...
Change-Id: If2fdd1ce95d996a483727ea7449056b79a1ac8cd
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1276646
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Diego Perez <diegoperez@google.com >
2016-08-01 17:36:32 +00:00
Michal Bendowski
597844dddc
Create a copy of Bazel's WORKSPACE
...
Change-Id: I174262af8c9a39af376cad8bae72c430570f4c00
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1271385
Reviewed-by: Michal Bendowski <bendowski@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2016-08-01 16:11:03 +00:00
Diego Perez
db88d4243e
Update frameworks/base revision
...
Change-Id: If3ce5accb2070251c47e8d07f08459479a2c7db9
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1266209
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-07-28 21:24:23 +00:00
Diego Perez
aa192eb905
Update frameworks/base revision
...
Change-Id: I4601a55a109e7fbfd5126a788af28a5d068cdc66
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1241278
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-07-22 13:20:40 +00:00
Diego Perez
a18f5ff32e
Update frameworks/base revision
...
Change-Id: I10bb790db78d5b6602debd99ffbfce31198091f5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1233044
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-07-19 16:32:34 +00:00
Tamas Berghammer
9639bb28c0
Add platform clang to the studio-master-dev manifest
...
This is the first phase of switching all project from the old SDK
clang (3.5) to the close to ToT clang used by the platform build.
Change-Id: I1534c97dbb06b61bb5c0d3b1bee61a26038ddf0f
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1206758
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Ian Cottrell <iancottrell@google.com >
2016-07-12 09:42:29 +00:00
Jerome Gaillard
180bfcebd6
Update frameworks/base revision
...
Change-Id: Id04cc3a887959e8fa00f0d3e3511e3e1cd92f0e5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1191563
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Diego Perez <diegoperez@google.com >
2016-06-30 13:43:36 +00:00
Diego Perez
5a971a385c
Update frameworks/base revision
...
Change-Id: Iacc23925e6bedc17c0160f39585bb7b217531e5d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1180593
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-06-27 10:39:14 +00:00
Diego Perez
df4419590c
Update frameworks/base revision
...
Change-Id: I8e3c94e08ceb8a2561829a515514a0581919031c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1146301
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-06-20 08:01:26 +00:00
David Herman
f0f0fdb529
Add mac prebuilt for compiling x86 NDK
...
Change-Id: I924408c17677d054a80758de3727e03473cbe1f6
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1127873
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: David Herman <davidherman@google.com >
Reviewed-by: Tamas Berghammer <tberghammer@google.com >
2016-06-10 19:25:54 +00:00
Diego Perez
d526eb4be2
Update frameworks/base revision
...
Change-Id: Iafdb8509ca8ecbd11bb170238c721825fc80ba9d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1124295
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-06-10 12:46:08 +00:00
estebandlc
52a6f11c77
Fixes linux group for glibc
...
Change-Id: If0f3b7beb5e19bfe7bcebba9dbd7599ff0c9203c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1116230
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2016-06-07 21:59:09 +00:00
estebandlc
936148ea3b
Fixes linux group for clang
...
Change-Id: I1e5688412c5ceea3f214a77507319ed5b0c4a5a5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1116085
Reviewed-by: Tamas Berghammer <tberghammer@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-06-07 21:48:39 +00:00
estebandlc
c486460c8f
Adds nanopb-c to studio-master-dev
...
Change-Id: I45b84ebbae14b3928e9a534fb93c3f256560fb33
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1112980
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2016-06-06 22:54:50 +00:00
estebandlc
c470360899
Adds grpc to the studio-master-dev manifest
...
Change-Id: I93e030c4615f8f3fd68886d9b7c4d2ab66e49177
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1110293
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2016-06-06 05:14:50 +00:00
Diego Perez
1b34f149f4
Update frameworks/base revision
...
Change-Id: I11d93424c4b4e858a1136e1e30438865661af9ae
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1079482
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jerome Gaillard <jgaillard@google.com >
2016-05-27 13:36:20 +00:00
Tamas Berghammer
1df29cc42d
Add boringssl and zlib to the manifest
...
These projects will be used by the profiler team as a third party
dependency of gRPC.
Change-Id: I06324b8efc6c23289d4aa5d866a37b5852adc33e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1068497
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Tamas Berghammer <tberghammer@google.com >
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2016-05-24 20:28:58 +00:00
estebandlc
468fab9489
Adds cmake and ninja to the platform dependent sync.
...
Change-Id: Iff65692e2912b585d9f847b1529bbd64235f1c3f
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1032104
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Tamas Berghammer <tberghammer@google.com >
2016-05-16 20:39:44 +00:00
Diego Perez
1fc0892af2
Update frameworks/base revision
...
Change-Id: I5d72e5fb500e506e03b415236c17b99a13eb7c23
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1027129
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Tor Norbye <tnorbye@google.com >
2016-05-12 03:39:31 +00:00
Siva Velusamy
8aaeeddf2b
Cleanup manifest post feature-upcoming merge
...
Change-Id: Ic6c55240999feda14e40509d2159f847ad0799ec
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1029409
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Dana Dahlstrom <dahlstrom@google.com >
2016-05-11 22:49:56 +00:00
Bill Rassieur
4f8889eb40
Updated manifest after adding projects from studio-feature-upcoming.
...
BUG: 28639086
Change-Id: I0348b937ac067f85e87e792f2768d085d4b854a5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1028667
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Tested-by: Bill Rassieur <rassb@google.com >
Reviewed-by: Bill Rassieur <rassb@google.com >
2016-05-11 21:20:18 +00:00
Siva Velusamy
d72d0a7ebb
Include frameworks/opt/sherpa in studio-master-dev
...
Change-Id: I8071e6c8717b568734a66d16d59edb295aad9847
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1026218
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Alex Ruiz <alruiz@google.com >
2016-05-11 21:09:57 +00:00
Chris Warrington
8b567d2b58
Add infra repo to main manifest.
...
Change-Id: I8eda7bad73608c4b80cbd3909585073a1086d30b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1016613
Reviewed-by: Xavier Ducrohet <xav@google.com >
2016-05-09 19:43:51 +00:00
Tomas Lundell
228bd7d228
Remove aswb project from manifest.
...
Change-Id: I9c26b826505c8ed99029603b867c0d15a0b7d4b5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/995692
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Tor Norbye <tnorbye@google.com >
2016-05-05 20:07:00 +00:00
Ben Clayton
4833ffc687
Add x86_64-linux-android-4.9 toolchain to gpu group
...
Change-Id: I37992af692ac0c75a32014238d0234d1dccf08db
Reviewed-on: https://googleplex-android-review.git.corp.google.com/949910
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Ben Clayton <bclayton@google.com >
Reviewed-by: Ian Cottrell <iancottrell@google.com >
2016-04-21 13:30:48 +00:00
Deepanshu Gupta
842513edeb
Remove jdk source projects
...
They are currently only available through aosp openjdk manifest.
Change-Id: I6d77fb161dfa1b36dbf493c17d312f4282e65958
Reviewed-on: https://googleplex-android-review.git.corp.google.com/950292
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Deepanshu Gupta <deepanshu@google.com >
2016-04-20 19:38:17 +00:00
Jerome Gaillard
d8b6fb07d9
Update frameworks/base revision
...
Change-Id: I585bd3c9523540ebc1d41e048fab8580fd326bc0
Reviewed-on: https://googleplex-android-review.git.corp.google.com/927347
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Diego Perez <diegoperez@google.com >
2016-04-13 15:43:57 +00:00
Deepanshu Gupta
71b51088cb
Update frameworks/base revision
...
Change-Id: I36885a403426fe6c2b03229f12d92f82e55c0a6f
Reviewed-on: https://googleplex-android-review.git.corp.google.com/926463
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Jens Ole Lauridsen <jlauridsen@google.com >
2016-04-12 23:46:04 +00:00
Chris Warrington
ab164aacea
Add AntennaPod projects for testing.
...
Change-Id: Icca63d7fa24cdcfe6acdad47464ce647e84b5023
Reviewed-on: https://googleplex-android-review.git.corp.google.com/873256
Reviewed-by: Chris Warrington <cmw@google.com >
2016-04-11 18:47:56 +00:00
Deepanshu Gupta
f2dde784f8
Update frameworks/base revision
...
Change-Id: If62908defc1c9861bf8666905f6f5fa39ccb5fe4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/921121
Reviewed-by: Diego Perez <diegoperez@google.com >
Reviewed-by: Deepanshu Gupta <deepanshu@google.com >
2016-04-11 17:37:38 +00:00
Raluca Sauciuc
93d0586a04
Add jdk prebuilts and source trees to studio-master-dev
...
Bug: 27698311
Change-Id: Ic10ed8759e43062e1572d1fbe632ffe46c0b114a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/914432
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Deepanshu Gupta <deepanshu@google.com >
2016-04-08 18:09:10 +00:00
Pascal Muetschard
0d7465dde7
Remove the golang.org dependencies from the GPU project.
...
These dependencies are now checked in under the GPU repository's
vendor directory.
Change-Id: I97ea92edebd89bee38cc7bd0a36a050094386717
Reviewed-on: https://googleplex-android-review.git.corp.google.com/903150
Reviewed-by: Ian Cottrell <iancottrell@google.com >
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
2016-04-01 19:56:53 +00:00
Deepanshu Gupta
056f04f166
Update frameworks/base revision
...
Change-Id: I0e861f1dfedbe7e35f0605294230a990cebfb077
Reviewed-on: https://googleplex-android-review.git.corp.google.com/894894
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Deepanshu Gupta <deepanshu@google.com >
2016-03-25 23:13:14 +00:00
Deepanshu Gupta
23b7da5982
Add layoutlib sources to studio
...
Add frameworks/base pinned to a specific version. This can be used as
soruces to the bundled layoutlib.
Change-Id: I2234351901e760be8de6d500d0a26a5d6043a638
Reviewed-on: https://googleplex-android-review.git.corp.google.com/892652
Reviewed-by: Diego Perez <diegoperez@google.com >
2016-03-23 18:17:36 +00:00
Diego Perez
2c6d4afd96
Add prebuilts/studio/layoutlib to manifest
...
Change-Id: I1820e67d51b605c1323113c5b2d649ef89c29eca
Reviewed-on: https://googleplex-android-review.git.corp.google.com/890157
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com >
Reviewed-by: Siva Velusamy <vsiva@google.com >
2016-03-21 14:56:50 +00:00
Sam Thorogood
8fd878d3ee
Add tools/studio/google/samples
...
Change-Id: I8a87e301455cd8dea0c9a55f215cfa6fa2978e6a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/869701
Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com >
Reviewed-by: Geoff Mendal <mendal@google.com >
2016-02-20 01:33:02 +00:00
Esteban de la Canal
46c350cf34
Adds prebults/sdk to studio-master-dev
...
Change-Id: I1eb4563b90d457f8dc6e55847957df20c879b1f7
Reviewed-on: https://googleplex-android-review.git.corp.google.com/870225
Reviewed-by: Esteban de la Canal <estebandlc@google.com >
2016-02-19 21:29:15 +00:00
Deepanshu Gupta
92acf16e0f
Clone depth 1 and platform-linux for glibc
...
Change-Id: Ie846c7083fe0b643452558812f4856bb03cc836c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/865623
Reviewed-by: Siva Velusamy <vsiva@google.com >
2016-02-12 02:09:23 +00:00
Siva Velusamy
f85920582a
Remove eclipse prebuilts
...
Change-Id: I7a43a55d2957d328cf4e2661021a4fd26bf0ed02
Reviewed-on: https://googleplex-android-review.git.corp.google.com/865048
Reviewed-by: Deepanshu Gupta <deepanshu@google.com >
2016-02-12 01:54:45 +00:00
Siva Velusamy
07af65122a
Add external/smali to studio-master-dev
...
Change-Id: I52326c4fe5c2c5bba88198d80cf7109ac3e7088a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/846965
Reviewed-by: Geoff Mendal <mendal@google.com >
2016-01-16 01:08:59 +00:00
Siva Velusamy
50c8e8ec2c
Add aswb and blaze projects to studio-master-dev manifest
...
Change-Id: Iea129d2acf55b3f920eb097c87a939fd4653482f
Reviewed-on: https://googleplex-android-review.git.corp.google.com/843352
Reviewed-by: Siva Velusamy <vsiva@google.com >
2016-01-11 18:45:17 +00:00
Chris Warrington
0b97c580bb
Remove emulator related repos.
...
Emulator is no longer built from this branch.
Change-Id: Ic70f2911b5a4f3d287cb5148c20e2291b3e9ae8b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/809900
Reviewed-by: Chris Warrington <cmw@google.com >
Reviewed-by: Vince Harron <vharron@google.com >
2015-11-10 23:16:17 +00:00
Bill Rassieur
aa1bf8da47
BUG: 25506367 Update manifest for studio-master-dev as we snap to studio-feature-ij15.
...
Change-Id: Id0fc56b7772268c7b466801a3d07da6dce4e95a2
Reviewed-on: https://googleplex-android-review.git.corp.google.com/808683
Reviewed-by: Baligh Uddin <baligh@google.com >
Reviewed-by: Tor Norbye <tnorbye@google.com >
2015-11-06 23:10:18 +00:00
Pascal Muetschard
8849659dd6
Change the SDK checkout to work around build server limitations.
...
The build server ignores the 'notdefault' tag and thus checks out all
projects, including those for different platforms. This causes the SDK
manager to sometimes pick the OSX SDK build tools on linux and fail. This
change causes the checkout to separate the two platforms at a highler level
to work around this issue.
See http://b/25183493
Change-Id: I30297a84ef6fdff168c611894e738c45fe9f4edb
Reviewed-on: https://googleplex-android-review.git.corp.google.com/799477
Reviewed-by: Ian Cottrell <iancottrell@google.com >
2015-10-23 17:29:38 +00:00
Pascal Muetschard
cb4eb897e1
Add the platform group tags to the platform specific gpu projects.
...
Change-Id: Ieda16cb2af99e778b8f8808c9bfb94ab5db2cda0
Reviewed-on: https://googleplex-android-review.git.corp.google.com/798248
Reviewed-by: Pascal Muetschard <pmuetschard@google.com >
2015-10-22 00:40:31 +00:00
Oleksiy Vyalov
efb3b3a3f3
Restore LLDB prebuilts back.
...
Change-Id: I8ffb9b7a4e2258c4cf295fe34c9fc9cb4f259697
Reviewed-on: https://googleplex-android-review.git.corp.google.com/798189
Reviewed-by: Oleksiy Vyalov <ovyalov@google.com >
2015-10-21 23:28:32 +00:00
Pascal Muetschard
bf765ff976
Add the SDK & NDK prebuilts with the GPU tag to the repo manifest.
...
Change-Id: I99d05708ac815825f6f195ef376b57a120cc7ff5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/797936
Reviewed-by: Ian Cottrell <iancottrell@google.com >
2015-10-21 22:13:58 +00:00
Vince Harron
a19578e41d
Removed Linux gcc, NDK headers and Android gccs used by lldb
...
Change-Id: I2cd745c10d852ac118f825465b2a37a02d1f7c84
Reviewed-on: https://googleplex-android-review.git.corp.google.com/797741
Reviewed-by: Pascal Muetschard <pmuetschard@google.com >
2015-10-21 17:51:26 +00:00
Vince Harron
482134d99a
Removed any project with revision="lldb-master-dev"
...
Change-Id: I422faaa44098495e529090507c73b3dfce145dcf
Reviewed-on: https://googleplex-android-review.git.corp.google.com/797060
Reviewed-by: Oleksiy Vyalov <ovyalov@google.com >
Reviewed-by: Pascal Muetschard <pmuetschard@google.com >
2015-10-21 15:24:35 +00:00
Chaoren Lin
2c37b1c458
Use lldb prebuilts from lldb-master-dev.
...
Change-Id: I5304786e7809473d89520bee49ee491bae37a0f4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/773480
Reviewed-by: Oleksiy Vyalov <ovyalov@google.com >
2015-09-23 00:25:24 +00:00
jxluo
e585e809dd
Modify manifest for appindexing plugin
...
Change-Id: I28d9e6308451f6b24365c9a7b4f21c65bca552ac
Reviewed-on: https://googleplex-android-review.git.corp.google.com/767356
Reviewed-by: Qiwen Zhao <zhao@google.com >
2015-09-16 01:55:17 +00:00
Pavel Labath
f472a5aec3
Add prebuilts for google-breakpad to the manifest
...
Change-Id: Iad28b57c86931a8a8033b9229dc66f905d732b48
Reviewed-on: https://googleplex-android-review.git.corp.google.com/766312
Reviewed-by: Pavel Labath <labath@google.com >
2015-09-14 09:22:26 +00:00
Chris Warrington
1804dec232
Add extras/android/maven_repo for data binding.
...
The data binding library build will copy the existing repository and
publish the new data binding library on top of it, just as support
libary does.
Change-Id: I88143abb2f42b6b6fbdc3c4ad26f038bc4351a03
Reviewed-on: https://googleplex-android-review.git.corp.google.com/765995
Reviewed-by: Chris Warrington <cmw@google.com >
Tested-by: Chris Warrington <cmw@google.com >
2015-09-11 21:18:01 +00:00
Ian Cottrell
3c4d2d20fb
Remove revision="master" from go external repositories
...
DO NOT MERGE
BUG: 23619929
Change-Id: I230d2a501fdfbb2e97963d22e9bdfd7ef6961682
Reviewed-on: https://googleplex-android-review.git.corp.google.com/761350
Reviewed-by: Bill Rassieur <rassb@google.com >
2015-09-03 08:45:43 +00:00
Ian Cottrell
072db6722b
Remove unused go external repositories from the manifest.
...
Change-Id: If05914508d78377fe155f49f2ca4026d6e25e4c5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/754386
Reviewed-by: Ben Clayton <bclayton@google.com >
Reviewed-by: Bill Yi <byi@google.com >
2015-08-24 17:20:51 +00:00
George Mount
a2e303cf23
Add data-binding to studio-master-dev
...
Change-Id: I67f7362d6bef8a56909eb959d6a3bb500b235c0d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/753907
Reviewed-by: Qiwen Zhao <zhao@google.com >
Reviewed-by: Chris Warrington <cmw@google.com >
2015-08-20 23:39:14 +00:00
Chaoren Lin
6971897794
Add toolchains for lldb Linux build.
...
- Added glibc 2.15 for Linux host build.
- Added arm, aarch64, x86_64, mips64 gcc for Android lldb-server build.
- Added NDK headers and libs for Android lldb-server build.
Change-Id: I7d0d38530962621a43024ce910dbae8e534cc1e2
(cherry picked from commit cbd3434661https://googleplex-android-review.git.corp.google.com/748249
Reviewed-by: Chaoren Lin <chaorenl@google.com >
(cherry picked from commit be8f726fe3d864ce81cee0d922ef0bc2ca2db4a5)
Reviewed-on: https://googleplex-android-review.git.corp.google.com/752724
2015-08-19 23:25:47 +00:00
Xavier Ducrohet
486c88af3b
Add iosched to manifest.
...
Change-Id: I0d3e441127b532e8d1f99b34d33ab08320f14e25
Reviewed-on: https://googleplex-android-review.git.corp.google.com/751675
Reviewed-by: Xavier Ducrohet <xav@google.com >
2015-08-19 01:01:19 +00:00
Chaoren Lin
05bbddb2b7
Add libprotobuf prebuilts.
...
Change-Id: Iddfc656f68f4242bfea94b91779d3cee3df7122f
Reviewed-on: https://googleplex-android-review.git.corp.google.com/749581
Reviewed-by: Vince Harron <vharron@google.com >
2015-08-14 22:34:44 +00:00
Bill Yi
66bc198386
Use default revision for platform/tools/idea
...
Change-Id: I227d8cf7e046f49c8b6c886e6dd3ebaea81ca2c7
Reviewed-on: https://googleplex-android-review.git.corp.google.com/742620
Reviewed-by: Baligh Uddin <baligh@google.com >
2015-08-06 00:15:32 +00:00
Bill Rassieur
ae38afb121
Reset studio-master-dev to studio-1.4-dev with history. BUG: 22879524
...
Change-Id: Iec0b2ce019401987a33efa0a062e92706c5d8f1d
2015-08-04 11:26:37 -07:00
Bill Yi
2f0df19049
Add prebuilts projects
...
automerge: 882add3
2015-07-24 19:40:40 +00:00
Bill Yi
882add35f9
Add prebuilts projects
...
Change-Id: I1a4caa8b1a1e1d5c20a017367a8ca3cd50531a2c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/734288
Reviewed-by: Bill Yi <byi@google.com >
2015-07-24 19:39:10 +00:00
Bill Yi
8438ee7a0f
Merge remote-tracking branch 'origin/studio-1.4-dev' into studio-master-dev
2015-07-24 09:49:07 -07:00
Bill Yi
d38e13bd7a
Add manifest for studio-1.1-dev
...
automerge: 517310b
2015-07-24 16:46:29 +00:00
Chad Jones
1153cb98ec
Correct duplicate external/emma problem
...
Change-Id: I67e2cc897d59946ae564d1d65ddc3702ae2b9a91
Reviewed-on: https://googleplex-android-review.git.corp.google.com/733993
Reviewed-by: Chad Jones <chadj@google.com >
2015-07-24 15:55:21 +00:00
Bill Yi
e09d686dde
Add manifest for studio-1.0-dev
...
automerge: ee2db08
2015-07-24 15:28:36 +00:00
Geoff Mendal
91a38f742d
resolve merge conflicts of d0a7699 to studio-master-dev.
2015-07-24 08:15:33 -07:00
Geoff Mendal
a5b3a5b172
resolve merge conflicts of 60c7710 to studio-master-dev.
2015-07-24 08:04:36 -07:00
Xavier Ducrohet
4a9026d573
Add external/emma
...
automerge: f876997
2015-07-24 14:21:37 +00:00
Bill Yi
c225161dd4
Create a ub-tools-idea133 branch
...
automerge: d98204e
2015-07-24 14:21:26 +00:00
Bill Yi
349b369c91
Create a mirror-aosp-ub-tools-idea133 branch
...
automerge: 05607e1
2015-07-24 14:20:32 +00:00
Bill Yi
e4f9323f2c
Create a mirror-aosp-ub-tools-idea133-milestone branch
...
automerge: f070012
2015-07-24 12:51:48 +00:00
Bill Yi
182f677004
Create a ub-tools-idea133-milestone branch
...
automerge: 37298df
2015-07-24 12:50:10 +00:00
Siva Velusamy
02527d0009
Include vendor/galvsoft and other misc changes to vendor projects
...
This CL includes vendor/galvsoft in the manifest. The studio-master-dev
manifest has diverged quite a big from studio-1.4-dev manifest, so
in this CL, all the vendor projects are brought back in sync.
Change-Id: I04f789f07e6e8ca3f60bee6dfecf31bb74b51945
Reviewed-on: https://googleplex-android-review.git.corp.google.com/731357
Reviewed-by: Bill Yi <byi@google.com >
2015-07-21 15:51:11 +00:00
Siva Velusamy
60cb7a665e
Add vendor/galvsoft to studio-1.4-dev
...
b/22604429
Change-Id: I9159e790fc690ba12dbe194bd5710705d61e4807
Reviewed-on: https://googleplex-android-review.git.corp.google.com/731475
Reviewed-by: Bill Yi <byi@google.com >
2015-07-21 15:31:00 +00:00
Bill Yi
fd31907a49
Use default branch for prebuilts/android-emulator-build/*
...
automerge: 6fecf2e
2015-07-20 23:44:24 +00:00
Vince Harron
c614dc0cb4
Added lldb repos
...
Change-Id: I8882626924a0b857c04cbd5b91a6d1683fd726d4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/708962
Reviewed-by: Bill Yi <byi@google.com >
2015-06-26 21:36:50 +00:00
Bill Yi
2bfd6c6223
Use default branch for prebuilts/android-emulator-build/*
...
Change-Id: Id95d1f031c498499fa6f5c90260646b599fdde3a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/707572
Reviewed-by: Bill Yi <byi@google.com >
2015-06-10 22:03:12 +00:00
Bill Yi
69d696cb06
Use default branch for prebuilts/android-emulator-build/*
...
BUG: 21755422
Change-Id: I8b18e3f4443f5d6108a7043d09871f5eb6c20828
Reviewed-on: https://googleplex-android-review.git.corp.google.com/707571
Reviewed-by: Bill Yi <byi@google.com >
2015-06-10 21:58:25 +00:00
Bill Yi
6fecf2ee79
Use default branch for prebuilts/android-emulator-build/*
...
BUG: 21755422
Change-Id: I8b18e3f4443f5d6108a7043d09871f5eb6c20828
Reviewed-on: https://googleplex-android-review.git.corp.google.com/707525
Reviewed-by: Bill Yi <byi@google.com >
2015-06-10 21:56:13 +00:00
Bill Yi
bd6f546785
Manifest for studio-1.4-dev
...
Change-Id: I899905c9902049eb3b18a519bc8e8942370d9935
2015-06-04 12:18:49 -07:00
Bill Yi
85e3cd469a
Add missing projects to match with AOSP
...
Change-Id: I7eb5c24b5f455fdf1ed8a198a0ebec87ccbdbc8c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/687292
Tested-by: Bill Yi <byi@google.com >
Reviewed-by: Siva Velusamy <vsiva@google.com >
2015-05-08 18:21:26 +00:00
Bill Yi
5572c72062
Add platform/prebuilts/android-emulator-build projects
...
Change-Id: If390a0f259c0438638a03b51663f4f991230da1d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/687108
Tested-by: Bill Yi <byi@google.com >
Reviewed-by: Siva Velusamy <vsiva@google.com >
2015-05-08 17:58:29 +00:00
Bill Yi
ef92c24ccd
Add missing projects to match with AOSP
...
Change-Id: I82a305c36d10a42050eb79fef334944a8f5b2b1a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/687211
Tested-by: Bill Yi <byi@google.com >
Reviewed-by: Bo Hu <bohu@google.com >
2015-05-08 17:33:08 +00:00
Bill Yi
c8bb394c5f
Add platform/external/qemu-android and prebuilts/clang
...
Change-Id: I7a2370522e26b770c9d400daafd8ce0ed1f9ee20
Reviewed-on: https://googleplex-android-review.git.corp.google.com/687172
Tested-by: Bill Yi <byi@google.com >
Reviewed-by: Bo Hu <bohu@google.com >
2015-05-08 16:22:38 +00:00
Bill Yi
0eec0854de
Add platform/prebuilts/android-emulator-build projects
...
Change-Id: I4bc57993212d10ffa6cfd988d69cf3a2cf0cd12e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/687052
Reviewed-by: Bo Hu <bohu@google.com >
2015-05-08 05:30:43 +00:00
Bill Rassieur
9b076a4d99
Add tools/studio/google/services to branch studio-master-dev; BUG: 20847372
...
Change-Id: I4fd4fe47f9f9d168b76bf6630f73da5170307b55
Reviewed-on: https://googleplex-android-review.git.corp.google.com/685410
Reviewed-by: David Herman <davidherman@google.com >
2015-05-05 23:45:50 +00:00
Bill Rassieur
f50b19a70f
Add tools/studio/google/services to branch studio-1.3-dev; BUG: 20847372
...
Change-Id: I53a75d797f83772c777a1f6a691a431c785cf43b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/685368
Reviewed-by: David Herman <davidherman@google.com >
2015-05-05 23:45:16 +00:00
Qiwen Zhao
05e2ac075a
change revision from mirror-aosp-studio-1.3-dev to studio-1.3-dev.
...
Change-Id: Id30742b69bfc14c878166b999c253854d44e2171
Reviewed-on: https://googleplex-android-review.git.corp.google.com/669250
Reviewed-by: Tor Norbye <tnorbye@google.com >
2015-04-08 14:32:25 +00:00
Qiwen Zhao
5344b74af4
change tools/idea to use idea14-1.3-dev branch.
...
Change-Id: I00aa0916ad0718eaf066905f38e6854ad02039ba
Reviewed-on: https://googleplex-android-review.git.corp.google.com/668810
Reviewed-by: Tor Norbye <tnorbye@google.com >
2015-04-07 18:19:52 +00:00
Qiwen Zhao
0595a08822
tools/vendor/intellij/cidr
2015-04-06 11:53:15 -07:00
Deepanshu Gupta
550700f672
Add vendor/google as notdefault project.
...
Change-Id: I8e4870c2c33a08f1d01b6c3b96a5e8c1628c6f7a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/659950
Reviewed-by: David Herman <davidherman@google.com >
Reviewed-by: Deepanshu Gupta <deepanshu@google.com >
2015-03-24 16:25:41 +00:00
David Herman
f434f0e263
Added master revision to tools/vendor/intel repo
...
Bug: 19425354
Change-Id: I5e3fd4f1f04a5d9a22cacd5d2693a668d8de7979
Reviewed-on: https://googleplex-android-review.git.corp.google.com/637509
Reviewed-by: Geoff Mendal <mendal@google.com >
2015-02-19 16:02:12 +00:00
David Herman
c887c07d65
Added master revision to tools/vendor/intel repo
...
Bug: 19425354
Change-Id: Ibb33fed65210cc46563eaa47616e2d991032828c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/637524
Reviewed-by: Geoff Mendal <mendal@google.com >
2015-02-19 16:01:26 +00:00
Conley Owens
f8bf32ad19
Add license partitioning comments to manifest
...
Change-Id: I966b05c233f18300988fdc976bac56412217226c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/635036
Reviewed-by: Bill Yi <byi@google.com >
2015-02-13 19:01:58 +00:00
Bill Yi
4aaa6befbf
Add platform/external/qemu-android
...
Change-Id: I3a01d70afaf03103f200fb8c6f997f80f1e89f73
2015-02-12 14:48:05 -08:00
Geoff Mendal
e101e6cd8a
Add platform/tools/vendor/intellij/cidr
...
Bug: 19320978
Change-Id: Id29b5024268c2584c0f824741d82e05c70a3bb2a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/633387
Reviewed-by: Tor Norbye <tnorbye@google.com >
2015-02-12 00:55:30 +00:00
Bill Yi
2b9c888e11
Point some project to mirror-aosp-studio-1.3-dev
...
Change-Id: Ife7f2de656be665d0116ada20fa2bff1812f040b
2015-01-08 09:55:21 -08:00
Bill Yi
d8efb93d60
Manifest for studio-1.3-dev
...
Change-Id: Ia58e6d33099240c47ff549001452d6ce7ec721fb
2015-01-07 11:50:44 -08:00
Bill Yi
2844e19544
Manifest for studio-1.2-dev
...
Change-Id: Icb1ccba33221c8ec5608f95ae8a788b47b9bbc78
2015-01-07 11:47:10 -08:00
Bill Yi
6bbe9ecf26
Point platform/prebuilts/tools to mirror-aosp-master
...
Change-Id: I410ae4ed2a840f19dea9618263022e33c044b72b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/577904
Reviewed-by: Bill Yi <byi@google.com >
Reviewed-on: https://googleplex-android-review.git.corp.google.com/577894
2014-10-30 03:09:08 +00:00
Bill Yi
14418f3e6c
Point platform/prebuilts/tools to mirror-aosp-master
...
Change-Id: I410ae4ed2a840f19dea9618263022e33c044b72b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/577904
Reviewed-by: Bill Yi <byi@google.com >
Reviewed-on: https://googleplex-android-review.git.corp.google.com/577912
2014-10-30 03:07:40 +00:00
Geoff Mendal
11d741e7b6
Add platform/tools/vendor/intel
...
Bug: 18138073
Change-Id: I6c1ab0f5e5155ede530df0b725c12792794c2030
Reviewed-on: https://googleplex-android-review.git.corp.google.com/576079
Reviewed-by: David Herman <davidherman@google.com >
2014-10-28 00:46:32 +00:00
Geoff Mendal
dc4ee454e7
Add platform/tools/vendor/intel
...
Bug: 18138073
Change-Id: I826a63b0375559b78aa0e5ac256f54f9cdaee971
Reviewed-on: https://googleplex-android-review.git.corp.google.com/576102
Reviewed-by: David Herman <davidherman@google.com >
2014-10-28 00:46:02 +00:00
Chad Jones
6a32b7241d
Update review url to sso://googleplex-android/
2014-10-24 11:37:36 -07:00
Chad Jones
0f4fcf9763
Update review url to sso://googleplex-android/
2014-10-24 11:37:32 -07:00
Bill Yi
1a391237df
Set studio-master-dev branch default revision to studio-master-dev
...
BUG:17623239
Change-Id: Icc7d2f348155886310f70eb099503f28349a26d6
Reviewed-on: https://googleplex-android-review.git.corp.google.com/557770
Reviewed-by: Xavier Ducrohet <xav@google.com >
2014-09-30 21:56:48 +00:00
Geoff Mendal
b3ae559957
Add tools/vendor/{google,microsoft} projects
...
Bug: 17701437
Change-Id: If965cffc898c16a1cd35af5721045a71ad50edc0
Reviewed-on: https://googleplex-android-review.git.corp.google.com/557488
Reviewed-by: Xavier Ducrohet <xav@google.com >
2014-09-30 21:37:06 +00:00
Geoff Mendal
01a6a96e75
Add tools/vendor/{google,microsoft} projects
...
Bug: 17701437
Change-Id: I3dcc47ccf24f8c6c10eb8b5749ed468204ad4fd4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/557467
Reviewed-by: Xavier Ducrohet <xav@google.com >
2014-09-30 21:36:48 +00:00
Bill Yi
932e54d4ce
Adjust projects in studio-master-dev
2014-09-23 11:36:12 -07:00
Bill Yi
9bd0fc3022
Point platform/tools/idea to idea14-dev
2014-09-23 11:08:14 -07:00
Bill Yi
e7ef927857
Add manifest for studio-master-dev
2014-09-23 11:03:33 -07:00
Bill Yi
517310b2f6
Add manifest for studio-1.1-dev
2014-09-22 16:13:48 -07:00
Bill Yi
ee2db08029
Add manifest for studio-1.0-dev
2014-09-22 16:12:35 -07:00
Geoff Mendal
7f8321e7cb
Fix typos in tools/studio/google projects
...
Bug: 17180121
2014-09-18 13:33:02 -07:00
Geoff Mendal
d0a7699a1a
Fix typos in tools/studio/google projects
...
Bug: 17180121
Change-Id: I87c4a482ee1f3f025d6853d612e92ecd593b694a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/550354
Reviewed-by: Chad Jones <chadj@google.com >
2014-09-18 20:23:17 +00:00
Geoff Mendal
60c7710b28
New Studio projects
...
Bug: 17180121
Change-Id: I659595482e51819adaa72cdfa0fda36bd9760165
Reviewed-on: https://googleplex-android-review.git.corp.google.com/531029
Reviewed-by: Xavier Ducrohet <xav@google.com >
2014-09-18 19:15:10 +00:00
Geoff Mendal
cb9bff0ddb
New Studio projects
...
Bug: 17180121
Change-Id: I83f4efe78bb257ed455a2e79b53c05a3bd8fa9dd
Reviewed-on: https://googleplex-android-review.git.corp.google.com/531162
Reviewed-by: Xavier Ducrohet <xav@google.com >
2014-09-18 19:15:02 +00:00
Bill Yi
645a5fc676
Update ub-tools-master to same as AOSP
...
BUG:16405200
Change-Id: Ieacccc2ad08ac5fd3e4aeebfbd4eb0bad6ebd523
Reviewed-on: https://googleplex-android-review.git.corp.google.com/506742
Reviewed-by: Bill Yi <byi@google.com >
2014-07-18 23:41:58 +00:00
Xavier Ducrohet
f8769970f6
Add external/emma
...
Change-Id: Idc3cff8d9af6fe7c578518e56e5166325b6c426e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/493404
Reviewed-by: Ying Wang <wangying@google.com >
2014-06-27 22:40:46 +00:00
Bill Yi
d98204e063
Create a ub-tools-idea133 branch
2014-06-11 19:21:30 -07:00
Bill Yi
05607e1579
Create a mirror-aosp-ub-tools-idea133 branch
2014-06-11 18:56:12 -07:00
Bill Yi
f070012289
Create a mirror-aosp-ub-tools-idea133-milestone branch
2014-06-11 18:32:28 -07:00
Bill Yi
37298df660
Create a ub-tools-idea133-milestone branch
2014-06-04 20:57:19 -07:00
Baligh Uddin
d8b3a819be
ub-tools-master manifest
2014-01-14 16:11:46 -08:00
Baligh Uddin
bd33d7857a
Add vendor/auto/dogfood to master manifest
...
Bug: 12488886
Change-Id: I643372cf0b27b6e373fadd50dcb53850f7c3a784
Reviewed-on: https://googleplex-android-review.git.corp.google.com/406193
Reviewed-by: Mike Lockwood <lockwood@google.com >
2014-01-10 19:08:20 +00:00
Baligh Uddin
ac66392fda
Add packages/apps/ManagedProvisioning
...
Bug: 12451122
Change-Id: I9aa92a17cbc2df5e89d9c90fc69942fbbfb9f8e5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/405801
Reviewed-by: Amith Yamasani <yamasani@google.com >
2014-01-09 21:54:23 +00:00
Bart Sears
61883980b8
Remove libxslt and hyphenation libraries
...
Webiew is no longer using the libxslt and hyphenation libraries.
The following two ChangeIDs have deleted all of the files from these
projects from master. This CL updates the manifest file for
master to remove the projects.
I42f323cb0f6f4a2dba9f05b3b4a6e586b7c4ea72
Ia998aceb9e77b985e0abe3fedd12a5495abf5190
Bug: 12438213
Change-Id: I03b4414e27e0395b02bddbf3dff151418cb07b8a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/405461
Reviewed-by: Selim Gurun <sgurun@google.com >
Reviewed-by: Ed Heyl <edheyl@google.com >
2014-01-09 17:44:00 +00:00
Torne (Richard Coles)
a20eb8b591
Switch Chromium to the M33 branch.
...
Track the M33 branch of Chromium for now in external/chromium_org and
frameworks/webview.
Change-Id: Id3d13683a283a931e443065a5edfcf830500ef8c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/404445
Reviewed-by: Ben Murdoch <benm@google.com >
2014-01-07 13:17:55 +00:00
JP Abgrall
0028d68423
am 550added: am 4d63ea78: am a091c457: am 6afa96c8: am 8f1819f4: am 8e5176d8: Revert "Remove external/libnl and external/nfacct"
...
* commit '550added02aafc65d237ba3efa9201774ab7b777':
Revert "Remove external/libnl and external/nfacct"
2014-01-07 00:44:41 +00:00
JP Abgrall
550added02
am 4d63ea78: am a091c457: am 6afa96c8: am 8f1819f4: am 8e5176d8: Revert "Remove external/libnl and external/nfacct"
...
* commit '4d63ea785ebbb1cefd556de81cbee1a574faa442':
Revert "Remove external/libnl and external/nfacct"
2014-01-07 00:41:07 +00:00
JP Abgrall
4d63ea785e
am a091c457: am 6afa96c8: am 8f1819f4: am 8e5176d8: Revert "Remove external/libnl and external/nfacct"
...
* commit 'a091c457789a5975518c61517d24f20deafa6cc2':
Revert "Remove external/libnl and external/nfacct"
2014-01-07 00:37:53 +00:00
JP Abgrall
a091c45778
am 6afa96c8: am 8f1819f4: am 8e5176d8: Revert "Remove external/libnl and external/nfacct"
...
* commit '6afa96c8f40a2558c7b35e631286a2d9ba5e2c36':
Revert "Remove external/libnl and external/nfacct"
2014-01-06 16:33:17 -08:00
JP Abgrall
6afa96c8f4
am 8f1819f4: am 8e5176d8: Revert "Remove external/libnl and external/nfacct"
...
* commit '8f1819f446882ac2f8b7d7a05873d00a2c17d67d':
Revert "Remove external/libnl and external/nfacct"
2014-01-06 16:31:33 -08:00
JP Abgrall
8f1819f446
am 8e5176d8: Revert "Remove external/libnl and external/nfacct"
...
* commit '8e5176d8a3069f7d1fdd4563001d336fc8d26838':
Revert "Remove external/libnl and external/nfacct"
2014-01-07 00:29:56 +00:00
JP Abgrall
8e5176d8a3
Revert "Remove external/libnl and external/nfacct"
...
This reverts commit 5585983817
2014-01-06 18:56:09 +00:00
Conley Owens
cedf39a615
am 174d0380: am 8ff2c4ff: am 5fc52d5b: am ba8e50ab: am 616eb04d: am 1e6287ca: Revert "Add external/xdelta3 and external/syspatch"
...
* commit '174d03806a24ac3824c3c7fe4ae7a108b41e3d34':
Revert "Add external/xdelta3 and external/syspatch"
2014-01-04 11:16:45 +00:00
Conley Owens
1007aae13e
am 77e56228: am 5b042b3a: am 4d034b0a: am 13e24967: am c825bad6: am d7e5ea0d: Add external/xdelta3 and external/syspatch
...
* commit '77e562289ffe955de09c64f7e9575866cde1baeb':
Add external/xdelta3 and external/syspatch
2014-01-04 11:16:43 +00:00
Conley Owens
174d03806a
am 8ff2c4ff: am 5fc52d5b: am ba8e50ab: am 616eb04d: am 1e6287ca: Revert "Add external/xdelta3 and external/syspatch"
...
* commit '8ff2c4ffc5e42563f5eb9ddfeeffa5c4b9c9b540':
Revert "Add external/xdelta3 and external/syspatch"
2014-01-04 03:35:31 +00:00
Conley Owens
77e562289f
am 5b042b3a: am 4d034b0a: am 13e24967: am c825bad6: am d7e5ea0d: Add external/xdelta3 and external/syspatch
...
* commit '5b042b3aab854f6fc6424c9666baa540ec3da072':
Add external/xdelta3 and external/syspatch
2014-01-04 03:35:30 +00:00
Conley Owens
8ff2c4ffc5
am 5fc52d5b: am ba8e50ab: am 616eb04d: am 1e6287ca: Revert "Add external/xdelta3 and external/syspatch"
...
* commit '5fc52d5b358d9d1fac31d471888318e5e469a70c':
Revert "Add external/xdelta3 and external/syspatch"
2014-01-04 03:32:21 +00:00
Conley Owens
5fc52d5b35
am ba8e50ab: am 616eb04d: am 1e6287ca: Revert "Add external/xdelta3 and external/syspatch"
...
* commit 'ba8e50ab2395aff345f8aec30eeb604590ea7356':
Revert "Add external/xdelta3 and external/syspatch"
2014-01-03 19:30:21 -08:00
Conley Owens
ba8e50ab23
am 616eb04d: am 1e6287ca: Revert "Add external/xdelta3 and external/syspatch"
...
* commit '616eb04da39fa514f69fbc3f7d7d50c28d510725':
Revert "Add external/xdelta3 and external/syspatch"
2014-01-03 19:28:41 -08:00
Conley Owens
616eb04da3
am 1e6287ca: Revert "Add external/xdelta3 and external/syspatch"
...
* commit '1e6287ca87b10c6cc4c75477e8629f333dd48080':
Revert "Add external/xdelta3 and external/syspatch"
2014-01-04 03:25:15 +00:00
Conley Owens
1e6287ca87
Revert "Add external/xdelta3 and external/syspatch"
...
This reverts commit d7e5ea0d0c
2014-01-04 03:15:39 +00:00
Simon Wilson
9713b9b2f7
am 6a74d280: resolved conflicts for merge of 18d1287b to master
...
* commit '6a74d2800daf282cfdd416e71c96b351cce41346':
2014-01-04 01:16:15 +00:00
Simon Wilson
5166b8de80
resolved conflicts for merge of 18d1287b to master
...
Change-Id: I37d97810148b49c7131d48dcbaad37ed98262c66
2014-01-03 16:15:46 -08:00
Conley Owens
5b042b3aab
am 4d034b0a: am 13e24967: am c825bad6: am d7e5ea0d: Add external/xdelta3 and external/syspatch
...
* commit '4d034b0af8d5442e8f6afd39dbcb8050df4b3f8d':
Add external/xdelta3 and external/syspatch
2014-01-04 00:07:00 +00:00
Conley Owens
4d034b0af8
am 13e24967: am c825bad6: am d7e5ea0d: Add external/xdelta3 and external/syspatch
...
* commit '13e24967629c0173b55a5a2022b9a6086b38f23d':
Add external/xdelta3 and external/syspatch
2014-01-03 16:03:57 -08:00
Conley Owens
13e2496762
am c825bad6: am d7e5ea0d: Add external/xdelta3 and external/syspatch
...
* commit 'c825bad61f993c0ab20d96ac6facdd45e722caf9':
Add external/xdelta3 and external/syspatch
2014-01-03 16:01:36 -08:00
Conley Owens
c825bad61f
am d7e5ea0d: Add external/xdelta3 and external/syspatch
...
* commit 'd7e5ea0d0c55630df4f0db4010b63b0e44c70486':
Add external/xdelta3 and external/syspatch
2014-01-03 23:57:34 +00:00
Simon Wilson
6a74d2800d
resolved conflicts for merge of 18d1287b to master
...
Change-Id: I0d2d29cfb59b0174b64c08fea8d2a0c08b0d65c4
2014-01-03 15:05:00 -08:00
Conley Owens
d7e5ea0d0c
Add external/xdelta3 and external/syspatch
...
Change-Id: Iae76361e45720936775d16fcf674c8c89fbda6fa
2014-01-03 14:45:58 -08:00
Simon Wilson
18d1287b92
Add tetra projects
...
Change-Id: I729f389fe6fbdeddc33fa5c806555749c24a1b41
Reviewed-on: https://googleplex-android-review.git.corp.google.com/403578
Reviewed-by: Ryan Barnett <rbarnett@google.com >
Reviewed-by: Geoff Mendal <mendal@google.com >
2014-01-03 22:38:21 +00:00
Chad Jones
20d59821dd
Add external/cmockery
...
Bug: 12235509
Change-Id: Ib0ae2d0f64f755c09bf39d633cfb0d00b7c0615b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/402882
Reviewed-by: Chad Jones <chadj@google.com >
2013-12-27 21:47:45 +00:00
Conley Owens
771bde8947
am 773143da: am 1a53c1fe: Remove ti/wlan and ti/wpan
...
* commit '773143da809f70ae46bfbedb27b24f4268507109':
Remove ti/wlan and ti/wpan
2013-12-19 23:02:22 +00:00
Conley Owens
773143da80
am 1a53c1fe: Remove ti/wlan and ti/wpan
...
* commit '1a53c1feb7dca0ace7b1052d791b075496c784c5':
Remove ti/wlan and ti/wpan
2013-12-19 22:57:51 +00:00
Conley Owens
1a53c1feb7
Remove ti/wlan and ti/wpan
...
These projects are no longer needed in the master manifest.
Change-Id: Ie0abc1bc55a6cc99100606fc8c0c9629b8492ea5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/401933
Reviewed-by: Ying Wang <wangying@google.com >
Reviewed-by: Christopher Ferris <cferris@google.com >
2013-12-19 22:53:17 +00:00
Simon Wilson
3703ea4916
am f20148b0: Add qcom_display group
...
* commit 'f20148b0f9f9c68f892848ef50e72b6f54d1e5d8':
Add qcom_display group
2013-12-19 22:25:51 +00:00
Simon Wilson
f20148b0f9
Add qcom_display group
...
This is for projects that only need to bring in
platform/hardware/qcom/display and not any of the
other qcom group repositories.
Change-Id: I78c01b65fded9ed907ce05ac2263cf3153c1c6d3
Reviewed-on: https://googleplex-android-review.git.corp.google.com/401895
Reviewed-by: Bill Napier <napier@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-12-19 22:22:21 +00:00
Simon Wilson
154bb3872a
am 71e38397: Add dory to qcom vendor repositories
...
* commit '71e38397fd2dff040f7f35eebfd62a438d3c838e':
Add dory to qcom vendor repositories
2013-12-19 19:03:55 +00:00
Simon Wilson
71e38397fd
Add dory to qcom vendor repositories
...
Change-Id: I8631eaa8f9a454dd9d7463280ca6feb21a08697f
Reviewed-on: https://googleplex-android-review.git.corp.google.com/401699
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-19 18:59:07 +00:00
Conley Owens
4b1b9ff3f0
am e35b031a: am e746cf2a: am 243a07d2: am bb9cb319: am eebfa7e6: am 55859838: Remove external/libnl and external/nfacct
...
* commit 'e35b031a2dab5fc02db3902383121366335b0ee1':
Remove external/libnl and external/nfacct
2013-12-19 00:54:49 +00:00
Conley Owens
e35b031a2d
am e746cf2a: am 243a07d2: am bb9cb319: am eebfa7e6: am 55859838: Remove external/libnl and external/nfacct
...
* commit 'e746cf2a77b43e9750678ec78d64584c7ae35c6c':
Remove external/libnl and external/nfacct
2013-12-19 00:51:59 +00:00
Conley Owens
e746cf2a77
am 243a07d2: am bb9cb319: am eebfa7e6: am 55859838: Remove external/libnl and external/nfacct
...
* commit '243a07d2751766d1bc5403feedb00320122ce882':
Remove external/libnl and external/nfacct
2013-12-19 00:48:09 +00:00
Conley Owens
243a07d275
am bb9cb319: am eebfa7e6: am 55859838: Remove external/libnl and external/nfacct
...
* commit 'bb9cb3192847293beb01ba2c6ce6f259bfb4bd58':
Remove external/libnl and external/nfacct
2013-12-18 16:43:45 -08:00
Conley Owens
bb9cb31928
am eebfa7e6: am 55859838: Remove external/libnl and external/nfacct
...
* commit 'eebfa7e6ec00de022510d8755191e2e00b38b9d2':
Remove external/libnl and external/nfacct
2013-12-18 16:40:39 -08:00
Conley Owens
eebfa7e6ec
am 55859838: Remove external/libnl and external/nfacct
...
* commit '55859838174254650a4d6c1284a59695e75a6b4e':
Remove external/libnl and external/nfacct
2013-12-19 00:38:53 +00:00
Conley Owens
5585983817
Remove external/libnl and external/nfacct
...
These projects weren't quite ready to be included in the manifest.
Removing for now.
Change-Id: Ica4cf732545a6a0ca64c55a4c48bdadd28637cc8
2013-12-18 16:34:38 -08:00
Conley Owens
44267e2563
am 4f951dc6: am 8a46f061: am b302f934: am 18fd943e: am f2c4bacf: am 474e2107: Add external/libnl and external/libnfact
...
* commit '4f951dc6b2961938bfc722353748518956a327f3':
Add external/libnl and external/libnfact
2013-12-19 00:01:57 +00:00
Conley Owens
4f951dc6b2
am 8a46f061: am b302f934: am 18fd943e: am f2c4bacf: am 474e2107: Add external/libnl and external/libnfact
...
* commit '8a46f061e200760d6cfa371eac7ff757aa484213':
Add external/libnl and external/libnfact
2013-12-18 23:58:52 +00:00
Conley Owens
8a46f061e2
am b302f934: am 18fd943e: am f2c4bacf: am 474e2107: Add external/libnl and external/libnfact
...
* commit 'b302f934357ada0df91bbd361aea6aee48b778ff':
Add external/libnl and external/libnfact
2013-12-18 23:56:54 +00:00
Conley Owens
b302f93435
am 18fd943e: am f2c4bacf: am 474e2107: Add external/libnl and external/libnfact
...
* commit '18fd943e3b847dea909b3f2b54c23cad84ace03a':
Add external/libnl and external/libnfact
2013-12-18 15:54:43 -08:00
Conley Owens
18fd943e3b
am f2c4bacf: am 474e2107: Add external/libnl and external/libnfact
...
* commit 'f2c4bacf2ca25a820440668374b9e3073ffa9f9d':
Add external/libnl and external/libnfact
2013-12-18 15:51:19 -08:00
Conley Owens
f2c4bacf2c
am 474e2107: Add external/libnl and external/libnfact
...
* commit '474e21072ed73fe987c41c8f1be81c2f977a40c4':
Add external/libnl and external/libnfact
2013-12-18 23:48:10 +00:00
Conley Owens
474e21072e
Add external/libnl and external/libnfact
...
Change-Id: I0668f4cd59aaaf515aebb4d83541da89194e891e
2013-12-18 15:02:05 -08:00
Bart Sears
cb661f7853
Remove ChromeBookmarksSyncAdapter project
...
We no longer need the ChromeBookmarksSyncAdapter project in master.
See bug 11415868 for all of the details. All of the files in this
project were removed in maser build 953391 with CL
https://googleplex-android-review.googlesource.com/#/c/400678/
and the master build is green.
Bug: 11415868
Change-Id: I44a6a1f571bc80e99a4d1d9708d296eb842b37a3
Reviewed-on: https://googleplex-android-review.git.corp.google.com/400731
Reviewed-by: Chad Jones <chadj@google.com >
2013-12-18 18:16:34 +00:00
Chad Jones
631611020a
am 20ddeb64: am 832503c2: am 04f8a006: am ee083428: am 60f6d362: Fix a few ordering issues with vendor/unbundled_google/packages/...
...
* commit '20ddeb64a208ff8734ad1c9bf47f542a6255affa':
Fix a few ordering issues with vendor/unbundled_google/packages/...
2013-12-17 22:56:21 +00:00
Chad Jones
20ddeb64a2
am 832503c2: am 04f8a006: am ee083428: am 60f6d362: Fix a few ordering issues with vendor/unbundled_google/packages/...
...
* commit '832503c2e73021f8aa6a82626257f58b9460c0ee':
Fix a few ordering issues with vendor/unbundled_google/packages/...
2013-12-17 22:47:00 +00:00
Chad Jones
832503c2e7
am 04f8a006: am ee083428: am 60f6d362: Fix a few ordering issues with vendor/unbundled_google/packages/...
...
* commit '04f8a0067d3f6e24096800fafe5f399a6277bec7':
Fix a few ordering issues with vendor/unbundled_google/packages/...
2013-12-17 22:44:38 +00:00
Chad Jones
04f8a0067d
am ee083428: am 60f6d362: Fix a few ordering issues with vendor/unbundled_google/packages/...
...
* commit 'ee083428199f4a54b230233a4104eb9149419fb1':
Fix a few ordering issues with vendor/unbundled_google/packages/...
2013-12-17 14:41:53 -08:00
Chad Jones
ee08342819
am 60f6d362: Fix a few ordering issues with vendor/unbundled_google/packages/...
...
* commit '60f6d3628f1a642c91d170ff8fe324de73124058':
Fix a few ordering issues with vendor/unbundled_google/packages/...
2013-12-17 14:39:59 -08:00
Chad Jones
60f6d3628f
Fix a few ordering issues with vendor/unbundled_google/packages/...
...
This can (and has) result in merge problems downstream.
Change-Id: I734ab728e70be692caecf024c63e71d9541b84be
Reviewed-on: https://googleplex-android-review.git.corp.google.com/398685
Reviewed-by: Baligh Uddin <baligh@google.com >
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-12-17 22:38:31 +00:00
Geoff Mendal
8e16e1c6b3
am c0d89f3a: Add platform/packages/apps/McLauncher Bug: 12118004 Change-Id: Ie84f1a2f5b00e45179387c701b8614c3f7106c1e Reviewed-on: https://googleplex-android-review.git.corp.google.com/399699 Reviewed-by: Geoff Mendal <mendal@google.com>
...
* commit 'c0d89f3aae9b4e61cb30f3eb259ba42b1f0fe683':
Add platform/packages/apps/McLauncher Bug: 12118004 Change-Id: Ie84f1a2f5b00e45179387c701b8614c3f7106c1e Reviewed-on: https://googleplex-android-review.git.corp.google.com/399699 Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-16 18:01:29 +00:00
Geoff Mendal
c0d89f3aae
Add platform/packages/apps/McLauncher
...
Bug: 12118004
Change-Id: Ie84f1a2f5b00e45179387c701b8614c3f7106c1e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/399699
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-16 17:59:27 +00:00
Chad Jones
998a027468
Remove dup AndroidMediaShell
...
Change-Id: Idd0a2a6ebdf2074af1e94b77ec02e91a384e3f7c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/398656
Reviewed-by: Baligh Uddin <baligh@google.com >
2013-12-12 19:06:38 +00:00
Ignacio Solla
8949097cdb
am d684396f: am a3429150: am f268576f: am 1400aed6: am 01e76ee1: Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
...
* commit 'd684396f8944aa7b4138327d3e990c05c2b5180e':
Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
2013-12-12 18:44:34 +00:00
Ignacio Solla
d684396f89
am a3429150: am f268576f: am 1400aed6: am 01e76ee1: Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
...
* commit 'a3429150879019d8cb71769b65fb5be0e768564e':
Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
2013-12-12 18:41:17 +00:00
Ignacio Solla
a342915087
am f268576f: am 1400aed6: am 01e76ee1: Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
...
* commit 'f268576fdedb85df3752c524af1db39adae7efa0':
Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
2013-12-12 18:37:59 +00:00
Ignacio Solla
f268576fde
am 1400aed6: am 01e76ee1: Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
...
* commit '1400aed60fe29d191f41ba56c9700a47e0643c8f':
Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
2013-12-12 10:32:53 -08:00
Ignacio Solla
1400aed60f
am 01e76ee1: Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
...
* commit '01e76ee1e774ef61b86d9f01f9a42d77414123ad':
Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
2013-12-12 10:30:08 -08:00
Ignacio Solla
01e76ee1e7
Add platform/vendor/unbundled_google/packages/AndroidMediaShell to klp-dev manifest.
...
This project is only for Molly. The MediaShell is a component that will replace the
AndroidCastReceiver (ie. platform/vendor/unbundled_google/packages/Chrome/M32/cast-receiver)
as the application used in Molly devices to play videos during Cast sessions.
Change-Id: Ib465f2188f34266379ff17277c152b026da51275
Reviewed-on: https://googleplex-android-review.git.corp.google.com/397682
Reviewed-by: Anton Vayvod <avayvod@google.com >
Reviewed-by: Sascha Prueter <saschap@google.com >
2013-12-12 18:26:54 +00:00
Vinit Deshapnde
4fc88b52f5
Add frameworks/opt/net/wifi to repo manifest
...
This change adds frameworks/opt/net/wifi to repo manifest
to enable work in that project. It is added in PDK group
as well, as partners will need access to it.
Change-Id: Id9f18cbdd42bd85f6e3151fbcb024e135f672662
Reviewed-on: https://googleplex-android-review.git.corp.google.com/397836
Reviewed-by: Baligh Uddin <baligh@google.com >
Reviewed-by: Vinit Deshpande <vinitd@google.com >
2013-12-12 00:54:18 +00:00
Chad Jones
8a67ed3140
am 993e7ba7: am 807b4a7d: am 36955cfe: resolved conflicts for merge of b4fcbdf6 to klp-dev-plus-aosp
...
* commit '993e7ba795bc6ba0fb212c990cb3835073ee4c77':
2013-12-12 00:06:31 +00:00
Chad Jones
993e7ba795
am 807b4a7d: am 36955cfe: resolved conflicts for merge of b4fcbdf6 to klp-dev-plus-aosp
...
* commit '807b4a7d3144428eaacc56811d383277329946c2':
2013-12-12 00:03:50 +00:00
Chad Jones
807b4a7d31
am 36955cfe: resolved conflicts for merge of b4fcbdf6 to klp-dev-plus-aosp
...
* commit '36955cfec79070f9c342dc6a616a1ef7518ec89b':
2013-12-12 00:01:51 +00:00
Chad Jones
36955cfec7
resolved conflicts for merge of b4fcbdf6 to klp-dev-plus-aosp
2013-12-11 15:55:36 -08:00
Chad Jones
b4fcbdf640
Merge branch 'klp-docs' into klp-ub-dev
2013-12-11 15:40:07 -08:00
Chad Jones
65c76f8eda
Update to better match upstream klp-modular-dev
...
Change-Id: I1eaacb888fab748c3caee3cda36dd670f6a44127
Reviewed-on: https://googleplex-android-review.git.corp.google.com/398028
Reviewed-by: Chad Jones <chadj@google.com >
2013-12-11 23:12:40 +00:00
Chad Jones
2db9d58e93
am 148e82d3: am b0e7ec60: am 6dcb4cb3: Resync klp-dev-plus-aosp from klp-ub-dev
...
* commit '148e82d31764d386dde547464298f54ad2352897':
Resync klp-dev-plus-aosp from klp-ub-dev
2013-12-11 23:05:12 +00:00
Chad Jones
148e82d317
am b0e7ec60: am 6dcb4cb3: Resync klp-dev-plus-aosp from klp-ub-dev
...
* commit 'b0e7ec60ff9192ab4e26ce5b0f4f542171809f7c':
Resync klp-dev-plus-aosp from klp-ub-dev
2013-12-11 22:43:19 +00:00
Chad Jones
b0e7ec60ff
am 6dcb4cb3: Resync klp-dev-plus-aosp from klp-ub-dev
...
* commit '6dcb4cb35d9e377463d6ffa536c53c244eff7c8d':
Resync klp-dev-plus-aosp from klp-ub-dev
2013-12-11 22:40:40 +00:00
Chad Jones
6dcb4cb35d
Resync klp-dev-plus-aosp from klp-ub-dev
...
Change-Id: I8f19a587bcfaa5f8df24936ee62a5da67bf1c7f1
Reviewed-on: https://googleplex-android-review.git.corp.google.com/397988
Reviewed-by: Chad Jones <chadj@google.com >
2013-12-11 22:39:07 +00:00
Chad Jones
b813065013
am 466617fd: am 8a09ef18: am 844f577d: am 8096345a: am af83093a: Add hardware/nvidia/audio
...
* commit '466617fdf3817688f20a30f2b71d3ce21a088048':
Add hardware/nvidia/audio
2013-12-11 22:01:54 +00:00
Nick Kralevich
38fa1a2b06
am 508a7394: am 199c987e: am 70912819: (-s ours) am ee1a6492: am a59bc727: am 5cad5c55: Add project platform/external/libseccomp-helper
...
* commit '508a739497c58a376bb4fafec293cdff1780d63b':
Add project platform/external/libseccomp-helper
2013-12-11 22:01:51 +00:00
Nick Kralevich
319707cdd3
am fff96318: am adadef75: am b62d378c: (-s ours) am 4f30e288: am e03a41ac: am 7ac3161a: Add external/pcre to default.xml
...
* commit 'fff96318c19d5a6eee8816e44d2a981e9734ed73':
Add external/pcre to default.xml
2013-12-11 22:01:49 +00:00
Conley Owens
d81e1e27f5
am 3267a084: am 43187fde: am cc33a062: (-s ours) Merge commit \'f8c615b7\' into klp-dev-plus-aosp
...
* commit '3267a084d6c0a1f46d3a757c5abf81a085785bc4':
2013-12-11 22:01:43 +00:00
Chad Jones
0a5316e848
am 95b426ed: (-s ours) am b7dfedcf: (-s ours) am 9eb0ee81: (-s ours) resolved conflicts for merge of c5b0980d withi -s ours to klp-dev-plus-aosp DO NOT MERGE
...
* commit '95b426edac4c880765b4ff8889bc1e5351801bc9':
2013-12-11 22:01:41 +00:00
Conley Owens
8784e4f753
am 442f2d62: am dd8e74e8: am 866a07f6: (-s ours) am 28ef94b3: am afb7eb39: am 303c2559: Update master manifest for Android 4.4
...
* commit '442f2d625194f7b2ce40b711d4a5ee48df82b541':
2013-12-11 22:01:39 +00:00
Conley Owens
12ab8ddba5
am 54054f7d: am 2756d3ab: am c0e63fa8: (-s ours) am ec62764b: Merge commit \'5ce20218\' into stage-aosp-master
...
* commit '54054f7d1abaffd0b21c9f15b067bfc85908498c':
2013-12-11 22:01:38 +00:00
Conley Owens
d94a78a582
am c57b39b0: am 104966ab: am 8b05e3c0: (-s ours) am 10b7627f: am 57e89540: am 591060e5: Remove ti/wlan and ti/wpan
...
* commit 'c57b39b032a9cb018e05574b83f1a029de703f49':
2013-12-11 22:01:36 +00:00
Conley Owens
c607c41b6d
am 61520bce: (-s ours) am a0f5b231: am ed8c26da: (-s ours) Merge commit \'0dc7af54\' into klp-dev-plus-aosp
...
* commit '61520bce7443cf84bede4e0036f1d320a17923f5':
2013-12-11 22:01:35 +00:00
Qiwen Zhao
c319255f4f
am 9df03fdf: am a6bb6277: am 8cd59ef2: (-s ours) am 81e82624: adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
...
* commit '9df03fdf9398939cb69f3c541cc02096c153a43f':
2013-12-11 21:55:59 +00:00
Geoff Mendal
6f7fa793ca
am 9c84b5c6: am 6484817e: am 2cc5f546: (-s ours) am 15707d84: am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Rev
...
* commit '9c84b5c657a3f0def9971ee7f22a10aa00e4944e':
2013-12-11 21:55:57 +00:00
Chad Jones
133b399642
am 5c2b1073: am 16e326f3: am 6eb24530: (-s ours) resolved conflicts for merge of 55b1a1d7 to klp-dev-plus-aosp
...
* commit '5c2b1073816db6677d12e67314ef5c2ae93b339b':
2013-12-11 21:55:55 +00:00
Mindy DelliCarpini
6dfa40c6b3
am 60bd0a18: am 805587b1: am ecd00750: (-s ours) am 71164a99: Revert "Revert "Add libs/accounts to klp-ub-dev""
...
* commit '60bd0a1814afb16a4cacd8dd0056d5ef748c3c36':
2013-12-11 21:55:54 +00:00
Mindy DelliCarpini
1a3bd5497f
am c2d66a8f: am f2b987dc: am adf762a2: (-s ours) am aef6ad15: Revert "Add libs/accounts to klp-ub-dev"
...
* commit 'c2d66a8f4547a333d5d034a40e559e0c07514111':
2013-12-11 21:55:52 +00:00
Qiwen Zhao
fbda4364d8
am 0cb13919: am 19c3bcd0: am 31a14629: fix extra art project.
...
* commit '0cb13919ff807792f4d719b601485793a8b5952e':
2013-12-11 21:55:51 +00:00
Qiwen Zhao
b384d10bef
am 880e6725: am 6f9ec211: am abf7bd07: Merge branch \'klp-dev-plus-aosp\' of persistent- https://googleplex-android.googlesource.com/a//platform/manifest into klp-dev-plus-aosp
...
* commit '880e67256d57b87886e59e8a0d753c9b4a13914d':
2013-12-11 21:55:48 +00:00
Qiwen Zhao
5d6bcb6688
am 807b0efa: am 0905dfa7: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit '807b0efa6d7aa4fe1d225a0254e6f0ffaa0ca414':
2013-12-11 21:55:46 +00:00
Baligh Uddin
b9f4b48762
am d6997a61: am db66860e: am e0c74d40: am 8ab0302a: (-s ours) resolved conflict for merge of 140fd73e into stage-aosp-master
...
* commit 'd6997a61b6bb0e769fc8d97b341b377d1c4b7a12':
2013-12-11 21:55:44 +00:00
Geoff Mendal
0c7c4e0906
am 87878bb5: am 0e84a477: am 68ee96fa: resolved conflicts for merge of da8bf313 to klp-dev-plus-aosp
...
* commit '87878bb54d04d7806e84c3ac943b266dd70bfef4':
2013-12-11 21:55:43 +00:00
Qiwen Zhao
8db2ac8545
am 53509043: am 3d1f422a: am 0410e007: am 5feea2f0: am 1b694820: (-s ours) fixing missing closure
...
* commit '5350904316c56dbedb49cc0d298771a63d5eb91f':
2013-12-11 21:55:41 +00:00
Conley Owens
b38b1cb59d
am 93997a85: am 2a7206fa: am a7988355: am becb9783: am bdac56f5: (-s ours) Restore default revision in mirror manifest
...
* commit '93997a85771f28f53d5e9ec47137ee787ca394a0':
2013-12-11 21:55:40 +00:00
Kenny Root
2e5eb2439d
am e86c7cee: am 47a635a9: am 712d0e5d: am 154a20c5: am 616b4d03: (-s ours) Add bouncycastle to the pdk group
...
* commit 'e86c7cee44f6e9a078254080cbee124f7148d25b':
2013-12-11 21:55:39 +00:00
Ben Cheng
3ecca0eed5
am 7fe17280: am 3804d9b1: am cb557d85: am 8d20a14d: am 1a368cb0: (-s ours) Add various gcc-4.8 projects.
...
* commit '7fe17280a2300291dc1913f5d75d615ff5df8d73':
2013-12-11 21:55:37 +00:00
Conley Owens
56a323869a
am 34491db9: am bcd7e631: am 41b6083b: am 73f58baa: am fcfe1e98: (-s ours) Remove the hardware/msm7k project
...
* commit '34491db9fac4292ca5c7d62e0cbbb92e82504ac5':
2013-12-11 21:55:36 +00:00
Christopher Ferris
337522d439
am 36877bcc: am fc768679: am 06157719: am db791284: am 50c7e543: (-s ours) Remove the pdk group for libunwind.
...
* commit '36877bcc3d1efbbd708ea02a57764d7b54ce494b':
2013-12-11 21:55:34 +00:00
Geoff Mendal
9a81122b6d
am 2b92cef8: am d548d71f: am fa37d433: am a431a99e: am 61f86fa3: (-s ours) Add platform/external/conscrypt to master
...
* commit '2b92cef84b49fbcf7cfc30a4ec0407302b6db5b1':
2013-12-11 21:55:33 +00:00
Christopher Ferris
4743bce150
am 3b5489e9: am c374e7d4: am 44a00c68: am cd32ec59: am b199a962: (-s ours) Add external/libunwind to manifest.
...
* commit '3b5489e95c82a593e7e32fb7f6f020d917917170':
2013-12-11 21:55:31 +00:00
Baligh Uddin
9d1f22e39b
am 615e0157: am cfba9d1e: am 9f9ad299: am b2969010: am c5830705: (-s ours) Add tools/studio/translation to AOSP master manifest
...
* commit '615e015750c508d252c3491079d3adc5f68160b0':
2013-12-11 21:55:29 +00:00
The Android Open Source Project
ef0fc51729
am 9a34eb04: am cdf4d433: am 6a22fd17: am c6ecdcd2: am 1c546d57: (-s ours) Remove obsolete ping/ping6
...
* commit '9a34eb0491b6da93345178d5b50d72672fe7acbf':
2013-12-11 21:55:27 +00:00
The Android Open Source Project
f704e2773e
am 943f28ea: am 2aac4ec2: am 17a974c7: am f19f68f8: am b0ff0cc0: (-s ours) Updated master manifest after jb-mr2-dev
...
* commit '943f28ea5b3b208e3de8c8c16404045002bda4b4':
2013-12-11 21:55:26 +00:00
The Android Open Source Project
6e3081ad12
am 13d60771: am 0e52dd03: am 5b4a72b3: am d7bacd23: am 83b76775: (-s ours) Add x86_64 toolchains
...
* commit '13d607713d1b0ba9d52b40811e61e4a96b84db0c':
2013-12-11 21:55:24 +00:00
The Android Open Source Project
0f008b4471
am 014c595b: am aa25e57c: am df09218c: am cf955af0: am 022658e6: (-s ours) Add new projects - iputils, studio/cloud
...
* commit '014c595b363e134c3785d7ad386b1110e5a117b5':
2013-12-11 21:55:22 +00:00
The Android Open Source Project
237c79d9fd
am 5fe134c4: am 1b7a567b: am 051c7711: am 2cbfc6f3: am 1fed5706: (-s ours) New projects for telephony and prebuilt python
...
* commit '5fe134c4d1e98a642204e4cac74acd8bf5f9b377':
2013-12-11 21:55:21 +00:00
The Android Open Source Project
d43ce26902
am 977d1981: am b425e2f8: am 3c848e58: am f430be7f: am 27ce518b: (-s ours) Add scrypt and prebuilt clang projects
...
* commit '977d19810a0dd60fff605084dc2f92ca20a8de02':
2013-12-11 21:55:20 +00:00
The Android Open Source Project
a62e597174
am ab747236: am cf228376: am 0c56fc27: am f95384df: am 659b6584: (-s ours) Un-branch master-dalvik from master
...
* commit 'ab747236d6b216d27f6cf60bd5747934d5c816e9':
2013-12-11 21:55:18 +00:00
The Android Open Source Project
e33c68b793
am cdd671c7: am 68cc7f7d: am d7176021: am f1dd3f4b: am ced9b333: (-s ours) Add idea projects
...
* commit 'cdd671c7974745338f820defdb39a4caacd30dfc':
2013-12-11 21:55:17 +00:00
The Android Open Source Project
c7f82ed8b5
am 435faced: am 0dedb7f5: am 4c7d2fb4: am 2cfb0046: am 70c902cf: (-s ours) Add device/ and hardware/ for 4.2.2
...
* commit '435faced986c84c6c9e990fad1c9fe5669c7357e':
2013-12-11 21:55:15 +00:00
The Android Open Source Project
2628a69314
am 7698e667: am 0d435dbb: am 2ab1f392: am 3f69a246: am d56f7074: (-s ours) Update master manifest to match jb-mr1.1-dev
...
* commit '7698e6673f73d3e3894d1a269193c9207c263cc9':
2013-12-11 21:55:14 +00:00
The Android Open Source Project
0bc7d9a211
am 1c0edacb: am 2e81de19: am ec9e2556: am 7e5125e9: am c8a40b6b: (-s ours) Add tools groups on prebuilts/tools
...
* commit '1c0edacb0be937f3aac3e7cef1053e867ccbc638':
2013-12-11 21:55:07 +00:00
The Android Open Source Project
2b98f9fcc5
am 7405d79a: am f9d9be52: am 036c1e13: am 35d5de31: am bc65e60b: (-s ours) Add mockito and objenesis
...
* commit '7405d79a73a5d5b74501236b914469d416eb0b6a':
2013-12-11 21:55:06 +00:00
The Android Open Source Project
b73a474a8d
am 1f4d9109: am a077bced: am 4b9c6ea0: am d563abdb: am e046a83b: (-s ours) Add nist-pkits
...
* commit '1f4d910945ed590231cf3039ebcf94de1ddb4bdb':
2013-12-11 21:55:04 +00:00
The Android Open Source Project
695d3d8f09
am 676113dd: am d4c32701: am 8aabba8e: am 32798ec4: am e4b6c172: (-s ours) New location for fat32lib
...
* commit '676113dda02943e1df3c1d707c13af97c6ad95c1':
2013-12-11 21:55:02 +00:00
The Android Open Source Project
5696392d3c
am 7de89a6b: am dad03df5: am bf3ed28d: am 1b9e9b6a: am 6747c5e5: (-s ours) Add prebuilts/devtools
...
* commit '7de89a6bc22c8223dbf905b8587619da22a542f9':
2013-12-11 21:54:59 +00:00
The Android Open Source Project
efd8d99be9
am b50ee2b0: am a6018286: am 3dc6d2ac: am 4ae4a279: am 70b1a769: (-s ours) Modernize the manifest groups
...
* commit 'b50ee2b0cb356faf415245daf644cb6084d9e591':
2013-12-11 21:54:57 +00:00
The Android Open Source Project
2fa12a1b83
am 2d5b2f20: am 0ccd077f: am 92bb766b: am 1de131b4: am b05bfe82: (-s ours) Add new devtools projects
...
* commit '2d5b2f20a4656af75d45dcbfc6f17a657dcdaf6f':
2013-12-11 21:54:55 +00:00
The Android Open Source Project
475fdcb0b5
am 6eebb1c3: am 390a0c8c: am f5d39be9: am 7dc15a68: am b1bab4dc: (-s ours) Add new devtools projects
...
* commit '6eebb1c3e398102dd10dc116d0588ccb71a0f973':
2013-12-11 21:54:53 +00:00
The Android Open Source Project
9dbbd84fcb
am 7194e81e: am 53fb7c94: am a10e4fb7: am 9b7609af: am a1123ee5: (-s ours) Tune tools groups
...
* commit '7194e81e270125c25509bbf0ff2a3d06fe20e4f7':
2013-12-11 21:54:51 +00:00
The Android Open Source Project
e57c2df0af
am 6bde3605: am e2b4d7de: am ba5ca2c1: am 5bc34e05: am 596d9d99: (-s ours) Add tools/base
...
* commit '6bde3605b70fd39fe9dd1d1237b0a56847ca0fa2':
2013-12-11 21:54:50 +00:00
The Android Open Source Project
7e3d726341
am a685e771: am 00286c51: am 696f8b91: am 39268f30: am 50138b5a: (-s ours) Add darwin host headers
...
* commit 'a685e7719c78a37af44653d4a0467df6dabb0caf':
2013-12-11 21:54:48 +00:00
The Android Open Source Project
615f31c673
am 20e0d569: am b046a61c: am 57f35f87: am 78689a99: am 0cc40d32: (-s ours) Add eigen
...
* commit '20e0d5692b6e45584c025d7cedd6c1b1f68f735b':
2013-12-11 21:54:47 +00:00
The Android Open Source Project
82c0541eaa
am 253c1065: am 87117d5b: am 559db065: am 7bb66485: am aefb1473: (-s ours) Extra projects to match release branch
...
* commit '253c10654cbc9a7f931b002b856024c01b9a00f7':
2013-12-11 21:54:45 +00:00
The Android Open Source Project
779cef93d4
am e797c943: am 04dd71a2: am 447c58c3: am 466aa85a: am cb5004d3: (-s ours) Manifest for master, updated for 4.2
...
* commit 'e797c943b8caf7550d0d5dd63e10f3e52839694e':
2013-12-11 21:54:43 +00:00
The Android Open Source Project
ddd5bce374
am 4cdcb734: am 4022f0d4: am d1727ef8: am 0d623d92: am fe20f3cb: (-s ours) Add MacOS host toolchain
...
* commit '4cdcb7343a72a1857dbb688f0b30dc49866285f4':
2013-12-11 21:54:40 +00:00
The Android Open Source Project
880446c751
am 372dd0b4: am 688a804d: am f6ab7789: am 7b7ea8e4: am dfefa4af: (-s ours) Add frameworks/volley
...
* commit '372dd0b4263fc7c97510c240fa487c57db61b065':
2013-12-11 21:54:38 +00:00
The Android Open Source Project
fe86c8a74e
am ea26dabc: am e6354f4a: am 0d7f7744: am 3c8e7a0c: am f1b2e439: (-s ours) Add projects for gcc 4.7 prebuilts
...
* commit 'ea26dabc43e876e8cdd244b78e6b96a84aedf6f1':
2013-12-11 21:54:36 +00:00
The Android Open Source Project
cb4018db35
am c6a1308a: am 7181c531: am 69e0afa6: am 25ff5bed: am d1848bab: (-s ours) Add harfbuzz_ng
...
* commit 'c6a1308a84fda9c4e83583973905c70e6194b7b9':
2013-12-11 21:54:34 +00:00
The Android Open Source Project
d254c8e37f
am 6b201806: am 94d5e561: am 80e64894: am 56d41062: am db11c6ad: (-s ours) Base manifest for 4.2 GPL components
...
* commit '6b201806ddbc1b651da7907ddd9751c1d3cbce69':
2013-12-11 21:54:27 +00:00
The Android Open Source Project
b1110ac7ce
am 21667be3: am 287199e2: am eedb4243: am ced6d2be: am f46b8df3: (-s ours) Replace torospr with toroplus
...
* commit '21667be378079d27211954976567dcb6da9a6c25':
2013-12-11 21:54:26 +00:00
The Android Open Source Project
f2ad9dbf7b
am 49eccf44: am 9e18e8bd: am 2ebe35f8: am 9932f838: am a89ea088: (-s ours) Add hardware/akm
...
* commit '49eccf44b21ddaae44f64fa3a1b350ea6fb56cb6':
2013-12-11 21:54:24 +00:00
The Android Open Source Project
5bb952e898
am e5dee57a: am a7b38fb4: am 674dfb62: am 9355cbb0: am 08dca174: (-s ours) Add optional eclipse-related prebuilts
...
* commit 'e5dee57a5a43aec9848190c73a59975d4c08753f':
2013-12-11 21:54:23 +00:00
The Android Open Source Project
a2b285b217
am ddbeaa23: am aa074961: am 6f7a5241: am 43510b65: am a07bad60: (-s ours) Unmap MIPS 4.4 toolchains
...
* commit 'ddbeaa234f72e7733cdc015c6c90f2f0897aa630':
2013-12-11 21:54:21 +00:00
The Android Open Source Project
92b15466f5
am 4bfb884a: am 84a4968a: am e77d642b: am a6f33a29: am 4cf09a29: (-s ours) Add fat32lib
...
* commit '4bfb884ad6a03f2320e841f20e561f75ecc498c5':
2013-12-11 21:54:20 +00:00
The Android Open Source Project
20c9a0f5e2
am 153b6be2: am 49a615ad: am efcd6aa7: am 94d88cb5: am 7d0d8f01: (-s ours) Add device/sony/lt26
...
* commit '153b6be2eba6421dfee0a83349193853c8b5a902':
2013-12-11 21:54:18 +00:00
The Android Open Source Project
3e132fb89c
am 40337272: am e26071e3: am 66cac91d: am 0168606d: am 73ce405e: (-s ours) give tools/build its own group
...
* commit '40337272ea421d5323b0a03b8d6c2fab69ab433d':
2013-12-11 21:54:17 +00:00
The Android Open Source Project
7b772131ef
am 09e729ab: am 200be509: am 160b9754: am 47d364a2: am d479f201: (-s ours) Update projects
...
* commit '09e729abdb980c7e5a1d34b46a2ae70a00a2efd6':
2013-12-11 21:54:16 +00:00
The Android Open Source Project
25a6d6dc19
am 1f816c54: am 7295a986: am a294c8d5: am cf7089aa: am 25a5770c: (-s ours) Add manifest groups.
...
* commit '1f816c546738353ef0263d7230ff5949746eb8c2':
2013-12-11 21:54:13 +00:00
The Android Open Source Project
cf9fb4c3a4
am 1efb5601: am e8b7f958: am 4c6c43b5: am 8d0d5e9f: am ce42277e: (-s ours) Add motodev
...
* commit '1efb56017daa90cbc7beb8d850713d6e69149915':
2013-12-11 21:54:11 +00:00
The Android Open Source Project
b8d9ffdfda
am 0571f94c: am f76f95a3: am 4a50d676: am 948c7a54: am 6f056451: (-s ours) Update manifest for Jelly Bean
...
* commit '0571f94ca453f6c5fd5ed1693d565c909fb39d3c':
2013-12-11 21:54:07 +00:00
The Android Open Source Project
51660dc120
am 96b762ba: am 2fb93eac: am da145320: am bf185341: am 39541968: (-s ours) Add aac and gcc-demangle
...
* commit '96b762ba8cf58e063f76f0cbaa0f7af32516a44a':
2013-12-11 21:53:55 +00:00
The Android Open Source Project
ae926575da
am bae5b8d1: am 67f034ba: am b0abef19: am 7aeb0f60: am 0cd29e3a: (-s ours) Switch to snapshots for dalvik and libcore
...
* commit 'bae5b8d1715a8aa2816f9731bc989a3634d8312b':
2013-12-11 21:53:54 +00:00
The Android Open Source Project
58053ea02a
am 69140084: am e06c734e: am dd519999: am 9e0719b5: am b5a0d13b: (-s ours) Add chromium-trace
...
* commit '69140084bb439328a9bca5889a5f96f87be7c5d0':
2013-12-11 21:53:52 +00:00
The Android Open Source Project
8069fc9965
am dbb4b56b: am df1bc916: am 32626ab6: am 885c3e99: am 00ece54b: (-s ours) Remove i686-android-linux-4.4.3 toolchain
...
* commit 'dbb4b56b80dc8ca259291eb083e967db48387a57':
2013-12-11 21:53:50 +00:00
The Android Open Source Project
8d2443e328
am 91b1fb94: am 3f336a64: am 1225400c: am 32713903: am 8c701771: (-s ours) Add ant-glob
...
* commit '91b1fb9462712d0a59a929df1b48303954621625':
2013-12-11 21:53:48 +00:00
The Android Open Source Project
bb294a4b93
am 4087c5e9: am 3fd7d29e: am ada49e76: am f6a79b9e: am 03fc9565: (-s ours) Add prebuilts/misc
...
* commit '4087c5e93008a53eff2eeaffdd0d96719c9b5043':
2013-12-11 21:53:47 +00:00
The Android Open Source Project
d275ae18bf
am 640ea861: am 015d4ff5: am f138c5b0: am 1415d76b: am 8f95dff3: (-s ours) Switch to the proper location of IA 4.6 toolchain
...
* commit '640ea86150a7380019aaa85d8e566b165f65de95':
2013-12-11 21:53:46 +00:00
The Android Open Source Project
c78490bdc3
am c6da6ddc: am d6c261d4: am a3996d8e: am cdc2a45d: am e56e10bf: (-s ours) Add 4.6 toolchains
...
* commit 'c6da6ddc971e9f006c728c096bf5f5f39e8f4e17':
2013-12-11 21:53:41 +00:00
The Android Open Source Project
c56a359944
am 1a2a9222: am 7a4329a2: am a4c453fb: am 29bd36b6: am 527678f0: (-s ours) Add new toolchains
...
* commit '1a2a9222fde0039b99bbb100cada9be7e114fd22':
2013-12-11 21:53:38 +00:00
The Android Open Source Project
c62cb89a0a
am 694ef99c: am 93a83ad7: am 8d1525ff: am 3444267d: am 23f0e783: (-s ours) Add prebuilts/eclipse
...
* commit '694ef99cbe9c7b956131813ca251e2ab6beb545c':
2013-12-11 21:53:35 +00:00
The Android Open Source Project
9368dbe491
am 09f531ba: am 1ad60f2a: am 80c7b5a8: am 912bc11c: am 9a452a71: (-s ours) Add MIPS toolchains
...
* commit '09f531ba6e803c07e6e1bde6f46d355c63b257a4':
2013-12-11 21:53:32 +00:00
The Android Open Source Project
08d791036f
am 4a3c68a4: am e37a3d28: am 2eb7ecfb: am f0e84e13: am 1dd8491e: (-s ours) Add checkpolicy
...
* commit '4a3c68a425fcdfa444e019e211cca28093e479ce':
2013-12-11 21:53:29 +00:00
The Android Open Source Project
da468a82d7
am 818fa617: am a91952ed: am 1f8827fd: am 427f4b3a: am 12c5c7e4: (-s ours) Add basebuilder
...
* commit '818fa6174843b24c4c3c287c88bf6d6c74989e08':
2013-12-11 21:53:26 +00:00
The Android Open Source Project
c098c0d813
am 7e8ef2a3: am 91b465b4: am 5ae3b20a: am edd311d4: am dd6bc4ec: (-s ours) Merge from ics-mr1, add torospr
...
* commit '7e8ef2a3f1f8b240404b1cd2363be0442ef23991':
2013-12-11 21:53:25 +00:00
The Android Open Source Project
06c63b9073
am a4616226: am a27e8518: am f1bf92f4: am 53c25207: am 2ba9cf74: (-s ours) Add clat and gcc 4.6 host prebuilts
...
* commit 'a4616226f3d68662bcee15adea7e04ecc167c66e':
2013-12-11 21:53:23 +00:00
The Android Open Source Project
185c89c824
am 6e9fc1f0: am 45fbb855: am 97c33f8a: am 364f7919: am 422710ca: (-s ours) Add windowbuilder
...
* commit '6e9fc1f0c84634008fd25cd244c640f1c30332c1':
2013-12-11 21:53:21 +00:00
The Android Open Source Project
cb36f7cfcc
am 9660ec00: am e4fcf9c5: am acc3b756: am 4d85d5e7: am e8fe688b: (-s ours) add ti/wpan
...
* commit '9660ec0029fc5d114ad1cb47a6f9e7c5a7c9c76b':
2013-12-11 21:53:18 +00:00
Ed Heyl
37ff603309
am c4940170: am acafdef7: am a1b6c45b: am b8e07536: am 4178b4e7: Pull in Launcher3 (for aosp), remove GoogleLauncher2.
...
* commit 'c494017031cfbf479ceac613601faaa1daebb826':
2013-12-11 21:53:16 +00:00
Torne (Richard Coles)
189e6d33a7
am a1a2dd5b: am 14290ae3: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit 'a1a2dd5b82432bdd94f66f54b8692f6dbde9b668':
2013-12-11 21:53:13 +00:00
Android Git Automerger
90e27a34ae
am c964b63c: am 319725fe: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit 'c964b63c411f891abeb17c1b7058523c218f9f6f':
2013-12-11 21:53:10 +00:00
Chad Jones
9ecf7fed80
am 1f22e936: am cbb228e3: am 3410be15: am 49099283: am bba03e82: Add vendor/nvidia/build
...
* commit '1f22e936fa9f259ddb993948672edaf9b41e6a12':
2013-12-11 21:53:08 +00:00
Kenny Root
01a48dc58b
am 13cbc545: am 6159bddf: am 2092d4a0: am a44e9d79: am 231cbfdb: Add external/conscrypt to manifest
...
* commit '13cbc545b65251f35d4e9fc6b83a9e9a641314df':
2013-12-11 21:53:05 +00:00
Geoff Mendal
1ab866ccb3
am 04d12aba: am 56e7d8bf: am 47087fae: resolved conflicts for merge of ed3ae1a9 to klp-dev-plus-aosp
...
* commit '04d12abae378ea2ad693772cc808e4d112c3b337':
2013-12-11 21:53:02 +00:00
Geoff Mendal
73b374f8f3
am 4fdeed36: am 88cada23: am 5147301d: am a6497bf5: Add volantis projects for klp-dev
...
* commit '4fdeed368e9e97ecdc78d32cbdc0a8c18708f0c4':
2013-12-11 21:52:58 +00:00
keunyoung
db5c62b9e7
am f5a15f52: am 44b759a6: am 4ef9372d: am 55d6bc31: add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
...
* commit 'f5a15f52f4d0d94ca88741402793c0b841939826':
2013-12-11 21:52:50 +00:00
keunyoung
05e76a4311
am 6ef7475d: am 7222df21: am 0e464569: am 31bdea88: remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
...
* commit '6ef7475dc1daa954a540555a368fbe114ea006a6':
2013-12-11 21:52:48 +00:00
Ying Wang
7ff14d9e25
am b0215539: am ed0e42ee: am 85c505f7: am 71941e59: Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
...
* commit 'b0215539d2d9d5fddf0ddb0c381feb1e573a96e8':
2013-12-11 21:52:47 +00:00
Ying Wang
1390fb97d6
am 2b66f4c2: am 5d7999f8: am d9bca403: am 2bef1b2e: Add back \'groups="vendor"\'
...
* commit '2b66f4c279838c1ff1454123bcfd7edacc196410':
2013-12-11 21:52:44 +00:00
Geoff Mendal
4fc0fcbf92
am a323ed67: am 3d27e599: am cfbccb94: am fb7e4a7b: Remove vendor/unbundled_google/packages/CastMirroring, repo not needed Bug: 10726512 Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43 Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752 Revi
...
* commit 'a323ed67f595f5393ca4ffc4b4db5993b56849aa':
2013-12-11 21:52:42 +00:00
Jeff Hamilton
2d08c4ba5c
am 02d3c0d2: am 37bc7306: am a27a21de: am 76eee955: Attempt to fix the build.
...
* commit '02d3c0d28e21cc201c1ae630fa8ebc221dd7b69e':
2013-12-11 21:52:38 +00:00
Ed Heyl
e22455ffba
am a7b6822b: (-s ours) am 9db13dbb: (-s ours) am 11b9fe70: am 36427c52: (-s ours) Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit 'a7b6822bc022b03c5d3217819d90bd53d47c387d':
2013-12-11 21:52:36 +00:00
Ed Heyl
9c62cc0cfd
am 6e06b656: (-s ours) am ac79f366: (-s ours) am f99f4ac7: am ad74957c: remove libvterm and Terminal projects. do not merge
...
* commit '6e06b656e69a3c139f466e89f799aeafd267613e':
2013-12-11 21:52:30 +00:00
Chad Jones
840d7393e9
am 5dc320a1: am 0a370c0e: am 6bb0ec23: am 6dbf0c13: Add device/lge/mako_svelte-kernel to mako_svelte repo group
...
* commit '5dc320a1945f4c327fe2f1614ed873f697fd4d2e':
2013-12-11 21:52:27 +00:00
Geoff Mendal
40561b5c55
am c6353e11: am 2f646e12: am 3692d6a3: am 232f2f8f: Add project platform/vendor/unbundled_google/packages/CastMirroring Bug: 10726512 Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121 Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203 Reviewe
...
* commit 'c6353e11017f57e336e445fb8f6323304aa20042':
2013-12-11 21:52:26 +00:00
Geoff Mendal
5b5a44866a
am 91c3ae35: am a1377d90: am c3a8acf7: am 44707b81: Remove AndroidCastReceiver from klp-dev Bug: 10708905 Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001 Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783 Reviewed-by: Chad Jones <chadj@goog
...
* commit '91c3ae3598a2a2d7ffceaa93243013a6f1a25137':
2013-12-11 21:52:24 +00:00
Ed Heyl
a53046cf1b
am 537726e8: am 52bfda79: am bf73dbf9: am 5ac9752b: am ba1edc7a: am c756d712: merge manifest and resolve conflicts
...
* commit '537726e882aec2e843cd49dfc0c1f20c70622974':
2013-12-11 21:52:23 +00:00
Chad Jones
d0724813c6
am 3da6a473: am 5b1b10ae: am a1bab2b2: am 3a8ff655: Add external/sil-fonts
...
* commit '3da6a473049f1382a6f567954b133ebfae256c0b':
2013-12-11 21:52:21 +00:00
Chad Jones
56e5f7e5c4
am 08da7bbe: am 15a257a2: am fd78dd20: am 3e4dc128: am 71edb48b: am 1788940d: am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit '08da7bbe20d2d2943c85a609079c89a777dcaaf2':
2013-12-11 21:52:20 +00:00
Chad Jones
cd85175754
am 4da725f6: am 3a1fe09c: am 521e52d4: am c2c657d3: am ecf5c69d: am 1b13b462: am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit '4da725f69508e3f75a76d3a52cb0375e081a0a4a':
2013-12-11 21:52:17 +00:00
Chad Jones
baddcc31f0
am d1e6ae35: am 551cbc7d: am 28a63dc9: am 4308d90d: am fc60bd6e: am 19ec5e9f: am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit 'd1e6ae35bca04f919591f64be624e214de971f7b':
2013-12-11 21:52:14 +00:00
Chad Jones
c1ed875044
am 1d335b45: am da848226: am 9828c114: am 18a23161: am b65e48c0: am 6706a7ff: resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
...
* commit '1d335b4551c2d171d318091ad47c212aac75792a':
2013-12-11 21:52:10 +00:00
Chad Jones
b1f5db1183
am 4d988ae3: am e69af563: am 87a260e0: am 92d4609c: am becedbaf: am 59eecc13: Merge branch \'jb-mr2-ub-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
...
* commit '4d988ae387bdc063ea9efd6e0311a165e785bb1d':
2013-12-11 21:52:06 +00:00
Chad Jones
a71df36f31
am 4b178b06: am bb0c5645: am d8c26f02: am 09294dfd: am b3e2f51c: resolved conflicts for merge of d80e3b00 to jb-mr2-dev-plus-aosp
...
* commit '4b178b06f2263a3ef6609d170ebccf6de15417d1':
2013-12-11 21:52:03 +00:00
Chad Jones
4e91c7e3d9
am cf35ad30: am 73816715: am d1e279c0: am d1ee7c73: am f8628ca7: Merge branch \'jb-mr2-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev-plus-aosp
...
* commit 'cf35ad30b85c76e3e54a73730fe5c91b82f6620c':
2013-12-11 21:51:59 +00:00
Chad Jones
1abd424079
am c709b46b: am 943434d3: am a40641be: am 943004fa: resolved conflicts for merge of 21754470 to klp-dev
...
* commit 'c709b46be2f197714cdfb2ab2f76e789757245f8':
2013-12-11 21:51:52 +00:00
Chad Jones
7186702aba
am 608ed10e: am ac345069: am ea3fbb05: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into klp-dev-plus-aosp
...
* commit '608ed10e1f82139e36e15d9a9f676a8d9bc5adc4':
2013-12-11 21:51:48 +00:00
Chad Jones
dd6e1c9a1f
am 02453d35: am 72bc9c0a: am 1bd3daa8: Rollback review URL update
...
* commit '02453d3509454f8714fbc043ebd71d9678503115':
2013-12-11 21:51:44 +00:00
Chad Jones
d7fabe5e15
am 85c70ae8: am fdde16ab: am b9447bda: resolved conflicts for merge of 1633a64f to klp-dev-plus-aosp
...
* commit '85c70ae8f8d3397dcc9634c0e14bcd82156a254d':
2013-12-11 21:51:43 +00:00
Chad Jones
412570ff69
am 99693f97: (-s ours) am fa52959a: (-s ours) am 0b6b7031: am 4d0f0bf0: Add projects for ardbeg - DO NOT MERGE
...
* commit '99693f97131f2e9e131a196a76148affe8c3c94b':
2013-12-11 21:51:39 +00:00
Maurice Chu
d4b68f55fb
am eadc4a4d: am 4be2abbf: am 85d4673e: am cf6835df: Change KLP-dev to point to GMS Core Fontal
...
* commit 'eadc4a4dd65508eb583d0d7a88b813d05ea86ca0':
2013-12-11 21:51:37 +00:00
Chad Jones
0ca2059dd5
am 2bb6f4d8: am f31871d7: am cb370c33: am 828eb2e3: Add external/tinycompress to set pulled in by PDK pushes.
...
* commit '2bb6f4d897cc9eaf9336529e60165850fc8f0453':
2013-12-11 21:51:31 +00:00
keunyoung
1cb458ca2d
am 969e1bbb: am e56e50ad: am 1c75d9e1: am 6bdaeae6: add vendor/auto/projection_protocol to default manifest
...
* commit '969e1bbb82645fac6570043c5b367a2d368b2ce2':
2013-12-11 21:51:29 +00:00
Geoff Mendal
1b191ee3a6
am e923d307: am 9f0a2202: am 1d0bc26f: am 53883097: Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev Bug: 10493211 Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50 Reviewed-on: https://googleplex-android-review.googlesource.com/349370 Rev
...
* commit 'e923d30709154fbdaf0e001fea9fbb737fcb5472':
2013-12-11 21:51:27 +00:00
Ying Wang
4b79aa82f3
am 257a01ab: am aec75726: am 69c0db3c: am 41698d48: Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
...
* commit '257a01abcd537ccbb83ad1a4447d55edd5b5bcc7':
2013-12-11 21:51:25 +00:00
Geoff Mendal
17a0d0be92
am f602c1cd: am d2666025: am ae30e4a2: am a7c33da2: Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev Bug: 10447068 Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62 Reviewed-on: https://googleplex-android-review.googlesource.com/348033 Reviewed
...
* commit 'f602c1cdc44bfa988bf8c58239111bed38b5f946':
2013-12-11 21:51:23 +00:00
Ying Wang
0045bfc047
am e9fafe06: am a92bee78: am 5e407ab9: am 2715f4c8: Remove device/ti/panda from klp-dev manifest.
...
* commit 'e9fafe0635fa52b96dfd9d65e8f198e194ae927a':
2013-12-11 21:51:22 +00:00
Bart Sears
8ef22ccf3f
am 00815b7f: am 3d1df184: am 87a25278: am 4f775eb0: Remove obsolete CloudPrint and Print apps
...
* commit '00815b7fd092adf91ffb560a9633775a1a358e06':
2013-12-11 21:51:20 +00:00
Chad Jones
c5352cf4fb
am 3222578f: am fbe73cc4: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit '3222578f330ef0ac57db561522d028ca96be4255':
2013-12-11 21:51:18 +00:00
Marco Nelissen
ae6ea05416
am f2f87150: am d26afc66: am 0cc91f28: Merge branch \'klp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev-plus-aosp
...
* commit 'f2f87150acfefd7fa1717e0353d06c881861c5c8':
2013-12-11 21:51:15 +00:00
Jean-Baptiste Queru
c9c8e8fb53
am 37c2e4be: (-s ours) am 88b7f538: (-s ours) am f982a70e: am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '37c2e4be619d682df88400a1ff9013b72ce70eec':
2013-12-11 21:51:13 +00:00
Jeff Hamilton
18e81837c2
am 5d1940a0: (-s ours) am 0ce6b87c: (-s ours) am 32e8c1c1: am c362d939: DO NOT MERGE Update GMS core client prebuilts to finn.
...
* commit '5d1940a02cc6e97a98be948199a14dbc38537147':
2013-12-11 21:51:12 +00:00
Sascha Haeberling
817e06d72d
am 439a12a1: am b4ccda93: am db650ab2: am 70be1dad: Adding Camera2 and GoogleCamera to klp-dev manifest.
...
* commit '439a12a1a7dbc6e54fceea6715d51d2cfb16c9b3':
2013-12-11 21:51:07 +00:00
Torne (Richard Coles)
2297f91c9e
am 8db74d97: am 326eb3fd: am f1723480: am 8fed2f9d: Remove external/chromium_org/googleurl.
...
* commit '8db74d976a0f5f7c066eb86dfb4e5b0af97d1a73':
2013-12-11 21:51:04 +00:00
Chad Jones
155f6d2453
am eec61592: (-s ours) am 65990655: (-s ours) am d931a35c: am 0cada6b0: fix two small whitespace diff from master - DO NOT MERGE
...
* commit 'eec61592d65b81079cd07eaeb544d9e4a32877e4':
2013-12-11 21:51:00 +00:00
Baligh Uddin
3b1c6d62c2
am 0637c2af: am e5bdf2c2: am 8db93645: am a08fafee: Add overwrites for 3 unbundled projects
...
* commit '0637c2af7ff12546e95b75def08453c579f71698':
2013-12-11 21:50:57 +00:00
The Android Automerger
145b920040
am ac1c5bde: am dd1402f6: am 3aa9630c: am 84a060d5: "updated manifest from master@1aae7da5"
...
* commit 'ac1c5bde5019754e00ae882038ed715a1ba5991e':
2013-12-11 21:50:56 +00:00
Baligh Uddin
e0b9a3d072
am b30c8512: (-s ours) am 245a7db9: (-s ours) am d471df6a: (-s ours) klp-dev-plus-aosp manifest.
...
* commit 'b30c8512138b67e4d5d39d3a1e3f8ab6b3e09b19':
2013-12-11 21:50:54 +00:00
Chad Jones
466617fdf3
am 8a09ef18: am 844f577d: am 8096345a: am af83093a: Add hardware/nvidia/audio
...
* commit '8a09ef180d81ee23e4eeb327bca37c7bbf8be183':
Add hardware/nvidia/audio
2013-12-11 21:24:04 +00:00
Nick Kralevich
508a739497
am 199c987e: am 70912819: (-s ours) am ee1a6492: am a59bc727: am 5cad5c55: Add project platform/external/libseccomp-helper
...
* commit '199c987e4a0e9746362f5b6db7f4ce891e42f5fe':
Add project platform/external/libseccomp-helper
2013-12-11 21:24:04 +00:00
Nick Kralevich
fff96318c1
am adadef75: am b62d378c: (-s ours) am 4f30e288: am e03a41ac: am 7ac3161a: Add external/pcre to default.xml
...
* commit 'adadef75bacfe3c9dfd12a48524d73a7e135d0ee':
Add external/pcre to default.xml
2013-12-11 21:24:04 +00:00
Conley Owens
3267a084d6
am 43187fde: am cc33a062: (-s ours) Merge commit \'f8c615b7\' into klp-dev-plus-aosp
...
* commit '43187fde6e5ed46b75849c1fe70d3bccea3b12c5':
Revert "Rollback: am 303c2559
2013-12-11 21:24:04 +00:00
Chad Jones
95b426edac
am b7dfedcf: (-s ours) am 9eb0ee81: (-s ours) resolved conflicts for merge of c5b0980d withi -s ours to klp-dev-plus-aosp DO NOT MERGE
...
* commit 'b7dfedcfa79b9436274aef5063045da5e68f282f':
Rollback: am 303c2559
2013-12-11 21:24:03 +00:00
Conley Owens
442f2d6251
am dd8e74e8: am 866a07f6: (-s ours) am 28ef94b3: am afb7eb39: am 303c2559: Update master manifest for Android 4.4
...
* commit 'dd8e74e8e0a5821de9056a0d9586d5bff29b9df7':
Update master manifest for Android 4.4
2013-12-11 21:24:03 +00:00
Conley Owens
54054f7d1a
am 2756d3ab: am c0e63fa8: (-s ours) am ec62764b: Merge commit \'5ce20218\' into stage-aosp-master
...
* commit '2756d3abe59547f2ab433bd28035b02b2a57f74d':
Remove ti/panda
2013-12-11 21:24:03 +00:00
Conley Owens
c57b39b032
am 104966ab: am 8b05e3c0: (-s ours) am 10b7627f: am 57e89540: am 591060e5: Remove ti/wlan and ti/wpan
...
* commit '104966ab5b2df8df3f160bb57c3ecae0bc0ead11':
Remove ti/wlan and ti/wpan
2013-12-11 21:24:03 +00:00
Conley Owens
61520bce74
am a0f5b231: am ed8c26da: (-s ours) Merge commit \'0dc7af54\' into klp-dev-plus-aosp
...
* commit 'a0f5b231b1f6568b0a0b20420c732449232a54e3':
Update manifest for Android 4.4
2013-12-11 21:24:03 +00:00
Qiwen Zhao
9df03fdf93
am a6bb6277: am 8cd59ef2: (-s ours) am 81e82624: adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
...
* commit 'a6bb62770c3e530ea402314259bc1764cc82202e':
adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
2013-12-11 21:24:03 +00:00
Geoff Mendal
9c84b5c657
am 6484817e: am 2cc5f546: (-s ours) am 15707d84: am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Mun
...
* commit '6484817e0395c1a6cfd05f40e24805c4c8453780':
2013-12-11 21:24:02 +00:00
Chad Jones
5c2b107381
am 16e326f3: am 6eb24530: (-s ours) resolved conflicts for merge of 55b1a1d7 to klp-dev-plus-aosp
...
* commit '16e326f3ce013d70d081f1127be1a5dfc25fa5c5':
2013-12-11 21:24:02 +00:00
Mindy DelliCarpini
60bd0a1814
am 805587b1: am ecd00750: (-s ours) am 71164a99: Revert "Revert "Add libs/accounts to klp-ub-dev""
...
* commit '805587b131c81f61bebabe4d33706d59c6123a36':
Revert "Revert "Add libs/accounts to klp-ub-dev""
2013-12-11 21:24:02 +00:00
Mindy DelliCarpini
c2d66a8f45
am f2b987dc: am adf762a2: (-s ours) am aef6ad15: Revert "Add libs/accounts to klp-ub-dev"
...
* commit 'f2b987dc6fb3693359409bdd50999e8ca7dc2bd8':
Revert "Add libs/accounts to klp-ub-dev"
Add libs/accounts to klp-ub-dev
2013-12-11 21:24:02 +00:00
Qiwen Zhao
0cb13919ff
am 19c3bcd0: am 31a14629: fix extra art project.
...
* commit '19c3bcd0e50ebd02ee0fb50722f220f82dd5864d':
fix extra art project.
2013-12-11 21:24:02 +00:00
Qiwen Zhao
880e67256d
am 6f9ec211: am abf7bd07: Merge branch \'klp-dev-plus-aosp\' of persistent- https://googleplex-android.googlesource.com/a//platform/manifest into klp-dev-plus-aosp
...
* commit '6f9ec211b6aa6e12dbf61bedbf76eaee68931f3f':
Revert "Revert "Add new kitkat projects to AOSP master manifest""
2013-12-11 21:24:02 +00:00
Qiwen Zhao
807b0efa6d
am 0905dfa7: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit '0905dfa7b5d484ffbf5a247ef29837998dfb9123':
2013-12-11 21:24:01 +00:00
Baligh Uddin
63f141e781
am db66860e: am e0c74d40: am 8ab0302a: (-s ours) resolved conflict for merge of 140fd73e into stage-aosp-master
...
* commit 'db66860eae63d5d543d322e7765f3d016eaf6971':
2013-12-11 21:17:25 +00:00
Geoff Mendal
1dc588fba2
am 0e84a477: am 68ee96fa: resolved conflicts for merge of da8bf313 to klp-dev-plus-aosp
...
* commit '0e84a47758451ddc28c47bb6c4f6a101447ca405':
2013-12-11 21:17:23 +00:00
Qiwen Zhao
c8e3b1a7b4
am 3d1f422a: am 0410e007: am 5feea2f0: am 1b694820: (-s ours) fixing missing closure
...
* commit '3d1f422a3b4bb0a627997890d832daf753cf71cc':
2013-12-11 21:17:22 +00:00
Conley Owens
b9a0f9fe09
am 2a7206fa: am a7988355: am becb9783: am bdac56f5: (-s ours) Restore default revision in mirror manifest
...
* commit '2a7206fa9d05ae256a09f97583152e4dfba9f905':
2013-12-11 21:17:20 +00:00
Kenny Root
4b8d8e563a
am 47a635a9: am 712d0e5d: am 154a20c5: am 616b4d03: (-s ours) Add bouncycastle to the pdk group
...
* commit '47a635a9ad9f2982222488dfc86611086e31bb15':
2013-12-11 21:17:19 +00:00
Ben Cheng
30d37a14dd
am 3804d9b1: am cb557d85: am 8d20a14d: am 1a368cb0: (-s ours) Add various gcc-4.8 projects.
...
* commit '3804d9b11371d49da7830a509d11ccc29c801e9c':
2013-12-11 21:17:16 +00:00
Conley Owens
5a9bd54dd8
am bcd7e631: am 41b6083b: am 73f58baa: am fcfe1e98: (-s ours) Remove the hardware/msm7k project
...
* commit 'bcd7e6311a778f9875ce2e181984ed5ced8666c2':
2013-12-11 21:17:15 +00:00
Christopher Ferris
36ee807960
am fc768679: am 06157719: am db791284: am 50c7e543: (-s ours) Remove the pdk group for libunwind.
...
* commit 'fc76867991730075275ad16c8d3365e4c1ff2c70':
2013-12-11 21:17:13 +00:00
Geoff Mendal
79351feb4d
am d548d71f: am fa37d433: am a431a99e: am 61f86fa3: (-s ours) Add platform/external/conscrypt to master
...
* commit 'd548d71f23a1f43824e29296e7a51faf1d9f5461':
2013-12-11 21:17:11 +00:00
Christopher Ferris
16f7f18de5
am c374e7d4: am 44a00c68: am cd32ec59: am b199a962: (-s ours) Add external/libunwind to manifest.
...
* commit 'c374e7d45de049215c407f11827498f46e9795e4':
2013-12-11 21:17:10 +00:00
Baligh Uddin
68ca33c308
am cfba9d1e: am 9f9ad299: am b2969010: am c5830705: (-s ours) Add tools/studio/translation to AOSP master manifest
...
* commit 'cfba9d1ef48048cf353dab80a5a3afb2e3a686b8':
2013-12-11 21:17:08 +00:00
The Android Open Source Project
1f400699f7
am cdf4d433: am 6a22fd17: am c6ecdcd2: am 1c546d57: (-s ours) Remove obsolete ping/ping6
...
* commit 'cdf4d43375b5a1991f23318a240fa28665048557':
2013-12-11 21:17:06 +00:00
The Android Open Source Project
a777d16758
am 2aac4ec2: am 17a974c7: am f19f68f8: am b0ff0cc0: (-s ours) Updated master manifest after jb-mr2-dev
...
* commit '2aac4ec2522d44dc7454f8873a5f6d220d915d20':
2013-12-11 21:17:05 +00:00
The Android Open Source Project
3c1d5d6180
am 0e52dd03: am 5b4a72b3: am d7bacd23: am 83b76775: (-s ours) Add x86_64 toolchains
...
* commit '0e52dd03f84064e66443099e42cf21844bb4e303':
2013-12-11 21:17:03 +00:00
The Android Open Source Project
484959951c
am aa25e57c: am df09218c: am cf955af0: am 022658e6: (-s ours) Add new projects - iputils, studio/cloud
...
* commit 'aa25e57ce9dcb7ec57331909e6c03e8f991e933a':
2013-12-11 21:17:00 +00:00
The Android Open Source Project
ad242fd10c
am 1b7a567b: am 051c7711: am 2cbfc6f3: am 1fed5706: (-s ours) New projects for telephony and prebuilt python
...
* commit '1b7a567bf8518a53633d8d8e5fbfc61b10da0dca':
2013-12-11 21:16:59 +00:00
The Android Open Source Project
5b924231fc
am b425e2f8: am 3c848e58: am f430be7f: am 27ce518b: (-s ours) Add scrypt and prebuilt clang projects
...
* commit 'b425e2f84a4a5f0974ab725fe74725942e616b70':
2013-12-11 21:16:58 +00:00
Baligh Uddin
d6997a61b6
am db66860e: am e0c74d40: am 8ab0302a: (-s ours) resolved conflict for merge of 140fd73e into stage-aosp-master
...
* commit 'db66860eae63d5d543d322e7765f3d016eaf6971':
2013-12-11 21:16:57 +00:00
Geoff Mendal
87878bb54d
am 0e84a477: am 68ee96fa: resolved conflicts for merge of da8bf313 to klp-dev-plus-aosp
...
* commit '0e84a47758451ddc28c47bb6c4f6a101447ca405':
2013-12-11 21:16:56 +00:00
Qiwen Zhao
5350904316
am 3d1f422a: am 0410e007: am 5feea2f0: am 1b694820: (-s ours) fixing missing closure
...
* commit '3d1f422a3b4bb0a627997890d832daf753cf71cc':
2013-12-11 21:16:56 +00:00
Conley Owens
93997a8577
am 2a7206fa: am a7988355: am becb9783: am bdac56f5: (-s ours) Restore default revision in mirror manifest
...
* commit '2a7206fa9d05ae256a09f97583152e4dfba9f905':
2013-12-11 21:16:56 +00:00
Kenny Root
e86c7cee44
am 47a635a9: am 712d0e5d: am 154a20c5: am 616b4d03: (-s ours) Add bouncycastle to the pdk group
...
* commit '47a635a9ad9f2982222488dfc86611086e31bb15':
2013-12-11 21:16:56 +00:00
Ben Cheng
7fe17280a2
am 3804d9b1: am cb557d85: am 8d20a14d: am 1a368cb0: (-s ours) Add various gcc-4.8 projects.
...
* commit '3804d9b11371d49da7830a509d11ccc29c801e9c':
2013-12-11 21:16:56 +00:00
Conley Owens
34491db9fa
am bcd7e631: am 41b6083b: am 73f58baa: am fcfe1e98: (-s ours) Remove the hardware/msm7k project
...
* commit 'bcd7e6311a778f9875ce2e181984ed5ced8666c2':
2013-12-11 21:16:56 +00:00
Christopher Ferris
36877bcc3d
am fc768679: am 06157719: am db791284: am 50c7e543: (-s ours) Remove the pdk group for libunwind.
...
* commit 'fc76867991730075275ad16c8d3365e4c1ff2c70':
2013-12-11 21:16:56 +00:00
Geoff Mendal
2b92cef84b
am d548d71f: am fa37d433: am a431a99e: am 61f86fa3: (-s ours) Add platform/external/conscrypt to master
...
* commit 'd548d71f23a1f43824e29296e7a51faf1d9f5461':
2013-12-11 21:16:56 +00:00
Christopher Ferris
3b5489e95c
am c374e7d4: am 44a00c68: am cd32ec59: am b199a962: (-s ours) Add external/libunwind to manifest.
...
* commit 'c374e7d45de049215c407f11827498f46e9795e4':
2013-12-11 21:16:56 +00:00
Baligh Uddin
615e015750
am cfba9d1e: am 9f9ad299: am b2969010: am c5830705: (-s ours) Add tools/studio/translation to AOSP master manifest
...
* commit 'cfba9d1ef48048cf353dab80a5a3afb2e3a686b8':
2013-12-11 21:16:56 +00:00
The Android Open Source Project
9a34eb0491
am cdf4d433: am 6a22fd17: am c6ecdcd2: am 1c546d57: (-s ours) Remove obsolete ping/ping6
...
* commit 'cdf4d43375b5a1991f23318a240fa28665048557':
2013-12-11 21:16:56 +00:00
The Android Open Source Project
943f28ea5b
am 2aac4ec2: am 17a974c7: am f19f68f8: am b0ff0cc0: (-s ours) Updated master manifest after jb-mr2-dev
...
* commit '2aac4ec2522d44dc7454f8873a5f6d220d915d20':
2013-12-11 21:16:56 +00:00
The Android Open Source Project
13d607713d
am 0e52dd03: am 5b4a72b3: am d7bacd23: am 83b76775: (-s ours) Add x86_64 toolchains
...
* commit '0e52dd03f84064e66443099e42cf21844bb4e303':
2013-12-11 21:16:56 +00:00
The Android Open Source Project
014c595b36
am aa25e57c: am df09218c: am cf955af0: am 022658e6: (-s ours) Add new projects - iputils, studio/cloud
...
* commit 'aa25e57ce9dcb7ec57331909e6c03e8f991e933a':
2013-12-11 21:16:56 +00:00
The Android Open Source Project
5fe134c4d1
am 1b7a567b: am 051c7711: am 2cbfc6f3: am 1fed5706: (-s ours) New projects for telephony and prebuilt python
...
* commit '1b7a567bf8518a53633d8d8e5fbfc61b10da0dca':
2013-12-11 21:16:56 +00:00
The Android Open Source Project
5ec69eb1a0
am cf228376: am 0c56fc27: am f95384df: am 659b6584: (-s ours) Un-branch master-dalvik from master
...
* commit 'cf22837601167eec617838190844b619fabb2ec3':
2013-12-11 21:16:56 +00:00
The Android Open Source Project
977d19810a
am b425e2f8: am 3c848e58: am f430be7f: am 27ce518b: (-s ours) Add scrypt and prebuilt clang projects
...
* commit 'b425e2f84a4a5f0974ab725fe74725942e616b70':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
ab747236d6
am cf228376: am 0c56fc27: am f95384df: am 659b6584: (-s ours) Un-branch master-dalvik from master
...
* commit 'cf22837601167eec617838190844b619fabb2ec3':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
cdd671c797
am 68cc7f7d: am d7176021: am f1dd3f4b: am ced9b333: (-s ours) Add idea projects
...
* commit '68cc7f7d2f3fe5fa1d20642058f8d4f960229f61':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
435faced98
am 0dedb7f5: am 4c7d2fb4: am 2cfb0046: am 70c902cf: (-s ours) Add device/ and hardware/ for 4.2.2
...
* commit '0dedb7f50f76cd67e4462cc1dec3cb219ab7223d':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
7698e6673f
am 0d435dbb: am 2ab1f392: am 3f69a246: am d56f7074: (-s ours) Update master manifest to match jb-mr1.1-dev
...
* commit '0d435dbb81765c6bd9243a80bc2f441672e94d92':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
1c0edacb0b
am 2e81de19: am ec9e2556: am 7e5125e9: am c8a40b6b: (-s ours) Add tools groups on prebuilts/tools
...
* commit '2e81de19a5785169641d37ec56733748d5476ce4':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
7405d79a73
am f9d9be52: am 036c1e13: am 35d5de31: am bc65e60b: (-s ours) Add mockito and objenesis
...
* commit 'f9d9be526413969e69c57f42d4f15893116ac7fe':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
1f4d910945
am a077bced: am 4b9c6ea0: am d563abdb: am e046a83b: (-s ours) Add nist-pkits
...
* commit 'a077bcedbf2cf5f152ed007d4e764f1d764a4566':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
676113dda0
am d4c32701: am 8aabba8e: am 32798ec4: am e4b6c172: (-s ours) New location for fat32lib
...
* commit 'd4c32701565f7be4f6502e33de4d8f110d7b358b':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
7de89a6bc2
am dad03df5: am bf3ed28d: am 1b9e9b6a: am 6747c5e5: (-s ours) Add prebuilts/devtools
...
* commit 'dad03df55fe4a7a6c187e59b1eb6243303026d36':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
b50ee2b0cb
am a6018286: am 3dc6d2ac: am 4ae4a279: am 70b1a769: (-s ours) Modernize the manifest groups
...
* commit 'a6018286fab52578d80a6a7af8f82554faec0a9f':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
2d5b2f20a4
am 0ccd077f: am 92bb766b: am 1de131b4: am b05bfe82: (-s ours) Add new devtools projects
...
* commit '0ccd077f4a51b365f190f86baf14e6b7352093ed':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
d110e9ff53
am 68cc7f7d: am d7176021: am f1dd3f4b: am ced9b333: (-s ours) Add idea projects
...
* commit '68cc7f7d2f3fe5fa1d20642058f8d4f960229f61':
2013-12-11 21:16:55 +00:00
The Android Open Source Project
6eebb1c3e3
am 390a0c8c: am f5d39be9: am 7dc15a68: am b1bab4dc: (-s ours) Add new devtools projects
...
* commit '390a0c8c20a347472aa5d2e2becec2f270d4727a':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
7194e81e27
am 53fb7c94: am a10e4fb7: am 9b7609af: am a1123ee5: (-s ours) Tune tools groups
...
* commit '53fb7c949d7b73afa4bbc7c22505e58f6fea1de2':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
6bde3605b7
am e2b4d7de: am ba5ca2c1: am 5bc34e05: am 596d9d99: (-s ours) Add tools/base
...
* commit 'e2b4d7de4cbc7f4a9ebec398d595ed1a6edf8dcb':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
a685e7719c
am 00286c51: am 696f8b91: am 39268f30: am 50138b5a: (-s ours) Add darwin host headers
...
* commit '00286c51a4d7ae48e8fd687d4d4a4d3ed459e5d8':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
20e0d5692b
am b046a61c: am 57f35f87: am 78689a99: am 0cc40d32: (-s ours) Add eigen
...
* commit 'b046a61c0f41453ce67f2f5f0db776b21b205bb4':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
253c10654c
am 87117d5b: am 559db065: am 7bb66485: am aefb1473: (-s ours) Extra projects to match release branch
...
* commit '87117d5b7059f2f7cec6be57ec80d5916bc5f684':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
e797c943b8
am 04dd71a2: am 447c58c3: am 466aa85a: am cb5004d3: (-s ours) Manifest for master, updated for 4.2
...
* commit '04dd71a2159513b7bcbaf3e43c35cc834e759271':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
4cdcb7343a
am 4022f0d4: am d1727ef8: am 0d623d92: am fe20f3cb: (-s ours) Add MacOS host toolchain
...
* commit '4022f0d40145d265d227cb86c260300e7d267187':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
372dd0b426
am 688a804d: am f6ab7789: am 7b7ea8e4: am dfefa4af: (-s ours) Add frameworks/volley
...
* commit '688a804d1d006df9aa4e738ff337588fb0079240':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
ea26dabc43
am e6354f4a: am 0d7f7744: am 3c8e7a0c: am f1b2e439: (-s ours) Add projects for gcc 4.7 prebuilts
...
* commit 'e6354f4a56afa944bff57fb12c80607992eb0186':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
c6a1308a84
am 7181c531: am 69e0afa6: am 25ff5bed: am d1848bab: (-s ours) Add harfbuzz_ng
...
* commit '7181c5314e6b7d4a55024ee78198cd8914ff5f9b':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
6b201806dd
am 94d5e561: am 80e64894: am 56d41062: am db11c6ad: (-s ours) Base manifest for 4.2 GPL components
...
* commit '94d5e56137d00a54beffbbddc5e90a1ca5a806d7':
2013-12-11 21:16:54 +00:00
The Android Open Source Project
21667be378
am 287199e2: am eedb4243: am ced6d2be: am f46b8df3: (-s ours) Replace torospr with toroplus
...
* commit '287199e2970652810482a277fa4d3329d7c38d6a':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
49eccf44b2
am 9e18e8bd: am 2ebe35f8: am 9932f838: am a89ea088: (-s ours) Add hardware/akm
...
* commit '9e18e8bdc183dc086357bae10dea8cb7813f524d':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
e5dee57a5a
am a7b38fb4: am 674dfb62: am 9355cbb0: am 08dca174: (-s ours) Add optional eclipse-related prebuilts
...
* commit 'a7b38fb4458acdeb5eca7c4acf642f0522c84e27':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
ddbeaa234f
am aa074961: am 6f7a5241: am 43510b65: am a07bad60: (-s ours) Unmap MIPS 4.4 toolchains
...
* commit 'aa0749614a3d6e0c6894bd5730b5b2838688b8f3':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
4bfb884ad6
am 84a4968a: am e77d642b: am a6f33a29: am 4cf09a29: (-s ours) Add fat32lib
...
* commit '84a4968a4f3feb86235681bc92c2c1933c2238fd':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
153b6be2eb
am 49a615ad: am efcd6aa7: am 94d88cb5: am 7d0d8f01: (-s ours) Add device/sony/lt26
...
* commit '49a615ad4a1fbfdcd8ce631e100be5c4984891aa':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
40337272ea
am e26071e3: am 66cac91d: am 0168606d: am 73ce405e: (-s ours) give tools/build its own group
...
* commit 'e26071e32ebb0611684c560a44834c36d736bb6d':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
09e729abdb
am 200be509: am 160b9754: am 47d364a2: am d479f201: (-s ours) Update projects
...
* commit '200be509f4179047101850a99cc4000d6c01ae1a':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
1f816c5467
am 7295a986: am a294c8d5: am cf7089aa: am 25a5770c: (-s ours) Add manifest groups.
...
* commit '7295a986e24da1c3aea57a67e2e64defe570e349':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
1efb56017d
am e8b7f958: am 4c6c43b5: am 8d0d5e9f: am ce42277e: (-s ours) Add motodev
...
* commit 'e8b7f958c1853d65a5e5ef407cd87bd4798ed59d':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
0571f94ca4
am f76f95a3: am 4a50d676: am 948c7a54: am 6f056451: (-s ours) Update manifest for Jelly Bean
...
* commit 'f76f95a372459af95f883075e4d4ade03b926279':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
96b762ba8c
am 2fb93eac: am da145320: am bf185341: am 39541968: (-s ours) Add aac and gcc-demangle
...
* commit '2fb93eaca75a250a754abd4c8b46eaee38c96a98':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
f167585723
am 0dedb7f5: am 4c7d2fb4: am 2cfb0046: am 70c902cf: (-s ours) Add device/ and hardware/ for 4.2.2
...
* commit '0dedb7f50f76cd67e4462cc1dec3cb219ab7223d':
2013-12-11 21:16:53 +00:00
The Android Open Source Project
bae5b8d171
am 67f034ba: am b0abef19: am 7aeb0f60: am 0cd29e3a: (-s ours) Switch to snapshots for dalvik and libcore
...
* commit '67f034ba19612a88636a0df9f692b2f6fca5ee19':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
69140084bb
am e06c734e: am dd519999: am 9e0719b5: am b5a0d13b: (-s ours) Add chromium-trace
...
* commit 'e06c734e7884ef21d762d730477dbc3079f8a16d':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
dbb4b56b80
am df1bc916: am 32626ab6: am 885c3e99: am 00ece54b: (-s ours) Remove i686-android-linux-4.4.3 toolchain
...
* commit 'df1bc9166a6847bd996c4b1d2c2efc6d63af0479':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
91b1fb9462
am 3f336a64: am 1225400c: am 32713903: am 8c701771: (-s ours) Add ant-glob
...
* commit '3f336a64b923f278b7ce6ea10df14f1b3602e1ab':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
4087c5e930
am 3fd7d29e: am ada49e76: am f6a79b9e: am 03fc9565: (-s ours) Add prebuilts/misc
...
* commit '3fd7d29e55f3562dac78dd18512f5932ca079050':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
640ea86150
am 015d4ff5: am f138c5b0: am 1415d76b: am 8f95dff3: (-s ours) Switch to the proper location of IA 4.6 toolchain
...
* commit '015d4ff5b8d8e78b1fb53480736f307ccc9a3dbb':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
c6da6ddc97
am d6c261d4: am a3996d8e: am cdc2a45d: am e56e10bf: (-s ours) Add 4.6 toolchains
...
* commit 'd6c261d42fe4c6ab5f75a4f59912b3323d61a0eb':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
1a2a9222fd
am 7a4329a2: am a4c453fb: am 29bd36b6: am 527678f0: (-s ours) Add new toolchains
...
* commit '7a4329a25c08fe66c11e9baf7c4fa7893251fc71':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
694ef99cbe
am 93a83ad7: am 8d1525ff: am 3444267d: am 23f0e783: (-s ours) Add prebuilts/eclipse
...
* commit '93a83ad7b505c6df18afcac97c54bb2543481de6':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
09f531ba6e
am 1ad60f2a: am 80c7b5a8: am 912bc11c: am 9a452a71: (-s ours) Add MIPS toolchains
...
* commit '1ad60f2af048dcef7555936770f141a3a141d7bd':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
4a3c68a425
am e37a3d28: am 2eb7ecfb: am f0e84e13: am 1dd8491e: (-s ours) Add checkpolicy
...
* commit 'e37a3d2887adbc7d84abef7ad6c2edcb93d350b5':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
818fa61748
am a91952ed: am 1f8827fd: am 427f4b3a: am 12c5c7e4: (-s ours) Add basebuilder
...
* commit 'a91952ed94b155d5e11ae8dada4421b193ca495b':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
b8057f50d5
am 0d435dbb: am 2ab1f392: am 3f69a246: am d56f7074: (-s ours) Update master manifest to match jb-mr1.1-dev
...
* commit '0d435dbb81765c6bd9243a80bc2f441672e94d92':
2013-12-11 21:16:52 +00:00
The Android Open Source Project
7e8ef2a3f1
am 91b465b4: am 5ae3b20a: am edd311d4: am dd6bc4ec: (-s ours) Merge from ics-mr1, add torospr
...
* commit '91b465b4c3b1f95085afe5ac92714fc6811b80c3':
2013-12-11 21:16:51 +00:00
The Android Open Source Project
a4616226f3
am a27e8518: am f1bf92f4: am 53c25207: am 2ba9cf74: (-s ours) Add clat and gcc 4.6 host prebuilts
...
* commit 'a27e85184d8a7c626ab2dd76f377f1b8f6c80e81':
2013-12-11 21:16:51 +00:00
The Android Open Source Project
6e9fc1f0c8
am 45fbb855: am 97c33f8a: am 364f7919: am 422710ca: (-s ours) Add windowbuilder
...
* commit '45fbb8553018f4d5657605a61d24ec1a8ad694af':
2013-12-11 21:16:51 +00:00
The Android Open Source Project
9660ec0029
am e4fcf9c5: am acc3b756: am 4d85d5e7: am e8fe688b: (-s ours) add ti/wpan
...
* commit 'e4fcf9c5bc3eadf16e1b135efbecff37f8f2275e':
2013-12-11 21:16:51 +00:00
Ed Heyl
c494017031
am acafdef7: am a1b6c45b: am b8e07536: am 4178b4e7: Pull in Launcher3 (for aosp), remove GoogleLauncher2.
...
* commit 'acafdef7733340ffde411cc50c97340096ff72ab':
2013-12-11 21:16:51 +00:00
Torne (Richard Coles)
a1a2dd5b82
am 14290ae3: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit '14290ae32e81ac7da31f276a8b0c4df00e604ddc':
2013-12-11 21:16:51 +00:00
Android Git Automerger
c964b63c41
am 319725fe: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit '319725feb868900e1d798692c583a44e668c9517':
2013-12-11 21:16:51 +00:00
Chad Jones
1f22e936fa
am cbb228e3: am 3410be15: am 49099283: am bba03e82: Add vendor/nvidia/build
...
* commit 'cbb228e387ce0ec47cf7fe47c6c2cc4b1427c0b6':
2013-12-11 21:16:51 +00:00
Kenny Root
13cbc545b6
am 6159bddf: am 2092d4a0: am a44e9d79: am 231cbfdb: Add external/conscrypt to manifest
...
* commit '6159bddf1d60e8b94636267536af158e5e1cb668':
2013-12-11 21:16:51 +00:00
Geoff Mendal
04d12abae3
am 56e7d8bf: am 47087fae: resolved conflicts for merge of ed3ae1a9 to klp-dev-plus-aosp
...
* commit '56e7d8bfdfc2f7cb1aae8404ae32947a807e4314':
2013-12-11 21:16:51 +00:00
Geoff Mendal
4fdeed368e
am 88cada23: am 5147301d: am a6497bf5: Add volantis projects for klp-dev
...
* commit '88cada23cbc8d72bbda08e94019c7a37c269f04b':
2013-12-11 21:16:50 +00:00
keunyoung
f5a15f52f4
am 44b759a6: am 4ef9372d: am 55d6bc31: add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
...
* commit '44b759a6482b8461c4de335af4ae5538be984304':
2013-12-11 21:16:50 +00:00
keunyoung
6ef7475dc1
am 7222df21: am 0e464569: am 31bdea88: remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
...
* commit '7222df21459613ce6e5075182a1be06f69cab0fd':
2013-12-11 21:16:50 +00:00
Ying Wang
b0215539d2
am ed0e42ee: am 85c505f7: am 71941e59: Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
...
* commit 'ed0e42ee2891d9039f17b371cf72076e41c77d40':
2013-12-11 21:16:50 +00:00
Ying Wang
2b66f4c279
am 5d7999f8: am d9bca403: am 2bef1b2e: Add back \'groups="vendor"\'
...
* commit '5d7999f84727e360b1a3d86c1d0da1661f84d87f':
2013-12-11 21:16:50 +00:00
Geoff Mendal
a323ed67f5
am 3d27e599: am cfbccb94: am fb7e4a7b: Remove vendor/unbundled_google/packages/CastMirroring, repo not needed Bug: 10726512 Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43 Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752 Reviewed-by: Just
...
* commit '3d27e599f3a6e85abf1057a01cdc9b0954a7efa7':
2013-12-11 21:16:50 +00:00
Jeff Hamilton
02d3c0d28e
am 37bc7306: am a27a21de: am 76eee955: Attempt to fix the build.
...
* commit '37bc73065e9b76fe4d4354687e2bd3f6a1579827':
2013-12-11 21:16:50 +00:00
The Android Open Source Project
5bf048d708
am 2e81de19: am ec9e2556: am 7e5125e9: am c8a40b6b: (-s ours) Add tools groups on prebuilts/tools
...
* commit '2e81de19a5785169641d37ec56733748d5476ce4':
2013-12-11 21:16:50 +00:00
The Android Open Source Project
25445e9088
am f9d9be52: am 036c1e13: am 35d5de31: am bc65e60b: (-s ours) Add mockito and objenesis
...
* commit 'f9d9be526413969e69c57f42d4f15893116ac7fe':
2013-12-11 21:16:49 +00:00
The Android Open Source Project
023d6d7beb
am a077bced: am 4b9c6ea0: am d563abdb: am e046a83b: (-s ours) Add nist-pkits
...
* commit 'a077bcedbf2cf5f152ed007d4e764f1d764a4566':
2013-12-11 21:16:48 +00:00
Ed Heyl
a7b6822bc0
am 9db13dbb: (-s ours) am 11b9fe70: am 36427c52: (-s ours) Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '9db13dbb4815b740b05e53958d2d0701583b315f':
2013-12-11 21:16:46 +00:00
The Android Open Source Project
c11adb4929
am d4c32701: am 8aabba8e: am 32798ec4: am e4b6c172: (-s ours) New location for fat32lib
...
* commit 'd4c32701565f7be4f6502e33de4d8f110d7b358b':
2013-12-11 21:16:46 +00:00
The Android Open Source Project
f94d0e5b70
am dad03df5: am bf3ed28d: am 1b9e9b6a: am 6747c5e5: (-s ours) Add prebuilts/devtools
...
* commit 'dad03df55fe4a7a6c187e59b1eb6243303026d36':
2013-12-11 21:16:45 +00:00
The Android Open Source Project
d2f99a02cb
am a6018286: am 3dc6d2ac: am 4ae4a279: am 70b1a769: (-s ours) Modernize the manifest groups
...
* commit 'a6018286fab52578d80a6a7af8f82554faec0a9f':
2013-12-11 21:16:43 +00:00
The Android Open Source Project
dd5d91c8be
am 0ccd077f: am 92bb766b: am 1de131b4: am b05bfe82: (-s ours) Add new devtools projects
...
* commit '0ccd077f4a51b365f190f86baf14e6b7352093ed':
2013-12-11 21:16:42 +00:00
The Android Open Source Project
f7741920a7
am 390a0c8c: am f5d39be9: am 7dc15a68: am b1bab4dc: (-s ours) Add new devtools projects
...
* commit '390a0c8c20a347472aa5d2e2becec2f270d4727a':
2013-12-11 21:16:40 +00:00
The Android Open Source Project
71a91d81f5
am 53fb7c94: am a10e4fb7: am 9b7609af: am a1123ee5: (-s ours) Tune tools groups
...
* commit '53fb7c949d7b73afa4bbc7c22505e58f6fea1de2':
2013-12-11 21:16:39 +00:00
The Android Open Source Project
3e28aa85e9
am e2b4d7de: am ba5ca2c1: am 5bc34e05: am 596d9d99: (-s ours) Add tools/base
...
* commit 'e2b4d7de4cbc7f4a9ebec398d595ed1a6edf8dcb':
2013-12-11 21:16:37 +00:00
The Android Open Source Project
f2b7eef7db
am 00286c51: am 696f8b91: am 39268f30: am 50138b5a: (-s ours) Add darwin host headers
...
* commit '00286c51a4d7ae48e8fd687d4d4a4d3ed459e5d8':
2013-12-11 21:16:36 +00:00
The Android Open Source Project
eb7bb71f38
am b046a61c: am 57f35f87: am 78689a99: am 0cc40d32: (-s ours) Add eigen
...
* commit 'b046a61c0f41453ce67f2f5f0db776b21b205bb4':
2013-12-11 21:16:34 +00:00
The Android Open Source Project
59706cc229
am 87117d5b: am 559db065: am 7bb66485: am aefb1473: (-s ours) Extra projects to match release branch
...
* commit '87117d5b7059f2f7cec6be57ec80d5916bc5f684':
2013-12-11 21:16:33 +00:00
The Android Open Source Project
48b6168aff
am 04dd71a2: am 447c58c3: am 466aa85a: am cb5004d3: (-s ours) Manifest for master, updated for 4.2
...
* commit '04dd71a2159513b7bcbaf3e43c35cc834e759271':
2013-12-11 21:16:32 +00:00
The Android Open Source Project
a1ea9540c2
am 4022f0d4: am d1727ef8: am 0d623d92: am fe20f3cb: (-s ours) Add MacOS host toolchain
...
* commit '4022f0d40145d265d227cb86c260300e7d267187':
2013-12-11 21:16:30 +00:00
The Android Open Source Project
e0bee8039f
am 688a804d: am f6ab7789: am 7b7ea8e4: am dfefa4af: (-s ours) Add frameworks/volley
...
* commit '688a804d1d006df9aa4e738ff337588fb0079240':
2013-12-11 21:16:29 +00:00
The Android Open Source Project
698bc49c80
am e6354f4a: am 0d7f7744: am 3c8e7a0c: am f1b2e439: (-s ours) Add projects for gcc 4.7 prebuilts
...
* commit 'e6354f4a56afa944bff57fb12c80607992eb0186':
2013-12-11 21:16:27 +00:00
The Android Open Source Project
00afa454a8
am 7181c531: am 69e0afa6: am 25ff5bed: am d1848bab: (-s ours) Add harfbuzz_ng
...
* commit '7181c5314e6b7d4a55024ee78198cd8914ff5f9b':
2013-12-11 21:16:26 +00:00
The Android Open Source Project
6fa2edca99
am 94d5e561: am 80e64894: am 56d41062: am db11c6ad: (-s ours) Base manifest for 4.2 GPL components
...
* commit '94d5e56137d00a54beffbbddc5e90a1ca5a806d7':
2013-12-11 21:16:24 +00:00
The Android Open Source Project
f288d9282e
am 287199e2: am eedb4243: am ced6d2be: am f46b8df3: (-s ours) Replace torospr with toroplus
...
* commit '287199e2970652810482a277fa4d3329d7c38d6a':
2013-12-11 21:16:23 +00:00
The Android Open Source Project
e80bd63c75
am 9e18e8bd: am 2ebe35f8: am 9932f838: am a89ea088: (-s ours) Add hardware/akm
...
* commit '9e18e8bdc183dc086357bae10dea8cb7813f524d':
2013-12-11 21:16:21 +00:00
The Android Open Source Project
999267b417
am a7b38fb4: am 674dfb62: am 9355cbb0: am 08dca174: (-s ours) Add optional eclipse-related prebuilts
...
* commit 'a7b38fb4458acdeb5eca7c4acf642f0522c84e27':
2013-12-11 21:16:20 +00:00
The Android Open Source Project
d0b6c7621d
am aa074961: am 6f7a5241: am 43510b65: am a07bad60: (-s ours) Unmap MIPS 4.4 toolchains
...
* commit 'aa0749614a3d6e0c6894bd5730b5b2838688b8f3':
2013-12-11 21:16:18 +00:00
The Android Open Source Project
e14b5be498
am 84a4968a: am e77d642b: am a6f33a29: am 4cf09a29: (-s ours) Add fat32lib
...
* commit '84a4968a4f3feb86235681bc92c2c1933c2238fd':
2013-12-11 21:16:17 +00:00
The Android Open Source Project
d8068b8a3a
am 49a615ad: am efcd6aa7: am 94d88cb5: am 7d0d8f01: (-s ours) Add device/sony/lt26
...
* commit '49a615ad4a1fbfdcd8ce631e100be5c4984891aa':
2013-12-11 21:16:15 +00:00
The Android Open Source Project
968c6187b8
am e26071e3: am 66cac91d: am 0168606d: am 73ce405e: (-s ours) give tools/build its own group
...
* commit 'e26071e32ebb0611684c560a44834c36d736bb6d':
2013-12-11 21:16:14 +00:00
The Android Open Source Project
6eb7850ac3
am 200be509: am 160b9754: am 47d364a2: am d479f201: (-s ours) Update projects
...
* commit '200be509f4179047101850a99cc4000d6c01ae1a':
2013-12-11 21:16:12 +00:00
The Android Open Source Project
2b3f2d4e54
am 7295a986: am a294c8d5: am cf7089aa: am 25a5770c: (-s ours) Add manifest groups.
...
* commit '7295a986e24da1c3aea57a67e2e64defe570e349':
2013-12-11 21:16:11 +00:00
The Android Open Source Project
2c52f79ff2
am e8b7f958: am 4c6c43b5: am 8d0d5e9f: am ce42277e: (-s ours) Add motodev
...
* commit 'e8b7f958c1853d65a5e5ef407cd87bd4798ed59d':
2013-12-11 21:16:09 +00:00
The Android Open Source Project
478c03b574
am f76f95a3: am 4a50d676: am 948c7a54: am 6f056451: (-s ours) Update manifest for Jelly Bean
...
* commit 'f76f95a372459af95f883075e4d4ade03b926279':
2013-12-11 21:16:08 +00:00
The Android Open Source Project
1c2d5dd93b
am 2fb93eac: am da145320: am bf185341: am 39541968: (-s ours) Add aac and gcc-demangle
...
* commit '2fb93eaca75a250a754abd4c8b46eaee38c96a98':
2013-12-11 21:16:07 +00:00
The Android Open Source Project
bd037fd930
am 67f034ba: am b0abef19: am 7aeb0f60: am 0cd29e3a: (-s ours) Switch to snapshots for dalvik and libcore
...
* commit '67f034ba19612a88636a0df9f692b2f6fca5ee19':
2013-12-11 21:16:05 +00:00
The Android Open Source Project
a6b5350a37
am e06c734e: am dd519999: am 9e0719b5: am b5a0d13b: (-s ours) Add chromium-trace
...
* commit 'e06c734e7884ef21d762d730477dbc3079f8a16d':
2013-12-11 21:16:04 +00:00
The Android Open Source Project
35d6f244c8
am df1bc916: am 32626ab6: am 885c3e99: am 00ece54b: (-s ours) Remove i686-android-linux-4.4.3 toolchain
...
* commit 'df1bc9166a6847bd996c4b1d2c2efc6d63af0479':
2013-12-11 21:16:02 +00:00
The Android Open Source Project
8daee50e28
am 3f336a64: am 1225400c: am 32713903: am 8c701771: (-s ours) Add ant-glob
...
* commit '3f336a64b923f278b7ce6ea10df14f1b3602e1ab':
2013-12-11 21:16:01 +00:00
The Android Open Source Project
d73f172c0c
am 3fd7d29e: am ada49e76: am f6a79b9e: am 03fc9565: (-s ours) Add prebuilts/misc
...
* commit '3fd7d29e55f3562dac78dd18512f5932ca079050':
2013-12-11 21:15:59 +00:00
The Android Open Source Project
6da5ab43c2
am 015d4ff5: am f138c5b0: am 1415d76b: am 8f95dff3: (-s ours) Switch to the proper location of IA 4.6 toolchain
...
* commit '015d4ff5b8d8e78b1fb53480736f307ccc9a3dbb':
2013-12-11 21:15:58 +00:00
The Android Open Source Project
dc1dddb140
am d6c261d4: am a3996d8e: am cdc2a45d: am e56e10bf: (-s ours) Add 4.6 toolchains
...
* commit 'd6c261d42fe4c6ab5f75a4f59912b3323d61a0eb':
2013-12-11 21:15:56 +00:00
The Android Open Source Project
5c83eb7c77
am 7a4329a2: am a4c453fb: am 29bd36b6: am 527678f0: (-s ours) Add new toolchains
...
* commit '7a4329a25c08fe66c11e9baf7c4fa7893251fc71':
2013-12-11 21:15:55 +00:00
The Android Open Source Project
d7d293c6fa
am 93a83ad7: am 8d1525ff: am 3444267d: am 23f0e783: (-s ours) Add prebuilts/eclipse
...
* commit '93a83ad7b505c6df18afcac97c54bb2543481de6':
2013-12-11 21:15:53 +00:00
The Android Open Source Project
734c34acc0
am 1ad60f2a: am 80c7b5a8: am 912bc11c: am 9a452a71: (-s ours) Add MIPS toolchains
...
* commit '1ad60f2af048dcef7555936770f141a3a141d7bd':
2013-12-11 21:15:52 +00:00
The Android Open Source Project
8e414e5cfc
am e37a3d28: am 2eb7ecfb: am f0e84e13: am 1dd8491e: (-s ours) Add checkpolicy
...
* commit 'e37a3d2887adbc7d84abef7ad6c2edcb93d350b5':
2013-12-11 21:15:51 +00:00
The Android Open Source Project
c23be1de80
am a91952ed: am 1f8827fd: am 427f4b3a: am 12c5c7e4: (-s ours) Add basebuilder
...
* commit 'a91952ed94b155d5e11ae8dada4421b193ca495b':
2013-12-11 21:15:49 +00:00
The Android Open Source Project
af0da0a47f
am 91b465b4: am 5ae3b20a: am edd311d4: am dd6bc4ec: (-s ours) Merge from ics-mr1, add torospr
...
* commit '91b465b4c3b1f95085afe5ac92714fc6811b80c3':
2013-12-11 21:15:48 +00:00
The Android Open Source Project
9248c7bd2c
am a27e8518: am f1bf92f4: am 53c25207: am 2ba9cf74: (-s ours) Add clat and gcc 4.6 host prebuilts
...
* commit 'a27e85184d8a7c626ab2dd76f377f1b8f6c80e81':
2013-12-11 21:15:46 +00:00
The Android Open Source Project
5a8e6bfa4e
am 45fbb855: am 97c33f8a: am 364f7919: am 422710ca: (-s ours) Add windowbuilder
...
* commit '45fbb8553018f4d5657605a61d24ec1a8ad694af':
2013-12-11 21:15:45 +00:00
The Android Open Source Project
30fa341f2d
am e4fcf9c5: am acc3b756: am 4d85d5e7: am e8fe688b: (-s ours) add ti/wpan
...
* commit 'e4fcf9c5bc3eadf16e1b135efbecff37f8f2275e':
2013-12-11 21:15:43 +00:00
Ed Heyl
b3b9a7f91c
am acafdef7: am a1b6c45b: am b8e07536: am 4178b4e7: Pull in Launcher3 (for aosp), remove GoogleLauncher2.
...
* commit 'acafdef7733340ffde411cc50c97340096ff72ab':
2013-12-11 21:15:42 +00:00
Torne (Richard Coles)
6670f9a864
am 14290ae3: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit '14290ae32e81ac7da31f276a8b0c4df00e604ddc':
2013-12-11 21:15:40 +00:00
Android Git Automerger
0d392a43c4
am 319725fe: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit '319725feb868900e1d798692c583a44e668c9517':
2013-12-11 21:15:39 +00:00
Chad Jones
91bd19db2a
am cbb228e3: am 3410be15: am 49099283: am bba03e82: Add vendor/nvidia/build
...
* commit 'cbb228e387ce0ec47cf7fe47c6c2cc4b1427c0b6':
2013-12-11 21:15:37 +00:00
Kenny Root
2b0d875a83
am 6159bddf: am 2092d4a0: am a44e9d79: am 231cbfdb: Add external/conscrypt to manifest
...
* commit '6159bddf1d60e8b94636267536af158e5e1cb668':
2013-12-11 21:15:36 +00:00
Geoff Mendal
89dfea8cd3
am 56e7d8bf: am 47087fae: resolved conflicts for merge of ed3ae1a9 to klp-dev-plus-aosp
...
* commit '56e7d8bfdfc2f7cb1aae8404ae32947a807e4314':
2013-12-11 21:15:35 +00:00
Geoff Mendal
6f7c79272b
am 88cada23: am 5147301d: am a6497bf5: Add volantis projects for klp-dev
...
* commit '88cada23cbc8d72bbda08e94019c7a37c269f04b':
2013-12-11 21:15:33 +00:00
Ed Heyl
6e06b656e6
am ac79f366: (-s ours) am f99f4ac7: am ad74957c: remove libvterm and Terminal projects. do not merge
...
* commit 'ac79f366bb7219e0176931be2ad35b72729df1cc':
2013-12-11 21:15:32 +00:00
keunyoung
c8061d1d22
am 44b759a6: am 4ef9372d: am 55d6bc31: add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
...
* commit '44b759a6482b8461c4de335af4ae5538be984304':
2013-12-11 21:15:32 +00:00
keunyoung
6472a0e18f
am 7222df21: am 0e464569: am 31bdea88: remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
...
* commit '7222df21459613ce6e5075182a1be06f69cab0fd':
2013-12-11 21:15:30 +00:00
Ying Wang
1094674a9e
am ed0e42ee: am 85c505f7: am 71941e59: Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
...
* commit 'ed0e42ee2891d9039f17b371cf72076e41c77d40':
2013-12-11 21:15:29 +00:00
Ying Wang
daee54836b
am 5d7999f8: am d9bca403: am 2bef1b2e: Add back \'groups="vendor"\'
...
* commit '5d7999f84727e360b1a3d86c1d0da1661f84d87f':
2013-12-11 21:15:28 +00:00
Geoff Mendal
0cde481670
am 3d27e599: am cfbccb94: am fb7e4a7b: Remove vendor/unbundled_google/packages/CastMirroring, repo not needed Bug: 10726512 Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43 Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752 Reviewed-by: Just
...
* commit '3d27e599f3a6e85abf1057a01cdc9b0954a7efa7':
2013-12-11 21:15:26 +00:00
Jeff Hamilton
2b7b7c2516
am 37bc7306: am a27a21de: am 76eee955: Attempt to fix the build.
...
* commit '37bc73065e9b76fe4d4354687e2bd3f6a1579827':
2013-12-11 21:15:25 +00:00
Maurice Chu
0b331e2f0e
am b3f2c92f: am 5370f1b4: am 6a1860bd: Change klp-dev to point to Gouda branch for PrebuiltGmsCore project.
...
* commit 'b3f2c92f4c808c5f87dc051fbdfd5bb71a30655b':
2013-12-11 21:15:23 +00:00
Ed Heyl
8f7d94e970
am 9db13dbb: (-s ours) am 11b9fe70: am 36427c52: (-s ours) Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '9db13dbb4815b740b05e53958d2d0701583b315f':
2013-12-11 21:15:22 +00:00
Ed Heyl
963e65bbc7
am ac79f366: (-s ours) am f99f4ac7: am ad74957c: remove libvterm and Terminal projects. do not merge
...
* commit 'ac79f366bb7219e0176931be2ad35b72729df1cc':
2013-12-11 21:15:21 +00:00
Chad Jones
b88e193e8f
am 0a370c0e: am 6bb0ec23: am 6dbf0c13: Add device/lge/mako_svelte-kernel to mako_svelte repo group
...
* commit '0a370c0ea24ac66dea59f06023792a8fe433854f':
2013-12-11 21:15:19 +00:00
Geoff Mendal
0fbdb2b3b6
am 2f646e12: am 3692d6a3: am 232f2f8f: Add project platform/vendor/unbundled_google/packages/CastMirroring Bug: 10726512 Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121 Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203 Reviewed-by: Andreas
...
* commit '2f646e12e56fcd15cfdc06ad7f9458e787aa7763':
2013-12-11 21:15:18 +00:00
Geoff Mendal
05b1ee5758
am a1377d90: am c3a8acf7: am 44707b81: Remove AndroidCastReceiver from klp-dev Bug: 10708905 Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001 Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783 Reviewed-by: Chad Jones <chadj@google.com>
...
* commit 'a1377d9088d5ff4c78da162cdbdab5c9455eceb0':
2013-12-11 21:15:16 +00:00
Ed Heyl
2ca99febc7
am 52bfda79: am bf73dbf9: am 5ac9752b: am ba1edc7a: am c756d712: merge manifest and resolve conflicts
...
* commit '52bfda79d499b1f534032189f324ac1062f4b290':
2013-12-11 21:15:15 +00:00
Chad Jones
423077164f
am 5b1b10ae: am a1bab2b2: am 3a8ff655: Add external/sil-fonts
...
* commit '5b1b10aea357577546154ee0d7386ea1d165ae36':
2013-12-11 21:15:13 +00:00
Chad Jones
6bdb4a2b38
am 15a257a2: am fd78dd20: am 3e4dc128: am 71edb48b: am 1788940d: am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit '15a257a28cdb6136af92c3ff1e01d64d061d5e60':
2013-12-11 21:15:12 +00:00
Chad Jones
99cd29ed2d
am 3a1fe09c: am 521e52d4: am c2c657d3: am ecf5c69d: am 1b13b462: am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit '3a1fe09cbf4edad95b963e9dc4ed258754390806':
2013-12-11 21:15:11 +00:00
Chad Jones
6bdf958658
am 551cbc7d: am 28a63dc9: am 4308d90d: am fc60bd6e: am 19ec5e9f: am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit '551cbc7d1a24d53a6b7b86644c13dd5a5ad76b09':
2013-12-11 21:15:09 +00:00
Chad Jones
8b77f05115
am da848226: am 9828c114: am 18a23161: am b65e48c0: am 6706a7ff: resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
...
* commit 'da84822658dc71b554f69cb73533b453b5ecb291':
2013-12-11 21:15:08 +00:00
Chad Jones
50da995129
am e69af563: am 87a260e0: am 92d4609c: am becedbaf: am 59eecc13: Merge branch \'jb-mr2-ub-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
...
* commit 'e69af563247934097daf1744926d374bae89a6eb':
2013-12-11 21:15:06 +00:00
Chad Jones
dff313c637
am bb0c5645: am d8c26f02: am 09294dfd: am b3e2f51c: resolved conflicts for merge of d80e3b00 to jb-mr2-dev-plus-aosp
...
* commit 'bb0c56454a6755526b53b82bec969d8478e6f618':
2013-12-11 21:15:05 +00:00
Chad Jones
604b8c2787
am 73816715: am d1e279c0: am d1ee7c73: am f8628ca7: Merge branch \'jb-mr2-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev-plus-aosp
...
* commit '73816715131eb76b2b519187e0fb92fc40077c20':
2013-12-11 21:15:03 +00:00
Chad Jones
5a22744f61
am 943434d3: am a40641be: am 943004fa: resolved conflicts for merge of 21754470 to klp-dev
...
* commit '943434d3b4023fdc1b9d2d7218dded0acbd0bc95':
2013-12-11 21:15:02 +00:00
Chad Jones
c04da5f940
am ac345069: am ea3fbb05: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into klp-dev-plus-aosp
...
* commit 'ac34506980a5cef5eec7238c5ec2ea28dfba1126':
2013-12-11 21:15:01 +00:00
Chad Jones
00032df677
am 72bc9c0a: am 1bd3daa8: Rollback review URL update
...
* commit '72bc9c0a6d3886ab32cd630de7e2f85355db033a':
2013-12-11 21:14:59 +00:00
Chad Jones
4fd330ccaf
am fdde16ab: am b9447bda: resolved conflicts for merge of 1633a64f to klp-dev-plus-aosp
...
* commit 'fdde16ab681af79b4a26268e9e1e5affd382feec':
2013-12-11 21:14:57 +00:00
Chad Jones
2b3e6ffb54
am fa52959a: (-s ours) am 0b6b7031: am 4d0f0bf0: Add projects for ardbeg - DO NOT MERGE
...
* commit 'fa52959ab12954cd9f7da07d78bec13d45ff366f':
2013-12-11 21:14:56 +00:00
Maurice Chu
c3111f0a2f
am 4be2abbf: am 85d4673e: am cf6835df: Change KLP-dev to point to GMS Core Fontal
...
* commit '4be2abbf378311f63e3b394dd16fb9385c4e2fae':
2013-12-11 21:14:54 +00:00
Chad Jones
9fb9cbb1f5
am f31871d7: am cb370c33: am 828eb2e3: Add external/tinycompress to set pulled in by PDK pushes.
...
* commit 'f31871d7b4bd3bde5313832db69799087476cabb':
2013-12-11 21:14:53 +00:00
keunyoung
34dd7c3a3b
am e56e50ad: am 1c75d9e1: am 6bdaeae6: add vendor/auto/projection_protocol to default manifest
...
* commit 'e56e50adf6f46229e7cd7aa6cb7b0aa3b8a24611':
2013-12-11 21:14:51 +00:00
Geoff Mendal
b2e311754e
am 9f0a2202: am 1d0bc26f: am 53883097: Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev Bug: 10493211 Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50 Reviewed-on: https://googleplex-android-review.googlesource.com/349370 Reviewed-by: Jus
...
* commit '9f0a22024dde1d5b45318772392fa8218e925bd6':
2013-12-11 21:14:50 +00:00
Ying Wang
4b72557194
am aec75726: am 69c0db3c: am 41698d48: Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
...
* commit 'aec75726b6fb4a2e6697dab18429e3a986bd429f':
2013-12-11 21:14:48 +00:00
Geoff Mendal
909cfc29ca
am d2666025: am ae30e4a2: am a7c33da2: Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev Bug: 10447068 Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62 Reviewed-on: https://googleplex-android-review.googlesource.com/348033 Reviewed-by: Bart Sea
...
* commit 'd266602513810571287c3848acea73f5b2dfc779':
2013-12-11 21:14:47 +00:00
Ying Wang
9720df5e34
am a92bee78: am 5e407ab9: am 2715f4c8: Remove device/ti/panda from klp-dev manifest.
...
* commit 'a92bee7814c13ac1aff51aa55400d74fd35fb4b0':
2013-12-11 21:14:46 +00:00
Bart Sears
fd4cacd659
am 3d1df184: am 87a25278: am 4f775eb0: Remove obsolete CloudPrint and Print apps
...
* commit '3d1df1845a0d5faff813d21c37d4fdedda8fab4d':
2013-12-11 21:14:44 +00:00
Chad Jones
ff79f91a53
am fbe73cc4: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit 'fbe73cc4a429a5f6d1484e27084d7c83b7c5daf5':
2013-12-11 21:14:43 +00:00
Marco Nelissen
7f93379220
am d26afc66: am 0cc91f28: Merge branch \'klp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev-plus-aosp
...
* commit 'd26afc66b2285850d2147fc9adbe4b351f0d6876':
2013-12-11 21:14:41 +00:00
Chad Jones
5dc320a194
am 0a370c0e: am 6bb0ec23: am 6dbf0c13: Add device/lge/mako_svelte-kernel to mako_svelte repo group
...
* commit '0a370c0ea24ac66dea59f06023792a8fe433854f':
2013-12-11 21:14:40 +00:00
Jean-Baptiste Queru
5a947c072a
am 88b7f538: (-s ours) am f982a70e: am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '88b7f53809e2ff8d4112fa1f7cb2587e065fe5eb':
2013-12-11 21:14:40 +00:00
Jeff Hamilton
e47046b815
am 0ce6b87c: (-s ours) am 32e8c1c1: am c362d939: DO NOT MERGE Update GMS core client prebuilts to finn.
...
* commit '0ce6b87cf568621df32febefd9cab1a09150b40c':
2013-12-11 21:14:39 +00:00
Geoff Mendal
c6353e1101
am 2f646e12: am 3692d6a3: am 232f2f8f: Add project platform/vendor/unbundled_google/packages/CastMirroring Bug: 10726512 Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121 Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203 Reviewed-by: Andreas
...
* commit '2f646e12e56fcd15cfdc06ad7f9458e787aa7763':
2013-12-11 21:14:38 +00:00
Geoff Mendal
91c3ae3598
am a1377d90: am c3a8acf7: am 44707b81: Remove AndroidCastReceiver from klp-dev Bug: 10708905 Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001 Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783 Reviewed-by: Chad Jones <chadj@google.com>
...
* commit 'a1377d9088d5ff4c78da162cdbdab5c9455eceb0':
2013-12-11 21:14:37 +00:00
Sascha Haeberling
42f8f10604
am b4ccda93: am db650ab2: am 70be1dad: Adding Camera2 and GoogleCamera to klp-dev manifest.
...
* commit 'b4ccda93adc17ef9bfd825429bd640ca739d1c49':
2013-12-11 21:14:37 +00:00
Ed Heyl
537726e882
am 52bfda79: am bf73dbf9: am 5ac9752b: am ba1edc7a: am c756d712: merge manifest and resolve conflicts
...
* commit '52bfda79d499b1f534032189f324ac1062f4b290':
2013-12-11 21:14:36 +00:00
Torne (Richard Coles)
849bff6ed6
am 326eb3fd: am f1723480: am 8fed2f9d: Remove external/chromium_org/googleurl.
...
* commit '326eb3fdd99bd7fb7bbafef02ce33647d607b4ad':
2013-12-11 21:14:36 +00:00
Chad Jones
3da6a47304
am 5b1b10ae: am a1bab2b2: am 3a8ff655: Add external/sil-fonts
...
* commit '5b1b10aea357577546154ee0d7386ea1d165ae36':
2013-12-11 21:14:34 +00:00
Chad Jones
5064bca9b0
am 65990655: (-s ours) am d931a35c: am 0cada6b0: fix two small whitespace diff from master - DO NOT MERGE
...
* commit '65990655f251e137f97c71804130bf118efeb686':
2013-12-11 21:14:34 +00:00
Chad Jones
08da7bbe20
am 15a257a2: am fd78dd20: am 3e4dc128: am 71edb48b: am 1788940d: am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit '15a257a28cdb6136af92c3ff1e01d64d061d5e60':
2013-12-11 21:14:33 +00:00
Baligh Uddin
131a2628a1
am e5bdf2c2: am 8db93645: am a08fafee: Add overwrites for 3 unbundled projects
...
* commit 'e5bdf2c256d3fa6a9681d09b6ae13d210eb678af':
2013-12-11 21:14:33 +00:00
The Android Automerger
1c9c92dc38
am dd1402f6: am 3aa9630c: am 84a060d5: "updated manifest from master@1aae7da5"
...
* commit 'dd1402f6279288893d498afc3e45a929d0cc291a':
2013-12-11 21:14:32 +00:00
Chad Jones
4da725f695
am 3a1fe09c: am 521e52d4: am c2c657d3: am ecf5c69d: am 1b13b462: am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit '3a1fe09cbf4edad95b963e9dc4ed258754390806':
2013-12-11 21:14:31 +00:00
Baligh Uddin
52d714ebf9
am 245a7db9: (-s ours) am d471df6a: (-s ours) klp-dev-plus-aosp manifest.
...
* commit '245a7db93f72825cdffc2d34b24d707f6e9c6ed1':
2013-12-11 21:14:30 +00:00
Chad Jones
d1e6ae35bc
am 551cbc7d: am 28a63dc9: am 4308d90d: am fc60bd6e: am 19ec5e9f: am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit '551cbc7d1a24d53a6b7b86644c13dd5a5ad76b09':
2013-12-11 21:14:29 +00:00
Chad Jones
1d335b4551
am da848226: am 9828c114: am 18a23161: am b65e48c0: am 6706a7ff: resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
...
* commit 'da84822658dc71b554f69cb73533b453b5ecb291':
2013-12-11 21:14:28 +00:00
Chad Jones
4d988ae387
am e69af563: am 87a260e0: am 92d4609c: am becedbaf: am 59eecc13: Merge branch \'jb-mr2-ub-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
...
* commit 'e69af563247934097daf1744926d374bae89a6eb':
2013-12-11 21:14:26 +00:00
Chad Jones
4b178b06f2
am bb0c5645: am d8c26f02: am 09294dfd: am b3e2f51c: resolved conflicts for merge of d80e3b00 to jb-mr2-dev-plus-aosp
...
* commit 'bb0c56454a6755526b53b82bec969d8478e6f618':
2013-12-11 21:14:25 +00:00
Chad Jones
cf35ad30b8
am 73816715: am d1e279c0: am d1ee7c73: am f8628ca7: Merge branch \'jb-mr2-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev-plus-aosp
...
* commit '73816715131eb76b2b519187e0fb92fc40077c20':
2013-12-11 21:14:23 +00:00
Chad Jones
c709b46be2
am 943434d3: am a40641be: am 943004fa: resolved conflicts for merge of 21754470 to klp-dev
...
* commit '943434d3b4023fdc1b9d2d7218dded0acbd0bc95':
2013-12-11 21:14:22 +00:00
Chad Jones
608ed10e1f
am ac345069: am ea3fbb05: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into klp-dev-plus-aosp
...
* commit 'ac34506980a5cef5eec7238c5ec2ea28dfba1126':
2013-12-11 21:14:20 +00:00
Chad Jones
02453d3509
am 72bc9c0a: am 1bd3daa8: Rollback review URL update
...
* commit '72bc9c0a6d3886ab32cd630de7e2f85355db033a':
2013-12-11 21:14:19 +00:00
Chad Jones
85c70ae8f8
am fdde16ab: am b9447bda: resolved conflicts for merge of 1633a64f to klp-dev-plus-aosp
...
* commit 'fdde16ab681af79b4a26268e9e1e5affd382feec':
2013-12-11 21:14:18 +00:00
Chad Jones
99693f9713
am fa52959a: (-s ours) am 0b6b7031: am 4d0f0bf0: Add projects for ardbeg - DO NOT MERGE
...
* commit 'fa52959ab12954cd9f7da07d78bec13d45ff366f':
2013-12-11 21:14:16 +00:00
Maurice Chu
eadc4a4dd6
am 4be2abbf: am 85d4673e: am cf6835df: Change KLP-dev to point to GMS Core Fontal
...
* commit '4be2abbf378311f63e3b394dd16fb9385c4e2fae':
2013-12-11 21:14:15 +00:00
Chad Jones
2bb6f4d897
am f31871d7: am cb370c33: am 828eb2e3: Add external/tinycompress to set pulled in by PDK pushes.
...
* commit 'f31871d7b4bd3bde5313832db69799087476cabb':
2013-12-11 21:14:13 +00:00
keunyoung
969e1bbb82
am e56e50ad: am 1c75d9e1: am 6bdaeae6: add vendor/auto/projection_protocol to default manifest
...
* commit 'e56e50adf6f46229e7cd7aa6cb7b0aa3b8a24611':
2013-12-11 21:14:12 +00:00
Geoff Mendal
e923d30709
am 9f0a2202: am 1d0bc26f: am 53883097: Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev Bug: 10493211 Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50 Reviewed-on: https://googleplex-android-review.googlesource.com/349370 Reviewed-by: Jus
...
* commit '9f0a22024dde1d5b45318772392fa8218e925bd6':
2013-12-11 21:14:10 +00:00
Ying Wang
257a01abcd
am aec75726: am 69c0db3c: am 41698d48: Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
...
* commit 'aec75726b6fb4a2e6697dab18429e3a986bd429f':
2013-12-11 21:14:09 +00:00
Geoff Mendal
f602c1cdc4
am d2666025: am ae30e4a2: am a7c33da2: Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev Bug: 10447068 Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62 Reviewed-on: https://googleplex-android-review.googlesource.com/348033 Reviewed-by: Bart Sea
...
* commit 'd266602513810571287c3848acea73f5b2dfc779':
2013-12-11 21:14:07 +00:00
Ying Wang
e9fafe0635
am a92bee78: am 5e407ab9: am 2715f4c8: Remove device/ti/panda from klp-dev manifest.
...
* commit 'a92bee7814c13ac1aff51aa55400d74fd35fb4b0':
2013-12-11 21:14:04 +00:00
Bart Sears
00815b7fd0
am 3d1df184: am 87a25278: am 4f775eb0: Remove obsolete CloudPrint and Print apps
...
* commit '3d1df1845a0d5faff813d21c37d4fdedda8fab4d':
2013-12-11 21:14:01 +00:00
Chad Jones
3222578f33
am fbe73cc4: Merge branch \'klp-volantis-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
...
* commit 'fbe73cc4a429a5f6d1484e27084d7c83b7c5daf5':
2013-12-11 21:13:58 +00:00
Marco Nelissen
f2f87150ac
am d26afc66: am 0cc91f28: Merge branch \'klp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev-plus-aosp
...
* commit 'd26afc66b2285850d2147fc9adbe4b351f0d6876':
2013-12-11 21:13:55 +00:00
Jean-Baptiste Queru
37c2e4be61
am 88b7f538: (-s ours) am f982a70e: am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '88b7f53809e2ff8d4112fa1f7cb2587e065fe5eb':
2013-12-11 21:13:53 +00:00
Jeff Hamilton
5d1940a02c
am 0ce6b87c: (-s ours) am 32e8c1c1: am c362d939: DO NOT MERGE Update GMS core client prebuilts to finn.
...
* commit '0ce6b87cf568621df32febefd9cab1a09150b40c':
2013-12-11 21:13:50 +00:00
Sascha Haeberling
439a12a1a7
am b4ccda93: am db650ab2: am 70be1dad: Adding Camera2 and GoogleCamera to klp-dev manifest.
...
* commit 'b4ccda93adc17ef9bfd825429bd640ca739d1c49':
2013-12-11 21:13:47 +00:00
Torne (Richard Coles)
8db74d976a
am 326eb3fd: am f1723480: am 8fed2f9d: Remove external/chromium_org/googleurl.
...
* commit '326eb3fdd99bd7fb7bbafef02ce33647d607b4ad':
2013-12-11 21:13:46 +00:00
Chad Jones
eec61592d6
am 65990655: (-s ours) am d931a35c: am 0cada6b0: fix two small whitespace diff from master - DO NOT MERGE
...
* commit '65990655f251e137f97c71804130bf118efeb686':
2013-12-11 21:13:37 +00:00
Baligh Uddin
0637c2af7f
am e5bdf2c2: am 8db93645: am a08fafee: Add overwrites for 3 unbundled projects
...
* commit 'e5bdf2c256d3fa6a9681d09b6ae13d210eb678af':
2013-12-11 21:13:36 +00:00
The Android Automerger
ac1c5bde50
am dd1402f6: am 3aa9630c: am 84a060d5: "updated manifest from master@1aae7da5"
...
* commit 'dd1402f6279288893d498afc3e45a929d0cc291a':
2013-12-11 21:13:34 +00:00
Baligh Uddin
b30c851213
am 245a7db9: (-s ours) am d471df6a: (-s ours) klp-dev-plus-aosp manifest.
...
* commit '245a7db93f72825cdffc2d34b24d707f6e9c6ed1':
2013-12-11 21:13:33 +00:00
Chad Jones
8a09ef180d
am 844f577d: am 8096345a: am af83093a: Add hardware/nvidia/audio
...
* commit '844f577d8fc75f2b36bae7c19efe51020f3afb01':
Add hardware/nvidia/audio
2013-12-11 21:01:33 +00:00
Nick Kralevich
199c987e4a
am 70912819: (-s ours) am ee1a6492: am a59bc727: am 5cad5c55: Add project platform/external/libseccomp-helper
...
* commit '709128193cda041f3d945cb560d5b1aa21ee2ecf':
Add project platform/external/libseccomp-helper
2013-12-11 21:01:19 +00:00
Nick Kralevich
adadef75ba
am b62d378c: (-s ours) am 4f30e288: am e03a41ac: am 7ac3161a: Add external/pcre to default.xml
...
* commit 'b62d378c0b1d875b1b0ac24511b819e54e6eea7f':
Add external/pcre to default.xml
2013-12-11 21:01:19 +00:00
Conley Owens
43187fde6e
am cc33a062: (-s ours) Merge commit \'f8c615b7\' into klp-dev-plus-aosp
...
* commit 'cc33a062f85cf55ba927468deeb96e9d7978f4f2':
Revert "Rollback: am 303c2559
2013-12-11 21:01:19 +00:00
Chad Jones
b7dfedcfa7
am 9eb0ee81: (-s ours) resolved conflicts for merge of c5b0980d withi -s ours to klp-dev-plus-aosp DO NOT MERGE
...
* commit '9eb0ee817e5325b0fae9660d4994761a3f2746a3':
Rollback: am 303c2559
2013-12-11 21:01:19 +00:00
Conley Owens
dd8e74e8e0
am 866a07f6: (-s ours) am 28ef94b3: am afb7eb39: am 303c2559: Update master manifest for Android 4.4
...
* commit '866a07f69af21042a5025f7261257aab136e0612':
Update master manifest for Android 4.4
2013-12-11 21:01:19 +00:00
Conley Owens
2756d3abe5
am c0e63fa8: (-s ours) am ec62764b: Merge commit \'5ce20218\' into stage-aosp-master
...
* commit 'c0e63fa83e1b413157b57b2627213f571b76025b':
Remove ti/panda
2013-12-11 21:01:19 +00:00
Conley Owens
104966ab5b
am 8b05e3c0: (-s ours) am 10b7627f: am 57e89540: am 591060e5: Remove ti/wlan and ti/wpan
...
* commit '8b05e3c08fa3f701e99e936a704f89976a4b6bc5':
Remove ti/wlan and ti/wpan
2013-12-11 21:01:19 +00:00
Conley Owens
a0f5b231b1
am ed8c26da: (-s ours) Merge commit \'0dc7af54\' into klp-dev-plus-aosp
...
* commit 'ed8c26da6132f6d7745289a0629a633a6eeef6ad':
Update manifest for Android 4.4
2013-12-11 21:01:19 +00:00
Qiwen Zhao
a6bb62770c
am 8cd59ef2: (-s ours) am 81e82624: adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
...
* commit '8cd59ef2d6301496f045507868ba4bdd84462ec1':
adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
2013-12-11 21:01:19 +00:00
Geoff Mendal
6484817e03
am 2cc5f546: (-s ours) am 15707d84: am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@
...
* commit '2cc5f546ce22f2fba05e78fb515e4bdf84333b6c':
2013-12-11 21:01:19 +00:00
Chad Jones
16e326f3ce
am 6eb24530: (-s ours) resolved conflicts for merge of 55b1a1d7 to klp-dev-plus-aosp
...
* commit '6eb2453053f8faa0a1978dc24f8558a4f0ee6360':
2013-12-11 21:01:19 +00:00
Mindy DelliCarpini
805587b131
am ecd00750: (-s ours) am 71164a99: Revert "Revert "Add libs/accounts to klp-ub-dev""
...
* commit 'ecd007505f3259911330846ffdcd45aa4e4ecf4d':
Revert "Revert "Add libs/accounts to klp-ub-dev""
2013-12-11 21:01:19 +00:00
Mindy DelliCarpini
f2b987dc6f
am adf762a2: (-s ours) am aef6ad15: Revert "Add libs/accounts to klp-ub-dev"
...
* commit 'adf762a2ab328debcf3d39660124bdef077919dc':
Revert "Add libs/accounts to klp-ub-dev"
Add libs/accounts to klp-ub-dev
2013-12-11 21:01:19 +00:00
Brian Carlstrom
35d1cb57df
am 8cb31d7e: am feb98238: Merge commit \'78c7e5b9\' into default
...
* commit '8cb31d7e735a8888155730b77b535c9e3135ab71':
2013-12-11 20:35:27 +00:00
Brian Carlstrom
8cb31d7e73
am feb98238: Merge commit \'78c7e5b9\' into default
...
* commit 'feb9823820d5ba6fe9d0a9d123a450693dde6126': (89 commits)
Revert "Revert "Add new kitkat projects to AOSP master manifest""
resolved conflicts for merge of aa06c824
2013-12-11 20:33:23 +00:00
Qiwen Zhao
19c3bcd0e5
am 31a14629: fix extra art project.
...
* commit '31a14629a8ab30a0d953439371491c78bed29430':
fix extra art project.
2013-12-11 20:32:26 +00:00
Qiwen Zhao
6f9ec211b6
am abf7bd07: Merge branch \'klp-dev-plus-aosp\' of persistent- https://googleplex-android.googlesource.com/a//platform/manifest into klp-dev-plus-aosp
...
* commit 'abf7bd07d56bcf9cbd9acbfbb72800558b2b0b99':
Revert "Revert "Add new kitkat projects to AOSP master manifest""
2013-12-11 20:32:25 +00:00
Qiwen Zhao
0905dfa7b5
Merge branch 'klp-volantis-dev' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
2013-12-11 20:32:24 +00:00
Brian Carlstrom
feb9823820
Merge commit '78c7e5b9' into default
2013-12-11 12:27:38 -08:00
Narayan Kamath
144f47a03c
am e77ead82: (-s ours) am 650bd412: resolved conflicts for merge of a312d99f to klp-volantis-dev
...
* commit 'e77ead824f31320a95fb9cd566ca78c0ee93998b':
2013-12-11 19:20:25 +00:00
Baligh Uddin
756e41ecf8
am fc8493aa: (-s ours) resolved conflicts for merge of aa06c824 to klp-dev-plus-aosp
...
* commit 'fc8493aa71174fde796ac0216275d71410d89e0d':
resolved conflicts for merge of aa06c824
2013-12-11 19:06:40 +00:00
Baligh Uddin
891e97f589
am 8766b10d: (-s ours) resolved conflicts for merge of aa06c824 to klp-dev-plus-aosp
...
* commit '8766b10d68fe4efb40b71b0e111f689a0297ab59':
Revert "Add new kitkat projects to AOSP master manifest"
2013-12-11 19:06:40 +00:00
Baligh Uddin
db66860eae
am e0c74d40: am 8ab0302a: (-s ours) resolved conflict for merge of 140fd73e into stage-aosp-master
...
* commit 'e0c74d40e410e07b8c5b0b146fe7ffc37a01ae1e':
Add new kitkat projects to AOSP master manifest
2013-12-11 19:03:12 +00:00
Geoff Mendal
0e84a47758
am 68ee96fa: resolved conflicts for merge of da8bf313 to klp-dev-plus-aosp
...
* commit '68ee96fafe24275a5053715baac58868b4a4ba4a':
klp-docs manifest Bug: 11386893
2013-12-11 19:03:12 +00:00
Qiwen Zhao
3d1f422a3b
am 0410e007: am 5feea2f0: am 1b694820: (-s ours) fixing missing closure
...
* commit '0410e007609d7cbf31dc63c2273ec5d59bf2b040':
fixing missing closure
2013-12-11 19:03:12 +00:00
Conley Owens
2a7206fa9d
am a7988355: am becb9783: am bdac56f5: (-s ours) Restore default revision in mirror manifest
...
* commit 'a79883550fa590f640b4397abf5bcc1ac8fced2f':
Restore default revision in mirror manifest
2013-12-11 19:03:12 +00:00
Kenny Root
47a635a9ad
am 712d0e5d: am 154a20c5: am 616b4d03: (-s ours) Add bouncycastle to the pdk group
...
* commit '712d0e5da3c91792d2b3dc6a9a0e5299d2e25b39':
Add bouncycastle to the pdk group
2013-12-11 19:03:12 +00:00
Narayan Kamath
e77ead824f
am 650bd412: resolved conflicts for merge of a312d99f to klp-volantis-dev
...
* commit '650bd412b45482ca9ed2efb710ab06160cca31b3':
Add external/libunwind.
Add external/libunwind.
Add external/conscrypt to manifest
klp-ub-dev manifest Bug: 10933019
Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
Rollback review URL update
2013-12-11 19:03:12 +00:00
Ben Cheng
3804d9b113
am cb557d85: am 8d20a14d: am 1a368cb0: (-s ours) Add various gcc-4.8 projects.
...
* commit 'cb557d85972e340a0ac325c61ae42617955992d9':
Add various gcc-4.8 projects.
2013-12-11 19:03:11 +00:00
Conley Owens
bcd7e6311a
am 41b6083b: am 73f58baa: am fcfe1e98: (-s ours) Remove the hardware/msm7k project
...
* commit '41b6083b36e6e029d55368ff0d4d282b44be8d1f':
Remove the hardware/msm7k project
2013-12-11 19:03:11 +00:00
Christopher Ferris
fc76867991
am 06157719: am db791284: am 50c7e543: (-s ours) Remove the pdk group for libunwind.
...
* commit '06157719b0a33dfb5394a158d32bda4489fd7dae':
Remove the pdk group for libunwind.
2013-12-11 19:03:11 +00:00
Geoff Mendal
d548d71f23
am fa37d433: am a431a99e: am 61f86fa3: (-s ours) Add platform/external/conscrypt to master
...
* commit 'fa37d433e366bd067a6df87cd1d9b6e60d3a689f':
Add platform/external/conscrypt to master
2013-12-11 19:03:11 +00:00
Christopher Ferris
c374e7d45d
am 44a00c68: am cd32ec59: am b199a962: (-s ours) Add external/libunwind to manifest.
...
* commit '44a00c68e3a66bbe190ac836a92dc299a068a0b2':
Add external/libunwind to manifest.
2013-12-11 19:03:11 +00:00
Baligh Uddin
cfba9d1ef4
am 9f9ad299: am b2969010: am c5830705: (-s ours) Add tools/studio/translation to AOSP master manifest
...
* commit '9f9ad29945284340b7ac9d77f7dc03c45c7c5041':
Add tools/studio/translation to AOSP master manifest
2013-12-11 19:03:11 +00:00
The Android Open Source Project
cdf4d43375
am 6a22fd17: am c6ecdcd2: am 1c546d57: (-s ours) Remove obsolete ping/ping6
...
* commit '6a22fd17e1d35fb31af88758d2ebcf7585e8cde2':
Remove obsolete ping/ping6
2013-12-11 19:03:10 +00:00
The Android Open Source Project
2aac4ec252
am 17a974c7: am f19f68f8: am b0ff0cc0: (-s ours) Updated master manifest after jb-mr2-dev
...
* commit '17a974c7bf565791f0632184b388b80a996c32d1':
Add device/ and hardware/ for 4.2.2
2013-12-11 19:03:10 +00:00
The Android Open Source Project
0e52dd03f8
am 5b4a72b3: am d7bacd23: am 83b76775: (-s ours) Add x86_64 toolchains
...
* commit '5b4a72b30ed744ad218679fa9ced07f6e5886b38':
Add x86_64 toolchains
2013-12-11 19:03:10 +00:00
The Android Open Source Project
aa25e57ce9
am df09218c: am cf955af0: am 022658e6: (-s ours) Add new projects - iputils, studio/cloud
...
* commit 'df09218cc92ee2a428951454855dedbbe6a80cdc':
Add new projects - iputils, studio/cloud
2013-12-11 19:03:10 +00:00
The Android Open Source Project
1b7a567bf8
am 051c7711: am 2cbfc6f3: am 1fed5706: (-s ours) New projects for telephony and prebuilt python
...
* commit '051c7711547f2acec72dd064fa2ac4fd7bcad969':
New projects for telephony and prebuilt python
2013-12-11 19:03:09 +00:00
The Android Open Source Project
b425e2f84a
am 3c848e58: am f430be7f: am 27ce518b: (-s ours) Add scrypt and prebuilt clang projects
...
* commit '3c848e5863711d68c306b466e8e119f3bc3d414c':
Add scrypt and prebuilt clang projects
2013-12-11 19:03:09 +00:00
The Android Open Source Project
cf22837601
am 0c56fc27: am f95384df: am 659b6584: (-s ours) Un-branch master-dalvik from master
...
* commit '0c56fc2715c5d49f7f350d727ca155d2f176009a':
2013-12-11 19:03:09 +00:00
The Android Open Source Project
68cc7f7d2f
am d7176021: am f1dd3f4b: am ced9b333: (-s ours) Add idea projects
...
* commit 'd717602117ce9fd79f8467b3424746e5fd7db58e':
Add idea projects
2013-12-11 19:03:09 +00:00
The Android Open Source Project
0dedb7f50f
am 4c7d2fb4: am 2cfb0046: am 70c902cf: (-s ours) Add device/ and hardware/ for 4.2.2
...
* commit '4c7d2fb4dc7f24937fe331a965cac1f48fffe3e8':
Add device/ and hardware/ for 4.2.2
2013-12-11 19:03:09 +00:00
The Android Open Source Project
0d435dbb81
am 2ab1f392: am 3f69a246: am d56f7074: (-s ours) Update master manifest to match jb-mr1.1-dev
...
* commit '2ab1f3925d59ca17210431d6a2a29b542e7fe07b':
Manifest for jb-mr1.1-dev
Extra projects to match release branch
Manifest for jb-mr1-dev
2013-12-11 19:03:09 +00:00
The Android Open Source Project
2e81de19a5
am ec9e2556: am 7e5125e9: am c8a40b6b: (-s ours) Add tools groups on prebuilts/tools
...
* commit 'ec9e25563b9cba87edbd1c5d50a62995e91c32d7':
Add tools groups on prebuilts/tools
2013-12-11 19:03:09 +00:00
The Android Open Source Project
f9d9be5264
am 036c1e13: am 35d5de31: am bc65e60b: (-s ours) Add mockito and objenesis
...
* commit '036c1e13dafa69f2c0c1947f9f1230155ef98aa0':
Add mockito and objenesis
2013-12-11 19:03:08 +00:00
The Android Open Source Project
a077bcedbf
am 4b9c6ea0: am d563abdb: am e046a83b: (-s ours) Add nist-pkits
...
* commit '4b9c6ea05aa08bdf7297cb231b7e8a65fe7ce765':
Add nist-pkits
2013-12-11 19:03:08 +00:00
The Android Open Source Project
d4c3270156
am 8aabba8e: am 32798ec4: am e4b6c172: (-s ours) New location for fat32lib
...
* commit '8aabba8ec5e123687182c4c80f4cc01768126f9b':
New location for fat32lib
2013-12-11 19:03:08 +00:00
The Android Open Source Project
dad03df55f
am bf3ed28d: am 1b9e9b6a: am 6747c5e5: (-s ours) Add prebuilts/devtools
...
* commit 'bf3ed28d78c4ed112a18765cd60c2a3cee3798e6':
Add prebuilts/devtools
2013-12-11 19:03:08 +00:00
The Android Open Source Project
a6018286fa
am 3dc6d2ac: am 4ae4a279: am 70b1a769: (-s ours) Modernize the manifest groups
...
* commit '3dc6d2acda80079f861ee6adea270027dfa33efa':
Modernize the manifest groups
2013-12-11 19:03:08 +00:00
The Android Open Source Project
0ccd077f4a
am 92bb766b: am 1de131b4: am b05bfe82: (-s ours) Add new devtools projects
...
* commit '92bb766b1203c8fbc457a50602d9ff39c569d096':
Add new devtools projects
2013-12-11 19:03:08 +00:00
The Android Open Source Project
390a0c8c20
am f5d39be9: am 7dc15a68: am b1bab4dc: (-s ours) Add new devtools projects
...
* commit 'f5d39be966a62b4d50306dba51f8ef23baf6998c':
Add new devtools projects
2013-12-11 19:03:07 +00:00
The Android Open Source Project
53fb7c949d
am a10e4fb7: am 9b7609af: am a1123ee5: (-s ours) Tune tools groups
...
* commit 'a10e4fb7fad55a3155607605ec61c43dc3b14e55':
Tune tools groups
2013-12-11 19:03:07 +00:00
The Android Open Source Project
e2b4d7de4c
am ba5ca2c1: am 5bc34e05: am 596d9d99: (-s ours) Add tools/base
...
* commit 'ba5ca2c161e8f0f63e2f9befe91d1158a2b79cee':
Add tools/base
2013-12-11 19:03:07 +00:00
The Android Open Source Project
00286c51a4
am 696f8b91: am 39268f30: am 50138b5a: (-s ours) Add darwin host headers
...
* commit '696f8b914b7bdf4abe42d48a24e4b410c9800837':
Add darwin host headers
2013-12-11 19:03:07 +00:00
The Android Open Source Project
b046a61c0f
am 57f35f87: am 78689a99: am 0cc40d32: (-s ours) Add eigen
...
* commit '57f35f87ee693a1ef38284aeb20e90267b0619ab':
Add eigen
2013-12-11 19:03:07 +00:00
The Android Open Source Project
87117d5b70
am 559db065: am 7bb66485: am aefb1473: (-s ours) Extra projects to match release branch
...
* commit '559db0651857cdd3cb775f9bf05560767d542648':
Extra projects to match release branch
2013-12-11 19:03:07 +00:00
The Android Open Source Project
04dd71a215
am 447c58c3: am 466aa85a: am cb5004d3: (-s ours) Manifest for master, updated for 4.2
...
* commit '447c58c32b73669b2fecf72ac9f7b28a54dda50d':
Manifest for master, updated for 4.2
2013-12-11 19:03:06 +00:00
The Android Open Source Project
4022f0d401
am d1727ef8: am 0d623d92: am fe20f3cb: (-s ours) Add MacOS host toolchain
...
* commit 'd1727ef8e624c08b832904ca2323605554249d50':
Add MacOS host toolchain
2013-12-11 19:03:06 +00:00
The Android Open Source Project
688a804d1d
am f6ab7789: am 7b7ea8e4: am dfefa4af: (-s ours) Add frameworks/volley
...
* commit 'f6ab778909aa2c621c8b1324d99bd11fc44b890d':
Add frameworks/volley
2013-12-11 19:03:06 +00:00
The Android Open Source Project
e6354f4a56
am 0d7f7744: am 3c8e7a0c: am f1b2e439: (-s ours) Add projects for gcc 4.7 prebuilts
...
* commit '0d7f774455562bbaeed189beefdb8e09be080d08':
Add projects for gcc 4.7 prebuilts
2013-12-11 19:03:06 +00:00
The Android Open Source Project
7181c5314e
am 69e0afa6: am 25ff5bed: am d1848bab: (-s ours) Add harfbuzz_ng
...
* commit '69e0afa6ef4117c2ebf86ad983a025b0a9e4a826':
Add harfbuzz_ng
2013-12-11 19:03:06 +00:00
The Android Open Source Project
94d5e56137
am 80e64894: am 56d41062: am db11c6ad: (-s ours) Base manifest for 4.2 GPL components
...
* commit '80e64894beca1316b557fb4979d59610ad5ad3a1':
Base manifest for 4.2 GPL components
2013-12-11 19:03:06 +00:00
The Android Open Source Project
287199e297
am eedb4243: am ced6d2be: am f46b8df3: (-s ours) Replace torospr with toroplus
...
* commit 'eedb42436b78b2d289cd0605ba77380e7562b979':
Replace torospr with toroplus
2013-12-11 19:03:06 +00:00
The Android Open Source Project
9e18e8bdc1
am 2ebe35f8: am 9932f838: am a89ea088: (-s ours) Add hardware/akm
...
* commit '2ebe35f833e00a30ba592be1a16f0be14766abd3':
Add hardware/akm
2013-12-11 19:03:05 +00:00
The Android Open Source Project
a7b38fb445
am 674dfb62: am 9355cbb0: am 08dca174: (-s ours) Add optional eclipse-related prebuilts
...
* commit '674dfb622d0243a3f2099ae5526aece05d1e85ea':
Add optional eclipse-related prebuilts
2013-12-11 19:03:05 +00:00
The Android Open Source Project
aa0749614a
am 6f7a5241: am 43510b65: am a07bad60: (-s ours) Unmap MIPS 4.4 toolchains
...
* commit '6f7a5241805bd3ca77a4ce76e0fa5a31b23fa006':
Unmap MIPS 4.4 toolchains
2013-12-11 19:03:05 +00:00
The Android Open Source Project
84a4968a4f
am e77d642b: am a6f33a29: am 4cf09a29: (-s ours) Add fat32lib
...
* commit 'e77d642b67cd07a06c87704eb634c20140f4e690':
Add fat32lib
2013-12-11 19:03:05 +00:00
The Android Open Source Project
49a615ad4a
am efcd6aa7: am 94d88cb5: am 7d0d8f01: (-s ours) Add device/sony/lt26
...
* commit 'efcd6aa7c003a1e4e746fb4f15a41e213df43b3d':
Add device/sony/lt26
2013-12-11 19:03:04 +00:00
The Android Open Source Project
e26071e32e
am 66cac91d: am 0168606d: am 73ce405e: (-s ours) give tools/build its own group
...
* commit '66cac91d8961fee90db71114cd7a169800e28374':
give tools/build its own group
2013-12-11 19:03:04 +00:00
The Android Open Source Project
200be509f4
am 160b9754: am 47d364a2: am d479f201: (-s ours) Update projects
...
* commit '160b9754f7de42dbf5491d136f244c681402de57':
Update projects
2013-12-11 19:03:04 +00:00
The Android Open Source Project
7295a986e2
am a294c8d5: am cf7089aa: am 25a5770c: (-s ours) Add manifest groups.
...
* commit 'a294c8d55441213ecbcd15a868ea5898723ccf62':
Add manifest groups.
2013-12-11 19:03:04 +00:00
The Android Open Source Project
e8b7f958c1
am 4c6c43b5: am 8d0d5e9f: am ce42277e: (-s ours) Add motodev
...
* commit '4c6c43b53161f2b9508ca7b0135f0277d4fab681':
Add motodev
2013-12-11 19:03:03 +00:00
The Android Open Source Project
f76f95a372
am 4a50d676: am 948c7a54: am 6f056451: (-s ours) Update manifest for Jelly Bean
...
* commit '4a50d6766eb03c22c2e4b6ca297d30ab605893d2':
Update manifest for Jelly Bean
2013-12-11 19:03:03 +00:00
The Android Open Source Project
2fb93eaca7
am da145320: am bf185341: am 39541968: (-s ours) Add aac and gcc-demangle
...
* commit 'da145320b69a0787e7d26e723507e77a7f209984':
Add aac and gcc-demangle
2013-12-11 19:03:03 +00:00
The Android Open Source Project
67f034ba19
am b0abef19: am 7aeb0f60: am 0cd29e3a: (-s ours) Switch to snapshots for dalvik and libcore
...
* commit 'b0abef1955927771da82c79338125fa2ef6a534e':
Switch to snapshots for dalvik and libcore
2013-12-11 19:03:03 +00:00
The Android Open Source Project
e06c734e78
am dd519999: am 9e0719b5: am b5a0d13b: (-s ours) Add chromium-trace
...
* commit 'dd519999f306f0315e3d58660f9a27e460776f0e':
Add chromium-trace
2013-12-11 19:03:03 +00:00
The Android Open Source Project
df1bc9166a
am 32626ab6: am 885c3e99: am 00ece54b: (-s ours) Remove i686-android-linux-4.4.3 toolchain
...
* commit '32626ab6a8fdf978772ae6c879d44d4a103108f1':
Remove i686-android-linux-4.4.3 toolchain
2013-12-11 19:03:03 +00:00
The Android Open Source Project
3f336a64b9
am 1225400c: am 32713903: am 8c701771: (-s ours) Add ant-glob
...
* commit '1225400cbc7a7d5c461f5fce054fface402b3a16':
Add ant-glob
2013-12-11 19:03:03 +00:00
The Android Open Source Project
3fd7d29e55
am ada49e76: am f6a79b9e: am 03fc9565: (-s ours) Add prebuilts/misc
...
* commit 'ada49e7608b73b71ebbff55d2fcf4bf8268c8fa3':
Add prebuilts/misc
2013-12-11 19:03:02 +00:00
The Android Open Source Project
015d4ff5b8
am f138c5b0: am 1415d76b: am 8f95dff3: (-s ours) Switch to the proper location of IA 4.6 toolchain
...
* commit 'f138c5b031015dc46db94df613384e087c413bdd':
Switch to the proper location of IA 4.6 toolchain
2013-12-11 19:03:02 +00:00
The Android Open Source Project
d6c261d42f
am a3996d8e: am cdc2a45d: am e56e10bf: (-s ours) Add 4.6 toolchains
...
* commit 'a3996d8eb7798ff9d5ee30c08860d89084430632':
Add 4.6 toolchains
2013-12-11 19:03:02 +00:00
The Android Open Source Project
7a4329a25c
am a4c453fb: am 29bd36b6: am 527678f0: (-s ours) Add new toolchains
...
* commit 'a4c453fb7621dbc2adca307c98dcfaeae5c3ec57':
Add new toolchains
2013-12-11 19:03:02 +00:00
The Android Open Source Project
93a83ad7b5
am 8d1525ff: am 3444267d: am 23f0e783: (-s ours) Add prebuilts/eclipse
...
* commit '8d1525ff8f79fcc94a4d8d13852452926814625f':
Add prebuilts/eclipse
2013-12-11 19:03:02 +00:00
The Android Open Source Project
1ad60f2af0
am 80c7b5a8: am 912bc11c: am 9a452a71: (-s ours) Add MIPS toolchains
...
* commit '80c7b5a8f90db4889d78c997ddaa20032d4d7a34':
Add MIPS toolchains
2013-12-11 19:03:02 +00:00
The Android Open Source Project
e37a3d2887
am 2eb7ecfb: am f0e84e13: am 1dd8491e: (-s ours) Add checkpolicy
...
* commit '2eb7ecfb0f2862f9e700a978d8d0cde3338ba81e':
Add checkpolicy
2013-12-11 19:03:02 +00:00
The Android Open Source Project
a91952ed94
am 1f8827fd: am 427f4b3a: am 12c5c7e4: (-s ours) Add basebuilder
...
* commit '1f8827fd7f09434b71861221aaa9989ade969097':
Add basebuilder
2013-12-11 19:03:02 +00:00
The Android Open Source Project
91b465b4c3
am 5ae3b20a: am edd311d4: am dd6bc4ec: (-s ours) Merge from ics-mr1, add torospr
...
* commit '5ae3b20acd3bed31e2af8dc9586b4d6b5c5db528':
Add torospr
Add replicaisland
Manifest for icr-mr1
2013-12-11 19:03:02 +00:00
The Android Open Source Project
a27e85184d
am f1bf92f4: am 53c25207: am 2ba9cf74: (-s ours) Add clat and gcc 4.6 host prebuilts
...
* commit 'f1bf92f44abb64b96d0c870b6012f2c43dd788ce':
Add clat and gcc 4.6 host prebuilts
2013-12-11 19:03:01 +00:00
The Android Open Source Project
45fbb85530
am 97c33f8a: am 364f7919: am 422710ca: (-s ours) Add windowbuilder
...
* commit '97c33f8a6f7d5b97744babfa0b2e394577e99148':
Add windowbuilder
2013-12-11 19:03:01 +00:00
The Android Open Source Project
e4fcf9c5bc
am acc3b756: am 4d85d5e7: am e8fe688b: (-s ours) add ti/wpan
...
* commit 'acc3b7564766b10a1ca572d8990bdd8b054e0928':
add ti/wpan
Add selinux-related projects
Add replicaisland
Add review URI.
Add new projects to match 4.0.3
Add prebuilts/qemu-kernel and prebuilts/tools
Manifest for post-ICS master
Bases on top of which the GPL components of 3.0 and 3.1 can be built
Base on top of which the GPL components of 3.2 can be built
Add external/qemu-pc-bios
Switch to a relative fetch URI
Restore additional projects.
Set sync default to -j4
Initial manifest for gingerbread
First pass at master manifest
Start from an empty project
2013-12-11 19:03:01 +00:00
Ed Heyl
acafdef773
am a1b6c45b: am b8e07536: am 4178b4e7: Pull in Launcher3 (for aosp), remove GoogleLauncher2.
...
* commit 'a1b6c45b6cda6a1be1db1ca03530e2ae82325562':
2013-12-11 19:03:01 +00:00
Torne (Richard Coles)
14290ae32e
Merge branch 'klp-volantis-dev' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
2013-12-11 19:03:00 +00:00
Narayan Kamath
650bd412b4
resolved conflicts for merge of a312d99f to klp-volantis-dev
2013-12-11 18:57:49 +00:00
Chad Jones
a26c6dcf43
resolved conflicts for merge of 3c9bd93b to master
2013-12-11 10:12:20 -08:00
Android Git Automerger
319725feb8
Merge branch 'klp-volantis-dev' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
2013-12-11 18:12:09 +00:00
Chad Jones
3c9bd93ba0
am b51867ef: resolved conflicts for merge of 8284bfe1 to klp-volantis-dev
...
* commit 'b51867ef909f370dabe8168eee9ebef7cf69ed41':
Update review URL
Add platform/external/sil-fonts
2013-12-11 12:08:53 +00:00
Chad Jones
5585a695d5
am 0f20a2d9: Add hardware/nvidia/audio
...
* commit '0f20a2d9fd51d5765a91dd1e5e1d8e31bbd0e8a2':
Add hardware/nvidia/audio
2013-12-11 06:34:09 +00:00
Chad Jones
0f20a2d9fd
Add hardware/nvidia/audio
...
Change-Id: I867bd0bf25c626bdcdfc1bead4d8eac64ac95b30
Reviewed-on: https://googleplex-android-review.git.corp.google.com/397614
Reviewed-by: Chad Jones <chadj@google.com >
2013-12-11 06:29:37 +00:00
Chad Jones
aff3ed7d0b
resolved conflicts for merge of 0711165e to master
2013-12-10 22:24:07 -08:00
Mike Lockwood
225c889838
am 9dfecac5: am 692aeae1: Add libunwind and libnativehelper to the PDK
...
* commit '9dfecac517f0cef23c99f8d261db425ceaecc8fc':
2013-12-11 05:54:01 +00:00
Colin Cross
940afdcc73
am 5e277f0d: am d99b2584: Add libusb_aah back to manifest
...
* commit '5e277f0dc00b25bd2d8f1c99b644394b1fc85f58':
2013-12-11 05:53:59 +00:00
Qiwen Zhao
ae1064635c
am b1362f3f: am 8134ed1c: (-s ours) update manifest to match klp-dev
...
* commit 'b1362f3f7c1023eb25b9a260951319599a0db4c3':
2013-12-11 05:53:58 +00:00
Geoff Mendal
9442ccdea9
am 0a5d6bb0: am 6b3c69be: am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@
...
* commit '0a5d6bb05f99b31f752d2dbbdfbc9dfe7f6e6b33':
2013-12-11 05:53:57 +00:00
Chad Jones
86d145412a
am c4196e32: am 3d910297: am b2e5b6f7: Drop molly group label from device/google/molly-ubik for now
...
* commit 'c4196e3205a225db45b77a652d07347606304530':
2013-12-11 05:53:55 +00:00
Geoff Mendal
729e930684
am 66470952: am f52a0408: am e49ba474: Add project device/google/molly-ubik Bug: 11594337 Change-Id: Iccb9b46f2d5f7216a37d0f79babb04edeedea2ab Reviewed-on: https://googleplex-android-review.git.corp.google.com/387114 Reviewed-by: Munjal Desai <munjaldesai@google.com>
...
* commit '66470952d7743860f03172a1ebfbb31474f50152':
2013-12-11 05:53:54 +00:00
Qiwen Zhao
1b06fcf4c9
am d95f43a2: (-s ours) am fe44961b: (-s ours) adding klp-volantis-dev manifest.
...
* commit 'd95f43a206bc9287c379ea1dfedb378023ed2521':
2013-12-11 05:53:52 +00:00
Chad Jones
cbb228e387
am 3410be15: am 49099283: am bba03e82: Add vendor/nvidia/build
...
* commit '3410be15cf20f3013e531344e60df3a1c1c4cef8':
2013-12-11 01:23:54 +00:00
Kenny Root
6159bddf1d
am 2092d4a0: am a44e9d79: am 231cbfdb: Add external/conscrypt to manifest
...
* commit '2092d4a03815a7b56c4e16d5e044054cfd2ae386':
Add external/conscrypt to manifest
2013-12-11 01:23:54 +00:00
Geoff Mendal
56e7d8bfdf
am 47087fae: resolved conflicts for merge of ed3ae1a9 to klp-dev-plus-aosp
...
* commit '47087fae8bf792f127f0795bf48789ed5491f383':
klp-ub-dev manifest Bug: 10933019
2013-12-11 01:23:54 +00:00
Geoff Mendal
88cada23cb
am 5147301d: am a6497bf5: Add volantis projects for klp-dev
...
* commit '5147301df78c931b8758340db0a822e47f72c892':
2013-12-11 01:23:51 +00:00
keunyoung
44b759a648
am 4ef9372d: am 55d6bc31: add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
...
* commit '4ef9372dd5f34595ccdd56254cd3fe506c978061':
2013-12-11 01:23:51 +00:00
keunyoung
7222df2145
am 0e464569: am 31bdea88: remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
...
* commit '0e464569e8e94b4cf5962466f771c785eb75d3c0':
2013-12-11 01:23:50 +00:00
Ying Wang
ed0e42ee28
am 85c505f7: am 71941e59: Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
...
* commit '85c505f7ae5fcca044c6d97f7ce89aa9cd0b39eb':
2013-12-11 01:23:50 +00:00
Ying Wang
5d7999f847
am d9bca403: am 2bef1b2e: Add back \'groups="vendor"\'
...
* commit 'd9bca403e7f997b17003eec2991b221251bdfa41':
2013-12-11 01:23:50 +00:00
Geoff Mendal
3d27e599f3
am cfbccb94: am fb7e4a7b: Remove vendor/unbundled_google/packages/CastMirroring, repo not needed Bug: 10726512 Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43 Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752 Reviewed-by: Justin Ho <justin
...
* commit 'cfbccb9467d696965eff8b0df9b5d35d4dda9c96':
2013-12-11 01:23:50 +00:00
Jeff Hamilton
37bc73065e
am a27a21de: am 76eee955: Attempt to fix the build.
...
* commit 'a27a21de3cd63494f1b85940daae6e78e8a2ad36':
2013-12-11 01:23:50 +00:00
Ed Heyl
9db13dbb48
am 11b9fe70: am 36427c52: (-s ours) Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '11b9fe70967d7b4fea5cf0d612386cf431c0c621':
Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
2013-12-11 01:23:50 +00:00
Ed Heyl
ac79f366bb
am f99f4ac7: am ad74957c: remove libvterm and Terminal projects. do not merge
...
* commit 'f99f4ac737273f1a17a56328ea5c83f46ffa23ed':
2013-12-11 01:23:50 +00:00
Maurice Chu
b3f2c92f4c
am 5370f1b4: am 6a1860bd: Change klp-dev to point to Gouda branch for PrebuiltGmsCore project.
...
* commit '5370f1b46757ecc519d5876a479ae8f29664c2e9':
2013-12-11 01:23:50 +00:00
Chad Jones
0a370c0ea2
am 6bb0ec23: am 6dbf0c13: Add device/lge/mako_svelte-kernel to mako_svelte repo group
...
* commit '6bb0ec23ffcedb861bd1c620eb676973d0c7ea48':
2013-12-11 01:23:50 +00:00
Geoff Mendal
2f646e12e5
am 3692d6a3: am 232f2f8f: Add project platform/vendor/unbundled_google/packages/CastMirroring Bug: 10726512 Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121 Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203 Reviewed-by: Andreas Huber <andih
...
* commit '3692d6a3b7a15443965e3898909f25f49b92bf14':
2013-12-11 01:23:49 +00:00
Geoff Mendal
a1377d9088
am c3a8acf7: am 44707b81: Remove AndroidCastReceiver from klp-dev Bug: 10708905 Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001 Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783 Reviewed-by: Chad Jones <chadj@google.com>
...
* commit 'c3a8acf732f25026aba69096cefa764c496eb968':
2013-12-11 01:23:49 +00:00
Ed Heyl
52bfda79d4
am bf73dbf9: am 5ac9752b: am ba1edc7a: am c756d712: merge manifest and resolve conflicts
...
* commit 'bf73dbf961dd8f7761c844a8b465a26e2eaf2ebb':
2013-12-11 01:23:49 +00:00
Chad Jones
5b1b10aea3
am a1bab2b2: am 3a8ff655: Add external/sil-fonts
...
* commit 'a1bab2b24ad2e18002404b5fe0e3303efdc72160':
2013-12-11 01:23:49 +00:00
Chad Jones
15a257a28c
am fd78dd20: am 3e4dc128: am 71edb48b: am 1788940d: am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit 'fd78dd204ab4f30d781fd4952e815ec106b606a3':
2013-12-11 01:23:49 +00:00
Chad Jones
3a1fe09cbf
am 521e52d4: am c2c657d3: am ecf5c69d: am 1b13b462: am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit '521e52d41d610543315846045bf7c4e76fa69e72':
2013-12-11 01:23:49 +00:00
Chad Jones
551cbc7d1a
am 28a63dc9: am 4308d90d: am fc60bd6e: am 19ec5e9f: am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit '28a63dc9c2402ea27988b37963fc90b551e31746':
2013-12-11 01:23:49 +00:00
Chad Jones
da84822658
am 9828c114: am 18a23161: am b65e48c0: am 6706a7ff: resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
...
* commit '9828c114fc3890911f38f6102362bd077cd57bab':
2013-12-11 01:23:49 +00:00
Chad Jones
e69af56324
am 87a260e0: am 92d4609c: am becedbaf: am 59eecc13: Merge branch \'jb-mr2-ub-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
...
* commit '87a260e01758943fb5ecb6e96ddc22140abcf58c':
2013-12-11 01:23:48 +00:00
Chad Jones
bb0c56454a
am d8c26f02: am 09294dfd: am b3e2f51c: resolved conflicts for merge of d80e3b00 to jb-mr2-dev-plus-aosp
...
* commit 'd8c26f023c334eccc164b3eb9f69f575bdaf2d49':
2013-12-11 01:23:48 +00:00
Chad Jones
7381671513
am d1e279c0: am d1ee7c73: am f8628ca7: Merge branch \'jb-mr2-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev-plus-aosp
...
* commit 'd1e279c070d556e7e69cd9cfcbe862f7dde31564':
2013-12-11 01:23:48 +00:00
Chad Jones
943434d3b4
am a40641be: am 943004fa: resolved conflicts for merge of 21754470 to klp-dev
...
* commit 'a40641be0954cf25c7c2dd1023c3e096a1186de4':
2013-12-11 01:23:48 +00:00
Chad Jones
ac34506980
am ea3fbb05: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into klp-dev-plus-aosp
...
* commit 'ea3fbb052c4c1065a7ba60aeed008b76a8cb764b':
2013-12-11 01:23:48 +00:00
Chad Jones
72bc9c0a6d
am 1bd3daa8: Rollback review URL update
...
* commit '1bd3daa8ab5110da7951d0c707556c4d9392d2bb':
Rollback review URL update
Update review URL
2013-12-11 01:23:48 +00:00
Qiwen Zhao
aefa077161
am 2132e7eb: (-s ours) add missing projects.
...
* commit '2132e7eb9fb62390537207ed4df263ffc1538b03':
add missing projects.
2013-12-10 23:29:38 +00:00
Qiwen Zhao
3aa90569cd
am 8bf69974: (-s ours) add missing projects.
...
* commit '8bf69974ce7af880ccf1cba1cbe4012f459370c4':
add missing projects.
2013-12-10 23:29:38 +00:00
Qiwen Zhao
cde027d2f8
am 2903a7d1: (-s ours) add missing projects.
...
* commit '2903a7d16946f1135a02abb713c5e68f99a0725d':
add missing projects.
2013-12-10 23:29:38 +00:00
Qiwen Zhao
396b96baa3
am 2fd16213: (-s ours) add vendor/google_pdk/clockwork to klp-modular-dev
...
* commit '2fd162134730db5b98dd094b9811baa9a3e48fcd':
add vendor/google_pdk/clockwork to klp-modular-dev
2013-12-10 23:29:38 +00:00
Mike Lockwood
388a010716
am 908f1ce4: (-s ours) add device/google/clockwork to pdk-cw group
...
* commit '908f1ce45e7d6c704336d84f490f12ffe856586f':
add device/google/clockwork to pdk-cw group
2013-12-10 23:29:38 +00:00
Geoff Mendal
e0dd89ae3b
am 8c8fed3d: (-s ours) Add device/google/clockwork Bug: 11998768 Change-Id: Ic7f6e0f07d2f865e71945e7b8d25779eb4987271 Reviewed-on: https://googleplex-android-review.git.corp.google.com/395614 Reviewed-by: Geoff Mendal <mendal@google.com>
...
* commit '8c8fed3d9df80f94087ee7022f8306ca4ae57ffb':
Add device/google/clockwork Bug: 11998768 Change-Id: Ic7f6e0f07d2f865e71945e7b8d25779eb4987271 Reviewed-on: https://googleplex-android-review.git.corp.google.com/395614 Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-10 23:29:38 +00:00
Geoff Mendal
d998643af9
am b2a3bc69: (-s ours) Add device/moto/metallica Bug: 11966648 Change-Id: I2adc15eef09686cfd8a48f5317d38e88aa64ed70 Reviewed-on: https://googleplex-android-review.git.corp.google.com/394299 Reviewed-by: Mike Lockwood <lockwood@google.com>
...
* commit 'b2a3bc69620c8de4135e7dcb29bd4f6702e5ea29':
Add device/moto/metallica Bug: 11966648 Change-Id: I2adc15eef09686cfd8a48f5317d38e88aa64ed70 Reviewed-on: https://googleplex-android-review.git.corp.google.com/394299 Reviewed-by: Mike Lockwood <lockwood@google.com >
2013-12-10 23:29:38 +00:00
Geoff Mendal
c2fef378de
am 32946343: (-s ours) klp-modular-dev manifest Bug: 11877765
...
* commit '32946343a3bef048bade10fbfc9518707a90923f':
klp-modular-dev manifest Bug: 11877765
2013-12-10 23:29:38 +00:00
Chad Jones
0711165e96
am 69271793: resolved conflicts for merge of c70e4da7 to klp-volantis-dev
...
* commit '69271793cc323be3840ea5ce964cc8596abdb0f7':
Add prebuilts/gcc/...4.8 projects
klp-dev-plus-aosp manifest.
2013-12-10 22:57:28 +00:00
Mike Lockwood
9dfecac517
am 692aeae1: Add libunwind and libnativehelper to the PDK
...
* commit '692aeae1ad4f55508e092daa2efced1d53a950db':
Add libunwind and libnativehelper to the PDK
2013-12-10 22:57:28 +00:00
Colin Cross
5e277f0dc0
am d99b2584: Add libusb_aah back to manifest
...
* commit 'd99b2584d90cca809abbd17515b45bd3d17f0933':
Add libusb_aah back to manifest
2013-12-10 22:57:28 +00:00
Qiwen Zhao
b1362f3f7c
am 8134ed1c: (-s ours) update manifest to match klp-dev
...
* commit '8134ed1c4b4cd75cc18100dd3c8470b270bddd0e':
update manifest to match klp-dev
2013-12-10 22:57:28 +00:00
Geoff Mendal
0a5d6bb05f
am 6b3c69be: am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com> R
...
* commit '6b3c69be024c610e0d26391c960c48b164c6d619':
2013-12-10 22:57:28 +00:00
Chad Jones
c4196e3205
am 3d910297: am b2e5b6f7: Drop molly group label from device/google/molly-ubik for now
...
* commit '3d910297b7081c0e16b85fef3ce3663125ae825d':
2013-12-10 22:57:28 +00:00
Geoff Mendal
66470952d7
am f52a0408: am e49ba474: Add project device/google/molly-ubik Bug: 11594337 Change-Id: Iccb9b46f2d5f7216a37d0f79babb04edeedea2ab Reviewed-on: https://googleplex-android-review.git.corp.google.com/387114 Reviewed-by: Munjal Desai <munjaldesai@google.com> Reviewed-by:
...
* commit 'f52a0408a3e674b79ce7b20c421bfff2bd589fc7':
2013-12-10 22:57:28 +00:00
Qiwen Zhao
d95f43a206
am fe44961b: (-s ours) adding klp-volantis-dev manifest.
...
* commit 'fe44961bbefbab943c2489fbb9f02ab70fcbbb8a':
adding klp-volantis-dev manifest.
2013-12-10 22:57:28 +00:00
Chad Jones
b51867ef90
resolved conflicts for merge of 8284bfe1 to klp-volantis-dev
2013-12-10 14:20:42 -08:00
Chad Jones
fdde16ab68
am b9447bda: resolved conflicts for merge of 1633a64f to klp-dev-plus-aosp
...
* commit 'b9447bda2ef0a46c16e48528b7c20a5f787ba1e2':
Add platform/external/sil-fonts
2013-12-10 22:17:25 +00:00
Chad Jones
fa52959ab1
am 0b6b7031: am 4d0f0bf0: Add projects for ardbeg - DO NOT MERGE
...
* commit '0b6b703178c4cdefe829d46b9d721d0e80c77b35':
2013-12-10 22:17:25 +00:00
Maurice Chu
4be2abbf37
am 85d4673e: am cf6835df: Change KLP-dev to point to GMS Core Fontal
...
* commit '85d4673ec1a353da7627c35a469f25ee24a24e29':
2013-12-10 22:17:25 +00:00
Chad Jones
f31871d7b4
am cb370c33: am 828eb2e3: Add external/tinycompress to set pulled in by PDK pushes.
...
* commit 'cb370c330b4bcf034ac50dd62489163b78f98130':
2013-12-10 22:17:25 +00:00
keunyoung
e56e50adf6
am 1c75d9e1: am 6bdaeae6: add vendor/auto/projection_protocol to default manifest
...
* commit '1c75d9e17f3556b794ef9d896bb8a234e5426fcd':
2013-12-10 22:17:25 +00:00
Geoff Mendal
9f0a22024d
am 1d0bc26f: am 53883097: Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev Bug: 10493211 Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50 Reviewed-on: https://googleplex-android-review.googlesource.com/349370 Reviewed-by: Justin Ho <justi
...
* commit '1d0bc26f6dc47379cd3a3b4d7f48d6b07a31b33c':
2013-12-10 22:17:25 +00:00
Ying Wang
aec75726b6
am 69c0db3c: am 41698d48: Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
...
* commit '69c0db3c07cdaae3a5a1a065838a0249910e34e5':
2013-12-10 22:17:25 +00:00
Geoff Mendal
d266602513
am ae30e4a2: am a7c33da2: Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev Bug: 10447068 Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62 Reviewed-on: https://googleplex-android-review.googlesource.com/348033 Reviewed-by: Bart Sears <bsears@go
...
* commit 'ae30e4a23dcbf10d48800cc13e459a466880eda0':
2013-12-10 22:17:25 +00:00
Ying Wang
a92bee7814
am 5e407ab9: am 2715f4c8: Remove device/ti/panda from klp-dev manifest.
...
* commit '5e407ab9427506950850770bc2b7f0024dec8f86':
2013-12-10 22:17:24 +00:00
Bart Sears
3d1df1845a
am 87a25278: am 4f775eb0: Remove obsolete CloudPrint and Print apps
...
* commit '87a25278e516d9e546cb2f1104c151545d3654a8':
2013-12-10 22:17:24 +00:00
Chad Jones
fbe73cc4a4
Merge branch 'klp-volantis-dev' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-volantis-dev
2013-12-10 22:17:22 +00:00
Chad Jones
69271793cc
resolved conflicts for merge of c70e4da7 to klp-volantis-dev
2013-12-10 14:15:33 -08:00
Marco Nelissen
d26afc66b2
am 0cc91f28: Merge branch \'klp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev-plus-aosp
...
* commit '0cc91f28a6bf4955f2f87cd4291a504cefd043eb':
2013-12-10 22:11:55 +00:00
Jean-Baptiste Queru
88b7f53809
am f982a70e: am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit 'f982a70e1fc979c8d7a67be8f5b475ce3414acf6':
2013-12-10 22:11:55 +00:00
Jeff Hamilton
0ce6b87cf5
am 32e8c1c1: am c362d939: DO NOT MERGE Update GMS core client prebuilts to finn.
...
* commit '32e8c1c15a7f90468a344fed15463381a9556fb4':
2013-12-10 22:11:55 +00:00
Sascha Haeberling
b4ccda93ad
am db650ab2: am 70be1dad: Adding Camera2 and GoogleCamera to klp-dev manifest.
...
* commit 'db650ab247b7fd76a5ed2d79c933494ce333b7a5':
2013-12-10 22:11:55 +00:00
Torne (Richard Coles)
326eb3fdd9
am f1723480: am 8fed2f9d: Remove external/chromium_org/googleurl.
...
* commit 'f1723480891d7ea29ca22da0bfd9eb29e9f17402':
2013-12-10 22:11:55 +00:00
Chad Jones
65990655f2
am d931a35c: am 0cada6b0: fix two small whitespace diff from master - DO NOT MERGE
...
* commit 'd931a35c14db451cbf1f3f98fb1158a24e5d0e14':
2013-12-10 22:11:55 +00:00
Baligh Uddin
e5bdf2c256
am 8db93645: am a08fafee: Add overwrites for 3 unbundled projects
...
* commit '8db936452d440090fd3d2c9b7de8f5c808d8164b':
2013-12-10 22:11:54 +00:00
The Android Automerger
dd1402f627
am 3aa9630c: am 84a060d5: "updated manifest from master@1aae7da5"
...
* commit '3aa9630c63aebc425a248900c40169ea250eb88f':
2013-12-10 22:11:54 +00:00
Baligh Uddin
245a7db93f
am d471df6a: (-s ours) klp-dev-plus-aosp manifest.
...
* commit 'd471df6a0dcd993728b82b3ef11889bea4d0cd92':
klp-dev-plus-aosp manifest.
2013-12-10 22:11:54 +00:00
Chad Jones
844f577d8f
am 8096345a: am af83093a: Add hardware/nvidia/audio
...
* commit '8096345a2a6c6925b19742e79def269fabab07f1':
Add hardware/nvidia/audio
2013-12-10 12:49:49 -08:00
Chad Jones
8096345a2a
am af83093a: Add hardware/nvidia/audio
...
* commit 'af83093a4e1a9723424df1ff9e16500e7d842181':
Add hardware/nvidia/audio
2013-12-10 12:47:26 -08:00
Chad Jones
af83093a4e
Add hardware/nvidia/audio
...
Change-Id: I4348448f037ccc8d1b3ee82a81071da0e194b4f3
Reviewed-on: https://googleplex-android-review.git.corp.google.com/397324
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-10 20:45:12 +00:00
Qiwen Zhao
2132e7eb9f
add missing projects.
2013-12-09 12:41:11 -08:00
Qiwen Zhao
8bf69974ce
add missing projects.
2013-12-09 12:40:39 -08:00
Qiwen Zhao
2903a7d169
add missing projects.
2013-12-09 12:39:30 -08:00
Mike Lockwood
dcc4cfbaf0
Add new Clockwork projects to manifest, and remove the obsolete stuff
...
Change-Id: I86b13cf8f9cda6722a7d3df52c34fd52845c81ea
Reviewed-on: https://googleplex-android-review.git.corp.google.com/396444
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-06 22:41:22 +00:00
Qiwen Zhao
2fd1621347
add vendor/google_pdk/clockwork to klp-modular-dev
2013-12-05 11:50:57 -08:00
Mike Lockwood
908f1ce45e
add device/google/clockwork to pdk-cw group
...
Needed so we can pull this into Clockwork PDKs but not other PDKs
Change-Id: Ibe81797d5af95851d4b15990d8caf38503827fd9
Reviewed-on: https://googleplex-android-review.git.corp.google.com/395797
Reviewed-by: Mike Lockwood <lockwood@google.com >
2013-12-05 19:05:44 +00:00
Geoff Mendal
8c8fed3d9d
Add device/google/clockwork
...
Bug: 11998768
Change-Id: Ic7f6e0f07d2f865e71945e7b8d25779eb4987271
Reviewed-on: https://googleplex-android-review.git.corp.google.com/395614
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-05 14:14:16 +00:00
Ying Wang
8b1c503fad
Remove the legacy product git projects.
...
Bug: 11967374
Change-Id: I1b2e0944ec339cf40e64326d1d086e7e78a37e57
Reviewed-on: https://googleplex-android-review.git.corp.google.com/394770
Reviewed-by: Colin Cross <ccross@google.com >
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-03 20:06:26 +00:00
Mike Lockwood
9f133c8242
am 692aeae1: Add libunwind and libnativehelper to the PDK
...
* commit '692aeae1ad4f55508e092daa2efced1d53a950db':
Add libunwind and libnativehelper to the PDK
2013-12-03 17:50:01 +00:00
Mike Lockwood
692aeae1ad
Add libunwind and libnativehelper to the PDK
...
libnativehelper is a dependency of libunwind, so it needs to go in, too
Change-Id: I52f33d6122ef71ed76a6eedcb2274656c7393548
Reviewed-on: https://googleplex-android-review.git.corp.google.com/389764
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-on: https://googleplex-android-review.git.corp.google.com/394608
Reviewed-by: Mike Lockwood <lockwood@google.com >
2013-12-03 17:44:16 +00:00
Geoff Mendal
a5d9e5e6f6
Add platform/vendor/unbundled_google/packages/AndroidMediaShell
...
Bug: 11978807
Change-Id: I22ee54544c05211651ab1382b4224b59b00e29ef
Reviewed-on: https://googleplex-android-review.git.corp.google.com/394690
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-03 14:50:21 +00:00
Colin Cross
39422388b5
am d99b2584: Add libusb_aah back to manifest
...
* commit 'd99b2584d90cca809abbd17515b45bd3d17f0933':
Add libusb_aah back to manifest
2013-12-02 23:41:19 +00:00
Colin Cross
d99b2584d9
Add libusb_aah back to manifest
...
Required to build with vendor/
Change-Id: I2ef570da328372c2a89819e07b381a1359c8ec82
Reviewed-on: https://googleplex-android-review.git.corp.google.com/394485
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-12-02 23:36:56 +00:00
Qiwen Zhao
951a4f1d6a
am 8134ed1c: (-s ours) update manifest to match klp-dev
...
* commit '8134ed1c4b4cd75cc18100dd3c8470b270bddd0e':
update manifest to match klp-dev
2013-12-02 23:30:50 +00:00
Geoff Mendal
42300efd8f
am 6b3c69be: am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com> R
...
* commit '6b3c69be024c610e0d26391c960c48b164c6d619':
2013-12-02 23:17:53 +00:00
Chad Jones
b9cab8f259
am 3d910297: am b2e5b6f7: Drop molly group label from device/google/molly-ubik for now
...
* commit '3d910297b7081c0e16b85fef3ce3663125ae825d':
2013-12-02 23:17:53 +00:00
Geoff Mendal
e7bf1e3ab3
resolved conflicts for merge of f52a0408 to master
2013-12-02 15:16:02 -08:00
Nick Kralevich
c3ba73c1f7
Add external/pcre to default.xml
...
Bug: 11881977
Change-Id: I6230ebb7ec7f4d32b04cdcf34889c620c7d266f6
Reviewed-on: https://googleplex-android-review.git.corp.google.com/394386
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-12-02 22:09:32 +00:00
Geoff Mendal
b2a3bc6962
Add device/moto/metallica
...
Bug: 11966648
Change-Id: I2adc15eef09686cfd8a48f5317d38e88aa64ed70
Reviewed-on: https://googleplex-android-review.git.corp.google.com/394299
Reviewed-by: Mike Lockwood <lockwood@google.com >
2013-12-02 20:25:19 +00:00
Qiwen Zhao
8134ed1c4b
update manifest to match klp-dev
2013-11-27 10:56:32 -08:00
Nick Kralevich
709128193c
am ee1a6492: am a59bc727: am 5cad5c55: Add project platform/external/libseccomp-helper
...
* commit 'ee1a649280bded98d5b195d02b743dbd475584df':
Add project platform/external/libseccomp-helper
2013-11-26 18:00:21 -08:00
Nick Kralevich
b62d378c0b
am 4f30e288: am e03a41ac: am 7ac3161a: Add external/pcre to default.xml
...
* commit '4f30e288be8b8d56fd6bd9173b89e0891d9fcc2d':
Add external/pcre to default.xml
2013-11-26 18:00:20 -08:00
Nick Kralevich
ee1a649280
am a59bc727: am 5cad5c55: Add project platform/external/libseccomp-helper
...
* commit 'a59bc727c09705ead87838c851a69882bb6b1dcf':
Add project platform/external/libseccomp-helper
2013-11-26 17:56:53 -08:00
Nick Kralevich
4f30e288be
am e03a41ac: am 7ac3161a: Add external/pcre to default.xml
...
* commit 'e03a41aceb90bfa52295cd0349f9ef746017ea48':
Add external/pcre to default.xml
2013-11-26 17:56:51 -08:00
Nick Kralevich
a59bc727c0
am 5cad5c55: Add project platform/external/libseccomp-helper
...
* commit '5cad5c55d3394e39ddaf96ea2c7ef08688656dea':
Add project platform/external/libseccomp-helper
2013-11-27 01:53:54 +00:00
Nick Kralevich
e03a41aceb
am 7ac3161a: Add external/pcre to default.xml
...
* commit '7ac3161ac2036eacb90c9198db931e2727e16e97':
Add external/pcre to default.xml
2013-11-27 01:53:52 +00:00
Nick Kralevich
5cad5c55d3
Add project platform/external/libseccomp-helper
...
Bug: 11812687
2013-11-26 17:14:28 -08:00
Nick Kralevich
7ac3161ac2
Add external/pcre to default.xml
...
Bug: 11881977
2013-11-26 17:07:58 -08:00
Geoff Mendal
fea63702ff
Add project platform/external/libseccomp-helper
...
Bug: 11812687
Change-Id: I16af91896f535e25cc6dc165fa5c73f4430b5a88
Reviewed-on: https://googleplex-android-review.git.corp.google.com/393216
Reviewed-by: Nick Kralevich <nnk@google.com >
2013-11-27 01:02:47 +00:00
Geoff Mendal
32946343a3
klp-modular-dev manifest
...
Bug: 11877765
2013-11-26 13:57:18 -08:00
Torne (Richard Coles)
70ad293aa2
Add external/chromium_org/third_party/sfntly to manifest.
...
Add third_party/sfntly to manifest to support skia printing in
webviewchromium.
Change-Id: I87eb123411bce43515f8f1ea66498ac5fa1f3ae3
Reviewed-on: https://googleplex-android-review.git.corp.google.com/392876
Reviewed-by: Ben Murdoch <benm@google.com >
2013-11-26 14:47:42 +00:00
Conley Owens
e4d0b40699
am cc33a062: Merge commit \'f8c615b7\' into klp-dev-plus-aosp
...
* commit 'cc33a062f85cf55ba927468deeb96e9d7978f4f2':
Revert "Rollback: am 303c2559
2013-11-25 16:23:03 -08:00
Conley Owens
cc33a062f8
Merge commit 'f8c615b7' into klp-dev-plus-aosp
...
Change-Id: Id9a924f32f72569e0963ad07f14d3bff484c5d8b
2013-11-25 16:18:34 -08:00
Conley Owens
f8c615b7ea
am a25f306b: Revert "Rollback: am 303c2559: Update master manifest for Android 4.4"
...
* commit 'a25f306bc86d39e11ae868d4e213cf7b1021de38':
Revert "Rollback: am 303c2559
2013-11-25 15:56:49 -08:00
Conley Owens
a25f306bc8
Revert "Rollback: am 303c2559: Update master manifest for Android 4.4"
...
This reverts commit b9092c6151https://googleplex-android-review.git.corp.google.com/392695
Reviewed-by: Chad Jones <chadj@google.com >
2013-11-25 23:53:21 +00:00
Chad Jones
b92343b7a3
am 9eb0ee81: (-s ours) resolved conflicts for merge of c5b0980d withi -s ours to klp-dev-plus-aosp DO NOT MERGE
...
* commit '9eb0ee817e5325b0fae9660d4994761a3f2746a3':
Rollback: am 303c2559
2013-11-25 09:41:51 -08:00
Chad Jones
9eb0ee817e
resolved conflicts for merge of c5b0980d withi -s ours to klp-dev-plus-aosp DO NOT MERGE
2013-11-25 09:37:16 -08:00
Chad Jones
c5b0980d68
am b9092c61: Rollback: am 303c2559: Update master manifest for Android 4.4
...
* commit 'b9092c61517ce4f65eb0cfc661f35ea6f29c9328':
Rollback: am 303c2559
2013-11-24 20:28:30 -08:00
Chad Jones
b9092c6151
Rollback: am 303c2559: Update master manifest for Android 4.4
...
Change-Id: I7fb1164531687e48ec6c6fd484e144e2ac8aaa8b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/392265
Reviewed-by: Chad Jones <chadj@google.com >
2013-11-25 04:25:44 +00:00
Conley Owens
34876f59d6
am 866a07f6: am 28ef94b3: am afb7eb39: am 303c2559: Update master manifest for Android 4.4
...
* commit '866a07f69af21042a5025f7261257aab136e0612':
Update master manifest for Android 4.4
2013-11-24 19:14:38 -08:00
Conley Owens
866a07f69a
am 28ef94b3: am afb7eb39: am 303c2559: Update master manifest for Android 4.4
...
* commit '28ef94b308c970af7401e9734999ddf2b96166fc':
Update master manifest for Android 4.4
2013-11-24 19:11:23 -08:00
Conley Owens
28ef94b308
am afb7eb39: am 303c2559: Update master manifest for Android 4.4
...
* commit 'afb7eb39afafc4a9e607fb9015ca9dc6f3c5477d':
Update master manifest for Android 4.4
2013-11-24 19:07:57 -08:00
Conley Owens
afb7eb39af
am 303c2559: Update master manifest for Android 4.4
...
* commit '303c2559ffea2f14ab9613c4cbd1553bbcd2c824':
Update master manifest for Android 4.4
2013-11-25 00:54:55 +00:00
Conley Owens
303c2559ff
Update master manifest for Android 4.4
...
Change-Id: I8d4a360373d375a742a15a9b576bbf2c600a0b3f
2013-11-23 15:14:20 -08:00
Brian Carlstrom
d28f96d8cf
Restore external/libusb_aah
...
Change-Id: I8214443d3f6c3fd24270ac1381267d2beb4e8688
Reviewed-on: https://googleplex-android-review.git.corp.google.com/392061
Reviewed-by: Elliott Hughes <enh@google.com >
2013-11-22 22:50:19 +00:00
Brian Carlstrom
d9be4ec94f
Revert "Remove vendor/primesense/sauron and vendor/unbundled_google/packages/GestureService Change-Id: Idae83a9439be3eaa47b11730ee57858499f6720a Reviewed-on: https://googleplex-android-review.git.corp.google.com/391854 Reviewed-by: Ed Heyl <edheyl@google.com>"
...
This reverts commit b8e8702e76https://googleplex-android-review.git.corp.google.com/391960
Reviewed-by: Ed Heyl <edheyl@google.com >
Reviewed-by: Brian Carlstrom <bdc@google.com >
2013-11-22 19:14:50 +00:00
Brian Carlstrom
b8e8702e76
Remove vendor/primesense/sauron and vendor/unbundled_google/packages/GestureService
...
Change-Id: Idae83a9439be3eaa47b11730ee57858499f6720a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/391854
Reviewed-by: Ed Heyl <edheyl@google.com >
2013-11-22 19:02:43 +00:00
Conley Owens
18188ceeed
am c0e63fa8: am ec62764b: Merge commit \'5ce20218\' into stage-aosp-master
...
* commit 'c0e63fa83e1b413157b57b2627213f571b76025b':
Remove ti/panda
2013-11-21 23:00:07 -08:00
Conley Owens
1ee93b66c7
am 8b05e3c0: am 10b7627f: am 57e89540: am 591060e5: Remove ti/wlan and ti/wpan
...
* commit '8b05e3c08fa3f701e99e936a704f89976a4b6bc5':
Remove ti/wlan and ti/wpan
2013-11-21 23:00:06 -08:00
Elliott Hughes
c2e568b717
resolved conflicts for merge of ed8c26da to master
...
Change-Id: I9613a60ebc27656c9f6a547c70fe8443ae537324
2013-11-21 22:54:15 -08:00
Conley Owens
c0e63fa83e
am ec62764b: Merge commit \'5ce20218\' into stage-aosp-master
...
* commit 'ec62764b86522e853cd9d4f8960f111562de79a0':
Remove ti/panda
2013-11-21 18:44:04 -08:00
Conley Owens
8b05e3c08f
am 10b7627f: am 57e89540: am 591060e5: Remove ti/wlan and ti/wpan
...
* commit '10b7627fe19b9f899b7539a95e6fe45620509c9b':
Remove ti/wlan and ti/wpan
2013-11-21 18:44:02 -08:00
Conley Owens
ed8c26da61
Merge commit '0dc7af54' into klp-dev-plus-aosp
...
Change-Id: Ifd4b1b2f2bd8bdfbb4947b27d8bbef5c9b47bb14
2013-11-21 17:12:59 -08:00
Conley Owens
ec62764b86
Merge commit '5ce20218' into stage-aosp-master
...
Change-Id: Ic630816d9980475d7beb41525672f7faca57e506
2013-11-21 15:38:24 -08:00
Conley Owens
5ce2021842
am 57929524: Remove ti/panda
...
* commit '57929524870c3dca9322f04601b71d6c4b1a35f2':
Remove ti/panda
2013-11-21 23:26:18 +00:00
Conley Owens
5792952487
Remove ti/panda
...
Panda is no longer supported in master.
Change-Id: I3d5efbcf63ded1c40539712a2b34bb6c1522520b
2013-11-21 15:15:56 -08:00
Conley Owens
10b7627fe1
am 57e89540: am 591060e5: Remove ti/wlan and ti/wpan
...
* commit '57e89540cad30d95ffa63241a87307f88c0d529d':
Remove ti/wlan and ti/wpan
2013-11-21 14:45:58 -08:00
Conley Owens
57e89540ca
am 591060e5: Remove ti/wlan and ti/wpan
...
* commit '591060e525e9a86ac194304e808c632f33f2bb1f':
Remove ti/wlan and ti/wpan
2013-11-21 22:41:47 +00:00
Conley Owens
591060e525
Remove ti/wlan and ti/wpan
...
These projects are no longer needed in the master manifest.
Change-Id: Ie0abc1bc55a6cc99100606fc8c0c9629b8492ea5
2013-11-21 14:23:30 -08:00
Ed Heyl
979360c60b
fix automerge issue
2013-11-21 09:17:21 -08:00
Qiwen Zhao
c4d9990c82
am 8cd59ef2: am 81e82624: adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
...
* commit '8cd59ef2d6301496f045507868ba4bdd84462ec1':
adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
2013-11-21 08:12:41 -08:00
Qiwen Zhao
8cd59ef2d6
am 81e82624: adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
...
* commit '81e82624e0d7d3b1bfe00581a82762dc6ffba9c4':
adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
2013-11-21 08:09:55 -08:00
Ying Wang
471faeeabf
Remove inactive projects from master.
...
Change-Id: I55c537835c7d110c23075b0edb58cbf7463c1df5
Reviewed-on: https://googleplex-android-review.git.corp.google.com/391114
Reviewed-by: Chad Jones <chadj@google.com >
2013-11-20 23:42:14 +00:00
The Android Open Source Project
0dc7af546d
Update manifest for Android 4.4
...
Change-Id: Ife1f54cc8bbb004b8cf0ac1417665e346d0c517e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/391036
Reviewed-by: Ed Heyl <edheyl@google.com >
2013-11-20 23:21:19 +00:00
Chad Jones
ffeac3874f
Add external/{syspatch,xdelta3}
...
Change-Id: Ieb122cfc941773ac9c9f1c51b814f40c396efd33
Reviewed-on: https://googleplex-android-review.git.corp.google.com/390392
Reviewed-by: Geremy Condra <gcondra@google.com >
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-11-19 01:08:56 +00:00
Qiwen Zhao
81e82624e0
adding missing projects aarch64-linux-android-4.8 to stage-aosp-master
...
Change-Id: I45ae04403e95e9bd9387f982b7fd87f34f6fc919
Reviewed-on: https://googleplex-android-review.git.corp.google.com/390186
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-11-18 20:01:27 +00:00
Mike Lockwood
51b1334aa0
Add libunwind and libnativehelper to the PDK
...
libnativehelper is a dependency of libunwind, so it needs to go in, too
Change-Id: I52f33d6122ef71ed76a6eedcb2274656c7393548
Reviewed-on: https://googleplex-android-review.git.corp.google.com/389764
Reviewed-by: Chad Jones <chadj@google.com >
2013-11-18 15:15:26 +00:00
Mike Lockwood
54fdfaca03
Add projects for Clockwork PDK builds
...
Change-Id: I69a0301654e05444342918a50f23db43d1c11884
Reviewed-on: https://googleplex-android-review.git.corp.google.com/389504
Reviewed-by: Simon Wilson <simonwilson@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-11-15 18:58:58 +00:00
Baligh Uddin
72fc48a1e7
Add vendor/google_clockwork to master manifest
...
Change-Id: I933385bfedb971827a3ff2ecb91779924ea34934
Reviewed-on: https://googleplex-android-review.git.corp.google.com/388416
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-11-13 23:31:32 +00:00
Yohann Roussel
f90c7a28e2
Revert "Remove frameworks/multidex from master manifest."
...
This reverts commit 5d5561ec24https://googleplex-android-review.git.corp.google.com/388096
Reviewed-by: Jeff Hamilton <jham@google.com >
Reviewed-by: Benoit Lamarche <benoitlamarche@google.com >
2013-11-13 15:22:42 +00:00
Geoff Mendal
3cfddb988c
am 2cc5f546: am 15707d84: am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@
...
* commit '2cc5f546ce22f2fba05e78fb515e4bdf84333b6c':
Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com > Reviewed-by: Chad Jones <chadj@google.com >
2013-11-12 10:11:04 -08:00
Geoff Mendal
2cc5f546ce
am 15707d84: am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com> R
...
* commit '15707d84b040f6cbfb42ec13282ce79bb93b3db5':
Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com > Reviewed-by: Chad Jones <chadj@google.com >
2013-11-12 10:06:37 -08:00
Geoff Mendal
15707d84b0
am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com> Reviewed-by: C
...
* commit 'a72aebb1575f2c7b84641493184b83d8bd034aab':
Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com > Reviewed-by: Chad Jones <chadj@google.com >
2013-11-12 10:02:06 -08:00
Geoff Mendal
6b3c69be02
am a72aebb1: Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com> Reviewed-by: C
...
* commit 'a72aebb1575f2c7b84641493184b83d8bd034aab':
Delete unneeded project device/google/molly-ubik Bug: 11594337 Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620 Reviewed-by: Munjal Desai <munjaldesai@google.com > Reviewed-by: Chad Jones <chadj@google.com >
2013-11-12 18:01:58 +00:00
Geoff Mendal
a72aebb157
Delete unneeded project device/google/molly-ubik
...
Bug: 11594337
Change-Id: Ie8ae531f8a9535403a9c0f01dec1356c1c87aa8f
Reviewed-on: https://googleplex-android-review.git.corp.google.com/387620
Reviewed-by: Munjal Desai <munjaldesai@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-11-12 17:58:48 +00:00
Chad Jones
eb833f0c6c
resolved conflicts for merge of 6eb24530 to master
2013-11-12 09:25:20 -08:00
Chad Jones
6eb2453053
resolved conflicts for merge of 55b1a1d7 to klp-dev-plus-aosp
2013-11-12 09:20:56 -08:00
Chad Jones
3d910297b7
am b2e5b6f7: Drop molly group label from device/google/molly-ubik for now
...
* commit 'b2e5b6f75323e668a22ed73251a0018ffd72881a':
Drop molly group label from device/google/molly-ubik for now
2013-11-12 17:08:09 +00:00
Chad Jones
55b1a1d77c
am b2e5b6f7: Drop molly group label from device/google/molly-ubik for now
...
* commit 'b2e5b6f75323e668a22ed73251a0018ffd72881a':
Drop molly group label from device/google/molly-ubik for now
2013-11-12 09:07:32 -08:00
Chad Jones
b2e5b6f753
Drop molly group label from device/google/molly-ubik for now
...
Change-Id: Icf174eb223ca71e89c3e29d2bff76434bc7e7a3c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/387518
Reviewed-by: Chad Jones <chadj@google.com >
2013-11-12 17:04:20 +00:00
Mindy DelliCarpini
49717fe74f
am ecd00750: am 71164a99: Revert "Revert "Add libs/accounts to klp-ub-dev""
...
* commit 'ecd007505f3259911330846ffdcd45aa4e4ecf4d':
Revert "Revert "Add libs/accounts to klp-ub-dev""
2013-11-11 20:52:27 -08:00
Mindy DelliCarpini
76123ff49a
am adf762a2: am aef6ad15: Revert "Add libs/accounts to klp-ub-dev"
...
* commit 'adf762a2ab328debcf3d39660124bdef077919dc':
Revert "Add libs/accounts to klp-ub-dev"
2013-11-11 20:52:12 -08:00
Mindy Pereira
8c904572d3
am 2639e305: am 6bfa4197: Add libs/accounts to klp-ub-dev
...
* commit '2639e305a949d1fc9c8a1760cc7bdde1dd54d20e':
Add libs/accounts to klp-ub-dev
2013-11-11 20:52:10 -08:00
Geoff Mendal
4a165f36f1
am 90656444: resolved conflicts for merge of e792d7c0 to klp-dev-plus-aosp
...
* commit '9065644491aa49f086622ea5f9b15ba467866676':
Add project device/google/molly-ubik Bug: 11594337 Change-Id: Iccb9b46f2d5f7216a37d0f79babb04edeedea2ab Reviewed-on: https://googleplex-android-review.git.corp.google.com/387114 Reviewed-by: Munjal Desai <munjaldesai@google.com > Reviewed-by: Dave Langemak <dlangemak@google.com >
2013-11-11 20:50:35 -08:00
Mindy DelliCarpini
ecd007505f
am 71164a99: Revert "Revert "Add libs/accounts to klp-ub-dev""
...
* commit '71164a99f4175c55213068b602832547f8c9f746':
Revert "Revert "Add libs/accounts to klp-ub-dev""
2013-11-11 18:21:54 -08:00
Mindy DelliCarpini
71164a99f4
Revert "Revert "Add libs/accounts to klp-ub-dev""
...
This reverts commit aef6ad150bhttps://googleplex-android-review.git.corp.google.com/387275
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-11-12 02:17:51 +00:00
Mindy DelliCarpini
adf762a2ab
am aef6ad15: Revert "Add libs/accounts to klp-ub-dev"
...
* commit 'aef6ad150b34e31ae6acd989e5523bf0b4eb3d8a':
Revert "Add libs/accounts to klp-ub-dev"
2013-11-11 18:01:40 -08:00
Mindy DelliCarpini
aef6ad150b
Revert "Add libs/accounts to klp-ub-dev"
...
This reverts commit 6bfa4197dfhttps://googleplex-android-review.git.corp.google.com/387274
Reviewed-by: Mindy DelliCarpini <mindyp@google.com >
2013-11-12 01:56:22 +00:00
Mindy Pereira
2639e305a9
am 6bfa4197: Add libs/accounts to klp-ub-dev
...
* commit '6bfa4197dfb2b5f9a420fe719669581984633096':
Add libs/accounts to klp-ub-dev
2013-11-11 17:23:02 -08:00
Mindy Pereira
6bfa4197df
Add libs/accounts to klp-ub-dev
...
Change-Id: I51d8c1540c030531927c2a469d83363437c0031a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/387451
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-11-12 01:20:04 +00:00
Geoff Mendal
9065644491
resolved conflicts for merge of e792d7c0 to klp-dev-plus-aosp
2013-11-11 09:09:28 -08:00
Geoff Mendal
e792d7c0fe
am e49ba474: Add project device/google/molly-ubik Bug: 11594337 Change-Id: Iccb9b46f2d5f7216a37d0f79babb04edeedea2ab Reviewed-on: https://googleplex-android-review.git.corp.google.com/387114 Reviewed-by: Munjal Desai <munjaldesai@google.com> Reviewed-by: Dave Langemak
...
* commit 'e49ba47440b3e8350f4fe7eac64bf95c321fd51f':
Add project device/google/molly-ubik Bug: 11594337 Change-Id: Iccb9b46f2d5f7216a37d0f79babb04edeedea2ab Reviewed-on: https://googleplex-android-review.git.corp.google.com/387114 Reviewed-by: Munjal Desai <munjaldesai@google.com > Reviewed-by: Dave Langemak <dlangemak@google.com >
2013-11-11 08:55:38 -08:00
Geoff Mendal
f52a0408a3
am e49ba474: Add project device/google/molly-ubik Bug: 11594337 Change-Id: Iccb9b46f2d5f7216a37d0f79babb04edeedea2ab Reviewed-on: https://googleplex-android-review.git.corp.google.com/387114 Reviewed-by: Munjal Desai <munjaldesai@google.com> Reviewed-by: Dave Langemak
...
* commit 'e49ba47440b3e8350f4fe7eac64bf95c321fd51f':
Add project device/google/molly-ubik Bug: 11594337 Change-Id: Iccb9b46f2d5f7216a37d0f79babb04edeedea2ab Reviewed-on: https://googleplex-android-review.git.corp.google.com/387114 Reviewed-by: Munjal Desai <munjaldesai@google.com > Reviewed-by: Dave Langemak <dlangemak@google.com >
2013-11-11 16:55:03 +00:00
Geoff Mendal
e49ba47440
Add project device/google/molly-ubik
...
Bug: 11594337
Change-Id: Iccb9b46f2d5f7216a37d0f79babb04edeedea2ab
Reviewed-on: https://googleplex-android-review.git.corp.google.com/387114
Reviewed-by: Munjal Desai <munjaldesai@google.com >
Reviewed-by: Dave Langemak <dlangemak@google.com >
2013-11-11 16:52:41 +00:00
Mike Lockwood
34b23d927b
add vendor/google_devices/aurum
...
Change-Id: Icf4d9cab2c8566cdbe5d1b023c0aa22953e0d177
Reviewed-on: https://googleplex-android-review.git.corp.google.com/386751
Reviewed-by: Griff Hazen <griff@google.com >
Reviewed-by: Daniel Koulomzin <dkoulomzin@google.com >
2013-11-08 21:49:33 +00:00
Qiwen Zhao
d23e3b9b7e
am 31a14629: fix extra art project.
...
* commit '31a14629a8ab30a0d953439371491c78bed29430':
fix extra art project.
2013-11-08 09:23:05 -08:00
Qiwen Zhao
1c59363153
am abf7bd07: Merge branch \'klp-dev-plus-aosp\' of persistent- https://googleplex-android.googlesource.com/a//platform/manifest into klp-dev-plus-aosp
...
* commit 'abf7bd07d56bcf9cbd9acbfbb72800558b2b0b99':
2013-11-08 09:23:04 -08:00
Qiwen Zhao
e7a338e729
am 78c7e5b9: (-s ours) Revert "Revert "Add new kitkat projects to AOSP master manifest""
...
* commit '78c7e5b91086dd5ad803286f3d049207d9b6fb5f':
Revert "Revert "Add new kitkat projects to AOSP master manifest""
2013-11-08 09:23:03 -08:00
Qiwen Zhao
5925db60d5
am a126545f: (-s ours) Revert "Revert "Add new kitkat projects to AOSP master manifest""
...
* commit 'a126545f0e658cc365ed73924be87911b74d711b':
Revert "Revert "Add new kitkat projects to AOSP master manifest""
2013-11-08 09:17:25 -08:00
Qiwen Zhao
31a14629a8
fix extra art project.
2013-11-08 09:12:26 -08:00
Qiwen Zhao
abf7bd07d5
Merge branch 'klp-dev-plus-aosp' of persistent- https://googleplex-android.googlesource.com/a//platform/manifest into klp-dev-plus-aosp
2013-11-08 09:11:45 -08:00
Qiwen Zhao
a126545f0e
Revert "Revert "Add new kitkat projects to AOSP master manifest""
...
These projects should have been kept internally.
This reverts commit ac39421e93https://googleplex-android-review.git.corp.google.com/386495
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-11-08 17:09:48 +00:00
Qiwen Zhao
78c7e5b910
Revert "Revert "Add new kitkat projects to AOSP master manifest""
...
These projects should have been kept internally.
This reverts commit ac39421e93
2013-11-08 09:07:31 -08:00
Chad Jones
5d0b9aba7d
Fix Camera2 in manifest
...
Change-Id: I2d229e13ced93bc4f61ef9c10ecd04108cd8c345
Reviewed-on: https://googleplex-android-review.git.corp.google.com/385423
Reviewed-by: Chad Jones <chadj@google.com >
2013-11-06 17:42:32 +00:00
Baligh Uddin
284c664b52
Add missing projects dropped due to a AOSP manifest merge
...
Change-Id: I865f6bb6eccc2449d132ac9e3b7434957e1800da
Reviewed-on: https://googleplex-android-review.git.corp.google.com/385319
Reviewed-by: Baligh Uddin <baligh@google.com >
2013-11-06 17:38:47 +00:00
Baligh Uddin
8cc05b9e13
Add missing Camera2 project after a merge
...
Change-Id: Iba7579d6273ae02ae28711968d5c4d640ebbc465
Reviewed-on: https://googleplex-android-review.git.corp.google.com/385338
Reviewed-by: Baligh Uddin <baligh@google.com >
2013-11-06 17:03:41 +00:00
Baligh Uddin
e5a4868ec0
am fc8493aa: (-s ours) resolved conflicts for merge of aa06c824 to klp-dev-plus-aosp
...
* commit 'fc8493aa71174fde796ac0216275d71410d89e0d':
resolved conflicts for merge of aa06c824
2013-11-06 08:51:45 -08:00
Baligh Uddin
6afebb57d2
resolved conflicts for merge of 8766b10d to master
2013-11-06 08:48:13 -08:00
Chad Jones
9b9e0e8740
Add pdk group to device/generic/lionhead
...
Change-Id: I71c1461e1c1e40374e16916eebe3a0419e38896d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/385309
Reviewed-by: Geoff Mendal <mendal@google.com >
Reviewed-by: Dima Zavin <dmitriyz@google.com >
2013-11-06 07:23:02 +00:00
Baligh Uddin
fc8493aa71
resolved conflicts for merge of aa06c824 to klp-dev-plus-aosp
...
Change-Id: Idd62ad41ba3ea6128b457f84792a677d06253261
Reviewed-on: https://googleplex-android-review.git.corp.google.com/385308
Reviewed-by: Baligh Uddin <baligh@google.com >
2013-11-06 04:48:20 +00:00
Baligh Uddin
8766b10d68
resolved conflicts for merge of aa06c824 to klp-dev-plus-aosp
2013-11-05 20:26:20 -08:00
Baligh Uddin
a290449479
am e0c74d40: am 8ab0302a: (-s ours) resolved conflict for merge of 140fd73e into stage-aosp-master
...
* commit 'e0c74d40e410e07b8c5b0b146fe7ffc37a01ae1e':
Add new kitkat projects to AOSP master manifest
2013-11-05 16:02:31 -08:00
Baligh Uddin
e0c74d40e4
am 8ab0302a: (-s ours) resolved conflict for merge of 140fd73e into stage-aosp-master
...
* commit '8ab0302aa872b40a8eb5f473494d0cafd7780a85':
Add new kitkat projects to AOSP master manifest
2013-11-05 15:57:29 -08:00
Baligh Uddin
aa06c82468
am 793c8c9e: am ac39421e: Revert "Add new kitkat projects to AOSP master manifest"
...
* commit '793c8c9ecc0866d0640297f594c09a18bf5eaf52':
Revert "Add new kitkat projects to AOSP master manifest"
2013-11-05 15:15:17 -08:00
Baligh Uddin
8ab0302aa8
resolved conflict for merge of 140fd73e into stage-aosp-master
2013-11-05 14:55:21 -08:00
Baligh Uddin
793c8c9ecc
am ac39421e: Revert "Add new kitkat projects to AOSP master manifest"
...
* commit 'ac39421e93789ce918f9d4b268960cca0dde174d':
Revert "Add new kitkat projects to AOSP master manifest"
2013-11-05 22:16:21 +00:00
The Android Open Source Project
140fd73e5b
am e3c3ebfd: Add new kitkat projects to AOSP master manifest
...
* commit 'e3c3ebfd2558f84347671f3ae4cf5ea7b1e748de':
Add new kitkat projects to AOSP master manifest
2013-11-05 22:16:20 +00:00
Geoff Mendal
6b6365cfd2
am 68ee96fa: resolved conflicts for merge of da8bf313 to klp-dev-plus-aosp
...
* commit '68ee96fafe24275a5053715baac58868b4a4ba4a':
klp-docs manifest Bug: 11386893
2013-11-04 21:39:32 -08:00
Geoff Mendal
68ee96fafe
resolved conflicts for merge of da8bf313 to klp-dev-plus-aosp
2013-11-04 21:36:19 -08:00
Baligh Uddin
ac39421e93
Revert "Add new kitkat projects to AOSP master manifest"
...
This reverts commit e3c3ebfd25
2013-11-02 00:17:49 +00:00
The Android Open Source Project
e3c3ebfd25
Add new kitkat projects to AOSP master manifest
2013-11-01 16:28:03 -07:00
Geoff Mendal
dc41b31fd6
Add project platform/external/roboto-fonts
...
Bug: 11473974
Change-Id: I4f80b406753277f6e987a2bda37d018e763cfa94
Reviewed-on: https://googleplex-android-review.git.corp.google.com/383489
Reviewed-by: Raph Levien <raph@google.com >
2013-11-01 16:16:46 +00:00
Geoff Mendal
da8bf313a8
klp-docs manifest
...
Bug: 11386893
2013-10-30 11:58:13 -07:00
Geoff Mendal
b593e88e53
Add project platform/prebuilts/libs/libedit
...
Bug: 11444204
Change-Id: I0677f1ac7af67ead24280d6b16b514a3252fa1e3
Reviewed-on: https://googleplex-android-review.git.corp.google.com/382370
Reviewed-by: Todd Fiala <tfiala@google.com >
2013-10-30 16:04:18 +00:00
Geoff Mendal
6648e3eb2f
Add project device/generic/lionhead
...
Bug: 11431937
Change-Id: I61c87763c88332ecc71c0b447a4cc2ef5149a056
Reviewed-on: https://googleplex-android-review.git.corp.google.com/381828
Reviewed-by: Dima Zavin <dmitriyz@google.com >
2013-10-29 19:03:34 +00:00
Geoff Mendal
af0978837a
Add external/libedit for master
...
Bug: 11428186
Change-Id: I1e376f004d73bfecad5a9947f420429ad624deb4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/381702
Reviewed-by: Todd Fiala <tfiala@google.com >
2013-10-29 15:46:47 +00:00
Qiwen Zhao
fe44961bbe
adding klp-volantis-dev manifest.
2013-10-28 13:17:39 -07:00
Qiwen Zhao
e8aa3ef672
am 0410e007: am 5feea2f0: am 1b694820: (-s ours) fixing missing closure
...
* commit '0410e007609d7cbf31dc63c2273ec5d59bf2b040':
fixing missing closure
2013-10-24 15:33:54 -07:00
Qiwen Zhao
0410e00760
am 5feea2f0: am 1b694820: (-s ours) fixing missing closure
...
* commit '5feea2f0792565a3863f819813f5a84bbbdd74fc':
fixing missing closure
2013-10-24 15:30:58 -07:00
Qiwen Zhao
5feea2f079
am 1b694820: (-s ours) fixing missing closure
...
* commit '1b6948204aea752bd2234c26d8083b9969be3ec0':
fixing missing closure
2013-10-24 15:28:29 -07:00
Qiwen Zhao
1b6948204a
fixing missing closure
2013-10-24 15:21:04 -07:00
Conley Owens
ccca9c9529
am a7988355: am becb9783: am bdac56f5: (-s ours) Restore default revision in mirror manifest
...
* commit 'a79883550fa590f640b4397abf5bcc1ac8fced2f':
Restore default revision in mirror manifest
2013-10-24 14:33:31 -07:00
Conley Owens
a79883550f
am becb9783: am bdac56f5: (-s ours) Restore default revision in mirror manifest
...
* commit 'becb978321a28261163dedc65aca83dc9f380a35':
Restore default revision in mirror manifest
2013-10-24 14:31:41 -07:00
Conley Owens
becb978321
am bdac56f5: (-s ours) Restore default revision in mirror manifest
...
* commit 'bdac56f5a6fa326865f4a8efde449a331fde5663':
Restore default revision in mirror manifest
2013-10-24 14:29:14 -07:00
Conley Owens
bdac56f5a6
Restore default revision in mirror manifest
...
We had accidentally blown the default revision by setting up
replication. Instead we need to directly replicate to the (newly
formed) pre-mirror-aosp-master branch and then automerge from there into
here.
Change-Id: Ibe1b1ba58c0d28e05ffda6fd5dbfb3254ef4febc
Reviewed-on: https://googleplex-android-review.git.corp.google.com/380179
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-10-24 21:22:25 +00:00
Kenny Root
e436237e98
am 712d0e5d: am 154a20c5: am 616b4d03: (-s ours) Add bouncycastle to the pdk group
...
* commit '712d0e5da3c91792d2b3dc6a9a0e5299d2e25b39':
Add bouncycastle to the pdk group
2013-10-22 12:02:17 -07:00
Ben Cheng
baef79cc21
am cb557d85: am 8d20a14d: am 1a368cb0: (-s ours) Add various gcc-4.8 projects.
...
* commit 'cb557d85972e340a0ac325c61ae42617955992d9':
Add various gcc-4.8 projects.
2013-10-22 12:02:16 -07:00
Conley Owens
906df7774b
am 41b6083b: am 73f58baa: am fcfe1e98: (-s ours) Remove the hardware/msm7k project
...
* commit '41b6083b36e6e029d55368ff0d4d282b44be8d1f':
Remove the hardware/msm7k project
2013-10-22 12:02:15 -07:00
Christopher Ferris
47b2fed12f
am 06157719: am db791284: am 50c7e543: (-s ours) Remove the pdk group for libunwind.
...
* commit '06157719b0a33dfb5394a158d32bda4489fd7dae':
Remove the pdk group for libunwind.
2013-10-22 12:02:13 -07:00
Geoff Mendal
394d658976
am fa37d433: am a431a99e: am 61f86fa3: (-s ours) Add platform/external/conscrypt to master
...
* commit 'fa37d433e366bd067a6df87cd1d9b6e60d3a689f':
Add platform/external/conscrypt to master
2013-10-22 12:02:12 -07:00
Christopher Ferris
cced2fb4a9
am 44a00c68: am cd32ec59: am b199a962: (-s ours) Add external/libunwind to manifest.
...
* commit '44a00c68e3a66bbe190ac836a92dc299a068a0b2':
Add external/libunwind to manifest.
2013-10-22 12:02:08 -07:00
Baligh Uddin
34513ced66
am 9f9ad299: am b2969010: am c5830705: (-s ours) Add tools/studio/translation to AOSP master manifest
...
* commit '9f9ad29945284340b7ac9d77f7dc03c45c7c5041':
Add tools/studio/translation to AOSP master manifest
2013-10-22 12:02:07 -07:00
The Android Open Source Project
f10a4497a9
am 6a22fd17: am c6ecdcd2: am 1c546d57: (-s ours) Remove obsolete ping/ping6
...
* commit '6a22fd17e1d35fb31af88758d2ebcf7585e8cde2':
Remove obsolete ping/ping6
2013-10-22 12:02:05 -07:00
The Android Open Source Project
c79cb605ae
am 17a974c7: am f19f68f8: am b0ff0cc0: (-s ours) Updated master manifest after jb-mr2-dev
...
* commit '17a974c7bf565791f0632184b388b80a996c32d1':
Add device/ and hardware/ for 4.2.2
2013-10-22 12:02:04 -07:00
The Android Open Source Project
2e987164dc
am 5b4a72b3: am d7bacd23: am 83b76775: (-s ours) Add x86_64 toolchains
...
* commit '5b4a72b30ed744ad218679fa9ced07f6e5886b38':
Add x86_64 toolchains
2013-10-22 12:02:03 -07:00
The Android Open Source Project
2e216b0b8a
am df09218c: am cf955af0: am 022658e6: (-s ours) Add new projects - iputils, studio/cloud
...
* commit 'df09218cc92ee2a428951454855dedbbe6a80cdc':
Add new projects - iputils, studio/cloud
2013-10-22 12:02:01 -07:00
The Android Open Source Project
ab69d628b8
am 051c7711: am 2cbfc6f3: am 1fed5706: (-s ours) New projects for telephony and prebuilt python
...
* commit '051c7711547f2acec72dd064fa2ac4fd7bcad969':
New projects for telephony and prebuilt python
2013-10-22 12:02:00 -07:00
The Android Open Source Project
e264a40337
am 3c848e58: am f430be7f: am 27ce518b: (-s ours) Add scrypt and prebuilt clang projects
...
* commit '3c848e5863711d68c306b466e8e119f3bc3d414c':
Add scrypt and prebuilt clang projects
2013-10-22 12:01:54 -07:00
The Android Open Source Project
d59c3b53c3
am 0c56fc27: am f95384df: am 659b6584: (-s ours) Un-branch master-dalvik from master
...
* commit '0c56fc2715c5d49f7f350d727ca155d2f176009a':
2013-10-22 12:01:52 -07:00
The Android Open Source Project
6ac22920f5
am d7176021: am f1dd3f4b: am ced9b333: (-s ours) Add idea projects
...
* commit 'd717602117ce9fd79f8467b3424746e5fd7db58e':
Add idea projects
2013-10-22 12:01:50 -07:00
The Android Open Source Project
cab3d2f968
am 4c7d2fb4: am 2cfb0046: am 70c902cf: (-s ours) Add device/ and hardware/ for 4.2.2
...
* commit '4c7d2fb4dc7f24937fe331a965cac1f48fffe3e8':
Add device/ and hardware/ for 4.2.2
2013-10-22 12:01:49 -07:00
The Android Open Source Project
30250d56ae
am 2ab1f392: am 3f69a246: am d56f7074: (-s ours) Update master manifest to match jb-mr1.1-dev
...
* commit '2ab1f3925d59ca17210431d6a2a29b542e7fe07b':
Manifest for jb-mr1.1-dev
Extra projects to match release branch
Manifest for jb-mr1-dev
2013-10-22 12:01:47 -07:00
The Android Open Source Project
e14b290087
am ec9e2556: am 7e5125e9: am c8a40b6b: (-s ours) Add tools groups on prebuilts/tools
...
* commit 'ec9e25563b9cba87edbd1c5d50a62995e91c32d7':
Add tools groups on prebuilts/tools
2013-10-22 12:01:46 -07:00
The Android Open Source Project
3224d1d3c7
am 036c1e13: am 35d5de31: am bc65e60b: (-s ours) Add mockito and objenesis
...
* commit '036c1e13dafa69f2c0c1947f9f1230155ef98aa0':
Add mockito and objenesis
2013-10-22 12:01:45 -07:00
The Android Open Source Project
c6bbec1ba9
am 4b9c6ea0: am d563abdb: am e046a83b: (-s ours) Add nist-pkits
...
* commit '4b9c6ea05aa08bdf7297cb231b7e8a65fe7ce765':
Add nist-pkits
2013-10-22 12:01:43 -07:00
The Android Open Source Project
87f8654352
am 8aabba8e: am 32798ec4: am e4b6c172: (-s ours) New location for fat32lib
...
* commit '8aabba8ec5e123687182c4c80f4cc01768126f9b':
New location for fat32lib
2013-10-22 12:01:42 -07:00
The Android Open Source Project
d53ee5a31e
am bf3ed28d: am 1b9e9b6a: am 6747c5e5: (-s ours) Add prebuilts/devtools
...
* commit 'bf3ed28d78c4ed112a18765cd60c2a3cee3798e6':
Add prebuilts/devtools
2013-10-22 12:01:41 -07:00
The Android Open Source Project
e6987db054
am 3dc6d2ac: am 4ae4a279: am 70b1a769: (-s ours) Modernize the manifest groups
...
* commit '3dc6d2acda80079f861ee6adea270027dfa33efa':
Modernize the manifest groups
2013-10-22 12:01:40 -07:00
The Android Open Source Project
e521f609c3
am 92bb766b: am 1de131b4: am b05bfe82: (-s ours) Add new devtools projects
...
* commit '92bb766b1203c8fbc457a50602d9ff39c569d096':
Add new devtools projects
2013-10-22 12:01:39 -07:00
The Android Open Source Project
cac9c724ed
am f5d39be9: am 7dc15a68: am b1bab4dc: (-s ours) Add new devtools projects
...
* commit 'f5d39be966a62b4d50306dba51f8ef23baf6998c':
Add new devtools projects
2013-10-22 12:01:37 -07:00
The Android Open Source Project
d92eeafa3e
am a10e4fb7: am 9b7609af: am a1123ee5: (-s ours) Tune tools groups
...
* commit 'a10e4fb7fad55a3155607605ec61c43dc3b14e55':
Tune tools groups
2013-10-22 12:01:36 -07:00
The Android Open Source Project
413be55db9
am ba5ca2c1: am 5bc34e05: am 596d9d99: (-s ours) Add tools/base
...
* commit 'ba5ca2c161e8f0f63e2f9befe91d1158a2b79cee':
Add tools/base
2013-10-22 12:01:35 -07:00
The Android Open Source Project
0b2a5783f8
am 696f8b91: am 39268f30: am 50138b5a: (-s ours) Add darwin host headers
...
* commit '696f8b914b7bdf4abe42d48a24e4b410c9800837':
Add darwin host headers
2013-10-22 12:01:34 -07:00
The Android Open Source Project
bfdd2f3487
am 57f35f87: am 78689a99: am 0cc40d32: (-s ours) Add eigen
...
* commit '57f35f87ee693a1ef38284aeb20e90267b0619ab':
Add eigen
2013-10-22 12:01:33 -07:00
The Android Open Source Project
995244ca10
am 559db065: am 7bb66485: am aefb1473: (-s ours) Extra projects to match release branch
...
* commit '559db0651857cdd3cb775f9bf05560767d542648':
Extra projects to match release branch
2013-10-22 12:01:31 -07:00
The Android Open Source Project
d2724623bd
am 447c58c3: am 466aa85a: am cb5004d3: (-s ours) Manifest for master, updated for 4.2
...
* commit '447c58c32b73669b2fecf72ac9f7b28a54dda50d':
Manifest for master, updated for 4.2
2013-10-22 12:01:30 -07:00
The Android Open Source Project
642c56e5a0
am d1727ef8: am 0d623d92: am fe20f3cb: (-s ours) Add MacOS host toolchain
...
* commit 'd1727ef8e624c08b832904ca2323605554249d50':
Add MacOS host toolchain
2013-10-22 12:01:29 -07:00
The Android Open Source Project
e49752e47f
am f6ab7789: am 7b7ea8e4: am dfefa4af: (-s ours) Add frameworks/volley
...
* commit 'f6ab778909aa2c621c8b1324d99bd11fc44b890d':
Add frameworks/volley
2013-10-22 12:01:28 -07:00
The Android Open Source Project
a891b33d81
am 0d7f7744: am 3c8e7a0c: am f1b2e439: (-s ours) Add projects for gcc 4.7 prebuilts
...
* commit '0d7f774455562bbaeed189beefdb8e09be080d08':
Add projects for gcc 4.7 prebuilts
2013-10-22 12:01:27 -07:00
The Android Open Source Project
b32e3d5f60
am 69e0afa6: am 25ff5bed: am d1848bab: (-s ours) Add harfbuzz_ng
...
* commit '69e0afa6ef4117c2ebf86ad983a025b0a9e4a826':
Add harfbuzz_ng
2013-10-22 12:01:25 -07:00
The Android Open Source Project
d51ec0005d
am 80e64894: am 56d41062: am db11c6ad: (-s ours) Base manifest for 4.2 GPL components
...
* commit '80e64894beca1316b557fb4979d59610ad5ad3a1':
Base manifest for 4.2 GPL components
2013-10-22 12:01:24 -07:00
The Android Open Source Project
32be2d3fcf
am eedb4243: am ced6d2be: am f46b8df3: (-s ours) Replace torospr with toroplus
...
* commit 'eedb42436b78b2d289cd0605ba77380e7562b979':
Replace torospr with toroplus
2013-10-22 12:01:23 -07:00
The Android Open Source Project
190c9729fd
am 2ebe35f8: am 9932f838: am a89ea088: (-s ours) Add hardware/akm
...
* commit '2ebe35f833e00a30ba592be1a16f0be14766abd3':
Add hardware/akm
2013-10-22 12:01:18 -07:00
The Android Open Source Project
9351876256
am 674dfb62: am 9355cbb0: am 08dca174: (-s ours) Add optional eclipse-related prebuilts
...
* commit '674dfb622d0243a3f2099ae5526aece05d1e85ea':
Add optional eclipse-related prebuilts
2013-10-22 12:01:17 -07:00
The Android Open Source Project
002ffbecb1
am 6f7a5241: am 43510b65: am a07bad60: (-s ours) Unmap MIPS 4.4 toolchains
...
* commit '6f7a5241805bd3ca77a4ce76e0fa5a31b23fa006':
Unmap MIPS 4.4 toolchains
2013-10-22 12:01:15 -07:00
The Android Open Source Project
c5d3ceb35c
am e77d642b: am a6f33a29: am 4cf09a29: (-s ours) Add fat32lib
...
* commit 'e77d642b67cd07a06c87704eb634c20140f4e690':
Add fat32lib
2013-10-22 12:01:14 -07:00
The Android Open Source Project
480094458d
am efcd6aa7: am 94d88cb5: am 7d0d8f01: (-s ours) Add device/sony/lt26
...
* commit 'efcd6aa7c003a1e4e746fb4f15a41e213df43b3d':
Add device/sony/lt26
2013-10-22 12:01:12 -07:00
The Android Open Source Project
8b1e56e7ad
am 66cac91d: am 0168606d: am 73ce405e: (-s ours) give tools/build its own group
...
* commit '66cac91d8961fee90db71114cd7a169800e28374':
give tools/build its own group
2013-10-22 12:01:11 -07:00
The Android Open Source Project
825ce6530e
am 160b9754: am 47d364a2: am d479f201: (-s ours) Update projects
...
* commit '160b9754f7de42dbf5491d136f244c681402de57':
Update projects
2013-10-22 12:01:10 -07:00
The Android Open Source Project
b12ace35e9
am a294c8d5: am cf7089aa: am 25a5770c: (-s ours) Add manifest groups.
...
* commit 'a294c8d55441213ecbcd15a868ea5898723ccf62':
Add manifest groups.
2013-10-22 12:01:08 -07:00
The Android Open Source Project
ba99a12373
am 4c6c43b5: am 8d0d5e9f: am ce42277e: (-s ours) Add motodev
...
* commit '4c6c43b53161f2b9508ca7b0135f0277d4fab681':
Add motodev
2013-10-22 12:01:07 -07:00
The Android Open Source Project
f0ca595c3b
am 4a50d676: am 948c7a54: am 6f056451: (-s ours) Update manifest for Jelly Bean
...
* commit '4a50d6766eb03c22c2e4b6ca297d30ab605893d2':
Update manifest for Jelly Bean
2013-10-22 12:01:06 -07:00
The Android Open Source Project
ff0818ba2c
am da145320: am bf185341: am 39541968: (-s ours) Add aac and gcc-demangle
...
* commit 'da145320b69a0787e7d26e723507e77a7f209984':
Add aac and gcc-demangle
2013-10-22 12:01:04 -07:00
The Android Open Source Project
c5f1ba89f5
am b0abef19: am 7aeb0f60: am 0cd29e3a: (-s ours) Switch to snapshots for dalvik and libcore
...
* commit 'b0abef1955927771da82c79338125fa2ef6a534e':
Switch to snapshots for dalvik and libcore
2013-10-22 12:01:03 -07:00
The Android Open Source Project
5688fa1cb8
am dd519999: am 9e0719b5: am b5a0d13b: (-s ours) Add chromium-trace
...
* commit 'dd519999f306f0315e3d58660f9a27e460776f0e':
Add chromium-trace
2013-10-22 12:01:02 -07:00
The Android Open Source Project
bbca1b1357
am 32626ab6: am 885c3e99: am 00ece54b: (-s ours) Remove i686-android-linux-4.4.3 toolchain
...
* commit '32626ab6a8fdf978772ae6c879d44d4a103108f1':
Remove i686-android-linux-4.4.3 toolchain
2013-10-22 12:01:00 -07:00
The Android Open Source Project
7fb1414e73
am 1225400c: am 32713903: am 8c701771: (-s ours) Add ant-glob
...
* commit '1225400cbc7a7d5c461f5fce054fface402b3a16':
Add ant-glob
2013-10-22 12:00:59 -07:00
The Android Open Source Project
0a930ce55e
am ada49e76: am f6a79b9e: am 03fc9565: (-s ours) Add prebuilts/misc
...
* commit 'ada49e7608b73b71ebbff55d2fcf4bf8268c8fa3':
Add prebuilts/misc
2013-10-22 12:00:58 -07:00
The Android Open Source Project
13af7305c3
am f138c5b0: am 1415d76b: am 8f95dff3: (-s ours) Switch to the proper location of IA 4.6 toolchain
...
* commit 'f138c5b031015dc46db94df613384e087c413bdd':
Switch to the proper location of IA 4.6 toolchain
2013-10-22 12:00:57 -07:00
The Android Open Source Project
a7084d6600
am a3996d8e: am cdc2a45d: am e56e10bf: (-s ours) Add 4.6 toolchains
...
* commit 'a3996d8eb7798ff9d5ee30c08860d89084430632':
Add 4.6 toolchains
2013-10-22 12:00:55 -07:00
The Android Open Source Project
76924e83bb
am a4c453fb: am 29bd36b6: am 527678f0: (-s ours) Add new toolchains
...
* commit 'a4c453fb7621dbc2adca307c98dcfaeae5c3ec57':
Add new toolchains
2013-10-22 12:00:54 -07:00
The Android Open Source Project
83b9169d64
am 8d1525ff: am 3444267d: am 23f0e783: (-s ours) Add prebuilts/eclipse
...
* commit '8d1525ff8f79fcc94a4d8d13852452926814625f':
Add prebuilts/eclipse
2013-10-22 12:00:53 -07:00
The Android Open Source Project
9da6340365
am 80c7b5a8: am 912bc11c: am 9a452a71: (-s ours) Add MIPS toolchains
...
* commit '80c7b5a8f90db4889d78c997ddaa20032d4d7a34':
Add MIPS toolchains
2013-10-22 12:00:52 -07:00
The Android Open Source Project
1643888b28
am 2eb7ecfb: am f0e84e13: am 1dd8491e: (-s ours) Add checkpolicy
...
* commit '2eb7ecfb0f2862f9e700a978d8d0cde3338ba81e':
Add checkpolicy
2013-10-22 12:00:51 -07:00
The Android Open Source Project
d1713d3091
am 1f8827fd: am 427f4b3a: am 12c5c7e4: (-s ours) Add basebuilder
...
* commit '1f8827fd7f09434b71861221aaa9989ade969097':
Add basebuilder
2013-10-22 12:00:49 -07:00
The Android Open Source Project
95a4db8581
am 5ae3b20a: am edd311d4: am dd6bc4ec: (-s ours) Merge from ics-mr1, add torospr
...
* commit '5ae3b20acd3bed31e2af8dc9586b4d6b5c5db528':
Add torospr
Add replicaisland
Manifest for icr-mr1
2013-10-22 12:00:48 -07:00
The Android Open Source Project
f6e3aee90a
am f1bf92f4: am 53c25207: am 2ba9cf74: (-s ours) Add clat and gcc 4.6 host prebuilts
...
* commit 'f1bf92f44abb64b96d0c870b6012f2c43dd788ce':
Add clat and gcc 4.6 host prebuilts
2013-10-22 12:00:46 -07:00
The Android Open Source Project
ef1d29c0eb
am 97c33f8a: am 364f7919: am 422710ca: (-s ours) Add windowbuilder
...
* commit '97c33f8a6f7d5b97744babfa0b2e394577e99148':
Add windowbuilder
2013-10-22 12:00:45 -07:00
The Android Open Source Project
297d584ca1
am acc3b756: am 4d85d5e7: am e8fe688b: (-s ours) add ti/wpan
...
* commit 'acc3b7564766b10a1ca572d8990bdd8b054e0928':
add ti/wpan
Add selinux-related projects
Add replicaisland
Add review URI.
Add new projects to match 4.0.3
Add prebuilts/qemu-kernel and prebuilts/tools
Manifest for post-ICS master
Bases on top of which the GPL components of 3.0 and 3.1 can be built
Base on top of which the GPL components of 3.2 can be built
Add external/qemu-pc-bios
Switch to a relative fetch URI
Restore additional projects.
Set sync default to -j4
Initial manifest for gingerbread
First pass at master manifest
Start from an empty project
2013-10-22 12:00:44 -07:00
Kenny Root
712d0e5da3
am 154a20c5: am 616b4d03: (-s ours) Add bouncycastle to the pdk group
...
* commit '154a20c57e5f995b8be21d5fae001792494cf006':
Add bouncycastle to the pdk group
2013-10-22 11:55:41 -07:00
Ben Cheng
cb557d8597
am 8d20a14d: am 1a368cb0: (-s ours) Add various gcc-4.8 projects.
...
* commit '8d20a14dc8aab4286adc99a2a6803cb50b98386c':
Add various gcc-4.8 projects.
2013-10-22 11:55:38 -07:00
Conley Owens
41b6083b36
am 73f58baa: am fcfe1e98: (-s ours) Remove the hardware/msm7k project
...
* commit '73f58baaf7158e9f80e6647e6e104043a398f51d':
Remove the hardware/msm7k project
2013-10-22 11:55:37 -07:00
Christopher Ferris
06157719b0
am db791284: am 50c7e543: (-s ours) Remove the pdk group for libunwind.
...
* commit 'db79128443bd8945ef118434f7f7af8204727732':
Remove the pdk group for libunwind.
2013-10-22 11:55:36 -07:00
Geoff Mendal
fa37d433e3
am a431a99e: am 61f86fa3: (-s ours) Add platform/external/conscrypt to master
...
* commit 'a431a99e293f19c42928b0f10658a6a8396b4df9':
Add platform/external/conscrypt to master
2013-10-22 11:55:35 -07:00
Christopher Ferris
44a00c68e3
am cd32ec59: am b199a962: (-s ours) Add external/libunwind to manifest.
...
* commit 'cd32ec59d1b7f1b2493e32ae387ab8121e74779e':
Add external/libunwind to manifest.
2013-10-22 11:55:33 -07:00
Baligh Uddin
9f9ad29945
am b2969010: am c5830705: (-s ours) Add tools/studio/translation to AOSP master manifest
...
* commit 'b2969010f441aaffe421ac762ef8b92ca23b6ee0':
Add tools/studio/translation to AOSP master manifest
2013-10-22 11:55:32 -07:00
The Android Open Source Project
6a22fd17e1
am c6ecdcd2: am 1c546d57: (-s ours) Remove obsolete ping/ping6
...
* commit 'c6ecdcd2e7ca996ac5920180cb7ea1c68683096d':
Remove obsolete ping/ping6
2013-10-22 11:55:31 -07:00
The Android Open Source Project
17a974c7bf
am f19f68f8: am b0ff0cc0: (-s ours) Updated master manifest after jb-mr2-dev
...
* commit 'f19f68f87fe2f41fa1133991456885e9b42d6003':
Add device/ and hardware/ for 4.2.2
2013-10-22 11:55:29 -07:00
The Android Open Source Project
5b4a72b30e
am d7bacd23: am 83b76775: (-s ours) Add x86_64 toolchains
...
* commit 'd7bacd23af72638792fc8de88dc48b03fdac4c5b':
Add x86_64 toolchains
2013-10-22 11:55:28 -07:00
The Android Open Source Project
df09218cc9
am cf955af0: am 022658e6: (-s ours) Add new projects - iputils, studio/cloud
...
* commit 'cf955af0ebda0bd676c21c4281c21aae7af9d455':
Add new projects - iputils, studio/cloud
2013-10-22 11:55:26 -07:00
The Android Open Source Project
051c771154
am 2cbfc6f3: am 1fed5706: (-s ours) New projects for telephony and prebuilt python
...
* commit '2cbfc6f3ac34eca5b073fe6f874009d722d3bd17':
New projects for telephony and prebuilt python
2013-10-22 11:55:25 -07:00
The Android Open Source Project
3c848e5863
am f430be7f: am 27ce518b: (-s ours) Add scrypt and prebuilt clang projects
...
* commit 'f430be7f7c89d9a1d117617491193df2dade1646':
Add scrypt and prebuilt clang projects
2013-10-22 11:55:23 -07:00
The Android Open Source Project
0c56fc2715
am f95384df: am 659b6584: (-s ours) Un-branch master-dalvik from master
...
* commit 'f95384df045ebd51e7a4e6055966c143955f9a9c':
2013-10-22 11:55:22 -07:00
The Android Open Source Project
d717602117
am f1dd3f4b: am ced9b333: (-s ours) Add idea projects
...
* commit 'f1dd3f4be36619e5514a3d7dcc5c417df425fd87':
Add idea projects
2013-10-22 11:55:14 -07:00
The Android Open Source Project
4c7d2fb4dc
am 2cfb0046: am 70c902cf: (-s ours) Add device/ and hardware/ for 4.2.2
...
* commit '2cfb0046a406e2d7616176ecc73852d95d844365':
Add device/ and hardware/ for 4.2.2
2013-10-22 11:55:13 -07:00
The Android Open Source Project
2ab1f3925d
am 3f69a246: am d56f7074: (-s ours) Update master manifest to match jb-mr1.1-dev
...
* commit '3f69a246998bf05f60487a0b38f63fe7e4c6003c':
Manifest for jb-mr1.1-dev
Extra projects to match release branch
Manifest for jb-mr1-dev
2013-10-22 11:55:11 -07:00
The Android Open Source Project
ec9e25563b
am 7e5125e9: am c8a40b6b: (-s ours) Add tools groups on prebuilts/tools
...
* commit '7e5125e92b22201528b8e5a630b38799d320a4a8':
Add tools groups on prebuilts/tools
2013-10-22 11:55:10 -07:00
The Android Open Source Project
036c1e13da
am 35d5de31: am bc65e60b: (-s ours) Add mockito and objenesis
...
* commit '35d5de31eb53469cadd6c8bc489b9d551b5f6a3c':
Add mockito and objenesis
2013-10-22 11:55:08 -07:00
The Android Open Source Project
4b9c6ea05a
am d563abdb: am e046a83b: (-s ours) Add nist-pkits
...
* commit 'd563abdb6f3037583a53038cf96a5cb9322d7717':
Add nist-pkits
2013-10-22 11:55:07 -07:00
The Android Open Source Project
8aabba8ec5
am 32798ec4: am e4b6c172: (-s ours) New location for fat32lib
...
* commit '32798ec4b81b3685dc8cd0c81371cea779de79fc':
New location for fat32lib
2013-10-22 11:55:06 -07:00
The Android Open Source Project
bf3ed28d78
am 1b9e9b6a: am 6747c5e5: (-s ours) Add prebuilts/devtools
...
* commit '1b9e9b6ac3aa709194d51668b83707c48439fdf8':
Add prebuilts/devtools
2013-10-22 11:55:04 -07:00
The Android Open Source Project
3dc6d2acda
am 4ae4a279: am 70b1a769: (-s ours) Modernize the manifest groups
...
* commit '4ae4a279febe065e88eaa3795f06ee32e74752b5':
Modernize the manifest groups
2013-10-22 11:55:03 -07:00
The Android Open Source Project
92bb766b12
am 1de131b4: am b05bfe82: (-s ours) Add new devtools projects
...
* commit '1de131b48b8ebb5989efc7aec5b1f6f4fd498041':
Add new devtools projects
2013-10-22 11:55:02 -07:00
The Android Open Source Project
f5d39be966
am 7dc15a68: am b1bab4dc: (-s ours) Add new devtools projects
...
* commit '7dc15a68e82821ea2a64db112d417566204fb879':
Add new devtools projects
2013-10-22 11:55:01 -07:00
The Android Open Source Project
a10e4fb7fa
am 9b7609af: am a1123ee5: (-s ours) Tune tools groups
...
* commit '9b7609af820a460691c17549812db4df08854c1e':
Tune tools groups
2013-10-22 11:55:00 -07:00
The Android Open Source Project
ba5ca2c161
am 5bc34e05: am 596d9d99: (-s ours) Add tools/base
...
* commit '5bc34e053a3ea82e1989bc03690d978333d97ff0':
Add tools/base
2013-10-22 11:54:58 -07:00
The Android Open Source Project
696f8b914b
am 39268f30: am 50138b5a: (-s ours) Add darwin host headers
...
* commit '39268f301216f5bb0b4ffc9dece90290c90452ec':
Add darwin host headers
2013-10-22 11:54:57 -07:00
The Android Open Source Project
57f35f87ee
am 78689a99: am 0cc40d32: (-s ours) Add eigen
...
* commit '78689a99b99497d146dc57900fa6ff2b2d1b23b0':
Add eigen
2013-10-22 11:54:56 -07:00
The Android Open Source Project
559db06518
am 7bb66485: am aefb1473: (-s ours) Extra projects to match release branch
...
* commit '7bb6648571e0c7b43e09354a31a57434a42da966':
Extra projects to match release branch
2013-10-22 11:54:55 -07:00
The Android Open Source Project
447c58c32b
am 466aa85a: am cb5004d3: (-s ours) Manifest for master, updated for 4.2
...
* commit '466aa85a649dee67c8358dad75f9b7be3422faa3':
Manifest for master, updated for 4.2
2013-10-22 11:54:53 -07:00
The Android Open Source Project
d1727ef8e6
am 0d623d92: am fe20f3cb: (-s ours) Add MacOS host toolchain
...
* commit '0d623d9246a9485da54bdd729af9c80236e23630':
Add MacOS host toolchain
2013-10-22 11:54:52 -07:00
The Android Open Source Project
f6ab778909
am 7b7ea8e4: am dfefa4af: (-s ours) Add frameworks/volley
...
* commit '7b7ea8e47e479f1082c1d00e0095fb1341358a7b':
Add frameworks/volley
2013-10-22 11:54:51 -07:00
The Android Open Source Project
0d7f774455
am 3c8e7a0c: am f1b2e439: (-s ours) Add projects for gcc 4.7 prebuilts
...
* commit '3c8e7a0c83457b6805a16f4bfbec3c84b7b0066c':
Add projects for gcc 4.7 prebuilts
2013-10-22 11:54:49 -07:00
The Android Open Source Project
69e0afa6ef
am 25ff5bed: am d1848bab: (-s ours) Add harfbuzz_ng
...
* commit '25ff5bed70da403293bb5e18802d8da1150cd875':
Add harfbuzz_ng
2013-10-22 11:54:48 -07:00
The Android Open Source Project
80e64894be
am 56d41062: am db11c6ad: (-s ours) Base manifest for 4.2 GPL components
...
* commit '56d4106201b6d13d41fc753994b94c7426bbb62d':
Base manifest for 4.2 GPL components
2013-10-22 11:54:47 -07:00
The Android Open Source Project
eedb42436b
am ced6d2be: am f46b8df3: (-s ours) Replace torospr with toroplus
...
* commit 'ced6d2be5406ea635d1f8914221356f35ba99fea':
Replace torospr with toroplus
2013-10-22 11:54:45 -07:00
The Android Open Source Project
2ebe35f833
am 9932f838: am a89ea088: (-s ours) Add hardware/akm
...
* commit '9932f838ea19d35660284adab372a305f8f018bd':
Add hardware/akm
2013-10-22 11:54:44 -07:00
The Android Open Source Project
674dfb622d
am 9355cbb0: am 08dca174: (-s ours) Add optional eclipse-related prebuilts
...
* commit '9355cbb0c0d78c4ce4ca159221ccb6c67b38ec06':
Add optional eclipse-related prebuilts
2013-10-22 11:54:43 -07:00
The Android Open Source Project
6f7a524180
am 43510b65: am a07bad60: (-s ours) Unmap MIPS 4.4 toolchains
...
* commit '43510b65a3965806566ea716e00151159145c07c':
Unmap MIPS 4.4 toolchains
2013-10-22 11:54:41 -07:00
The Android Open Source Project
e77d642b67
am a6f33a29: am 4cf09a29: (-s ours) Add fat32lib
...
* commit 'a6f33a29840547a98942131afce82e81fa1299c1':
Add fat32lib
2013-10-22 11:54:40 -07:00
The Android Open Source Project
efcd6aa7c0
am 94d88cb5: am 7d0d8f01: (-s ours) Add device/sony/lt26
...
* commit '94d88cb57678abc79cad75bd070567da49ddfc76':
Add device/sony/lt26
2013-10-22 11:54:39 -07:00
The Android Open Source Project
66cac91d89
am 0168606d: am 73ce405e: (-s ours) give tools/build its own group
...
* commit '0168606d31b9bc8095f4ee1f977945b805e92b8f':
give tools/build its own group
2013-10-22 11:54:37 -07:00
The Android Open Source Project
160b9754f7
am 47d364a2: am d479f201: (-s ours) Update projects
...
* commit '47d364a28d8fc5817894fde80f15ec6ff91bdaa2':
Update projects
2013-10-22 11:54:36 -07:00
The Android Open Source Project
a294c8d554
am cf7089aa: am 25a5770c: (-s ours) Add manifest groups.
...
* commit 'cf7089aa28bfc9e48f8c6d7557d37a12af32d376':
Add manifest groups.
2013-10-22 11:54:35 -07:00
The Android Open Source Project
4c6c43b531
am 8d0d5e9f: am ce42277e: (-s ours) Add motodev
...
* commit '8d0d5e9ffca240874cad7e454b2f9c55a9a9bd7d':
Add motodev
2013-10-22 11:54:34 -07:00
The Android Open Source Project
4a50d6766e
am 948c7a54: am 6f056451: (-s ours) Update manifest for Jelly Bean
...
* commit '948c7a54d1b53ffee7539925946aff2572d56c7a':
Update manifest for Jelly Bean
2013-10-22 11:54:33 -07:00
The Android Open Source Project
da145320b6
am bf185341: am 39541968: (-s ours) Add aac and gcc-demangle
...
* commit 'bf185341cd3f8b9f0621c5b6ab80c11837996ace':
Add aac and gcc-demangle
2013-10-22 11:54:31 -07:00
The Android Open Source Project
b0abef1955
am 7aeb0f60: am 0cd29e3a: (-s ours) Switch to snapshots for dalvik and libcore
...
* commit '7aeb0f606aaf233d745d215dbd9146f833f90d0a':
Switch to snapshots for dalvik and libcore
2013-10-22 11:54:30 -07:00
The Android Open Source Project
dd519999f3
am 9e0719b5: am b5a0d13b: (-s ours) Add chromium-trace
...
* commit '9e0719b51e1c13b0a0fc9c5b1d7931eff52e214b':
Add chromium-trace
2013-10-22 11:54:29 -07:00
The Android Open Source Project
32626ab6a8
am 885c3e99: am 00ece54b: (-s ours) Remove i686-android-linux-4.4.3 toolchain
...
* commit '885c3e990def5fa6b72331d59e93096c20360c89':
Remove i686-android-linux-4.4.3 toolchain
2013-10-22 11:54:28 -07:00
The Android Open Source Project
1225400cbc
am 32713903: am 8c701771: (-s ours) Add ant-glob
...
* commit '32713903db446b7c802e5e54388ffda872e6cbec':
Add ant-glob
2013-10-22 11:54:26 -07:00
The Android Open Source Project
ada49e7608
am f6a79b9e: am 03fc9565: (-s ours) Add prebuilts/misc
...
* commit 'f6a79b9e257b93d10cf095367d22768603b340e9':
Add prebuilts/misc
2013-10-22 11:54:25 -07:00
The Android Open Source Project
f138c5b031
am 1415d76b: am 8f95dff3: (-s ours) Switch to the proper location of IA 4.6 toolchain
...
* commit '1415d76baa6de73f5403107c68a19d913bc28b2b':
Switch to the proper location of IA 4.6 toolchain
2013-10-22 11:54:23 -07:00
The Android Open Source Project
a3996d8eb7
am cdc2a45d: am e56e10bf: (-s ours) Add 4.6 toolchains
...
* commit 'cdc2a45d569ef0fe95538681f948b4aad56d1b46':
Add 4.6 toolchains
2013-10-22 11:54:19 -07:00
The Android Open Source Project
a4c453fb76
am 29bd36b6: am 527678f0: (-s ours) Add new toolchains
...
* commit '29bd36b6c90e745d0aff4420b6e1d5ba41176aa2':
Add new toolchains
2013-10-22 11:54:18 -07:00
The Android Open Source Project
8d1525ff8f
am 3444267d: am 23f0e783: (-s ours) Add prebuilts/eclipse
...
* commit '3444267d6bd65b9cca14c426f125c78420654820':
Add prebuilts/eclipse
2013-10-22 11:54:17 -07:00
The Android Open Source Project
80c7b5a8f9
am 912bc11c: am 9a452a71: (-s ours) Add MIPS toolchains
...
* commit '912bc11caad5277835909cd192e32513b07bd8da':
Add MIPS toolchains
2013-10-22 11:54:16 -07:00
The Android Open Source Project
2eb7ecfb0f
am f0e84e13: am 1dd8491e: (-s ours) Add checkpolicy
...
* commit 'f0e84e13cdd772cc984ab2d794ade3abceb2534a':
Add checkpolicy
2013-10-22 11:54:14 -07:00
The Android Open Source Project
1f8827fd7f
am 427f4b3a: am 12c5c7e4: (-s ours) Add basebuilder
...
* commit '427f4b3a2f8315e789f20bb1c15c413a5bd5baf8':
Add basebuilder
2013-10-22 11:54:13 -07:00
The Android Open Source Project
5ae3b20acd
am edd311d4: am dd6bc4ec: (-s ours) Merge from ics-mr1, add torospr
...
* commit 'edd311d4fac3fb2853e8b0f8cfdd55d417025ee0':
Add torospr
Add replicaisland
Manifest for icr-mr1
2013-10-22 11:54:12 -07:00
The Android Open Source Project
f1bf92f44a
am 53c25207: am 2ba9cf74: (-s ours) Add clat and gcc 4.6 host prebuilts
...
* commit '53c25207fd2dd03a5f76352e12fb90e52d7b1bd5':
Add clat and gcc 4.6 host prebuilts
2013-10-22 11:54:11 -07:00
The Android Open Source Project
97c33f8a6f
am 364f7919: am 422710ca: (-s ours) Add windowbuilder
...
* commit '364f79190ddbb4643719dbf7cab5b7c5c8d72338':
Add windowbuilder
2013-10-22 11:54:09 -07:00
The Android Open Source Project
acc3b75647
am 4d85d5e7: am e8fe688b: (-s ours) add ti/wpan
...
* commit '4d85d5e7c75f63f378a409d24827296fd771edb3':
add ti/wpan
Add selinux-related projects
Add replicaisland
Add review URI.
Add new projects to match 4.0.3
Add prebuilts/qemu-kernel and prebuilts/tools
Manifest for post-ICS master
Bases on top of which the GPL components of 3.0 and 3.1 can be built
Base on top of which the GPL components of 3.2 can be built
Add external/qemu-pc-bios
Switch to a relative fetch URI
Restore additional projects.
Set sync default to -j4
Initial manifest for gingerbread
First pass at master manifest
Start from an empty project
2013-10-22 11:54:02 -07:00
Kenny Root
154a20c57e
am 616b4d03: (-s ours) Add bouncycastle to the pdk group
...
* commit '616b4d03e972360d8a1536a25b7c8294866a12f9':
Add bouncycastle to the pdk group
2013-10-22 11:50:37 -07:00
Ben Cheng
8d20a14dc8
am 1a368cb0: (-s ours) Add various gcc-4.8 projects.
...
* commit '1a368cb08f4ce9ffc0e37822638e061d0470ad49':
Add various gcc-4.8 projects.
2013-10-22 11:50:36 -07:00
Conley Owens
73f58baaf7
am fcfe1e98: (-s ours) Remove the hardware/msm7k project
...
* commit 'fcfe1e98d15cd691d56452c93b6569bc4c67d5e8':
Remove the hardware/msm7k project
2013-10-22 11:50:35 -07:00
Christopher Ferris
db79128443
am 50c7e543: (-s ours) Remove the pdk group for libunwind.
...
* commit '50c7e54337ddffb6b3c0ecea7525f48fc8e76037':
Remove the pdk group for libunwind.
2013-10-22 11:50:34 -07:00
Geoff Mendal
a431a99e29
am 61f86fa3: (-s ours) Add platform/external/conscrypt to master
...
* commit '61f86fa34073c4ce641b5e6a1b8ed18c5469941e':
Add platform/external/conscrypt to master
2013-10-22 11:50:32 -07:00
Christopher Ferris
cd32ec59d1
am b199a962: (-s ours) Add external/libunwind to manifest.
...
* commit 'b199a962291fa1874bec885794e015557e80db4d':
Add external/libunwind to manifest.
2013-10-22 11:50:31 -07:00
Baligh Uddin
b2969010f4
am c5830705: (-s ours) Add tools/studio/translation to AOSP master manifest
...
* commit 'c58307057d0e26d621bbfa6de2f2ab70e02e89f2':
Add tools/studio/translation to AOSP master manifest
2013-10-22 11:50:30 -07:00
The Android Open Source Project
c6ecdcd2e7
am 1c546d57: (-s ours) Remove obsolete ping/ping6
...
* commit '1c546d573e9a0be390773a3692d76550fd3be6a0':
Remove obsolete ping/ping6
2013-10-22 11:50:29 -07:00
The Android Open Source Project
f19f68f87f
am b0ff0cc0: (-s ours) Updated master manifest after jb-mr2-dev
...
* commit 'b0ff0cc0da2d27e6f87cdc48250d015ea1b795c8':
Add device/ and hardware/ for 4.2.2
2013-10-22 11:50:28 -07:00
The Android Open Source Project
d7bacd23af
am 83b76775: (-s ours) Add x86_64 toolchains
...
* commit '83b7677518a289d67397dccef8a632819a008d9f':
Add x86_64 toolchains
2013-10-22 11:50:26 -07:00
The Android Open Source Project
cf955af0eb
am 022658e6: (-s ours) Add new projects - iputils, studio/cloud
...
* commit '022658e6b4c15ebe8c5c4db1b3397aa7f0496a39':
Add new projects - iputils, studio/cloud
2013-10-22 11:50:25 -07:00
The Android Open Source Project
2cbfc6f3ac
am 1fed5706: (-s ours) New projects for telephony and prebuilt python
...
* commit '1fed5706c9015d5f58054231c75c98fadb758ca2':
New projects for telephony and prebuilt python
2013-10-22 11:50:24 -07:00
The Android Open Source Project
f430be7f7c
am 27ce518b: (-s ours) Add scrypt and prebuilt clang projects
...
* commit '27ce518b08859bbdef65682b4d009004e8293080':
Add scrypt and prebuilt clang projects
2013-10-22 11:50:23 -07:00
The Android Open Source Project
f95384df04
am 659b6584: (-s ours) Un-branch master-dalvik from master
...
* commit '659b658472da7390362d4ccf49230901f150dc36':
2013-10-22 11:50:22 -07:00
The Android Open Source Project
f1dd3f4be3
am ced9b333: (-s ours) Add idea projects
...
* commit 'ced9b3334e92b0924c57482d5f5fe2c3caf7a90f':
Add idea projects
2013-10-22 11:50:20 -07:00
The Android Open Source Project
2cfb0046a4
am 70c902cf: (-s ours) Add device/ and hardware/ for 4.2.2
...
* commit '70c902cf65b201fbe2a6ebe9684ca62a481f1b00':
Add device/ and hardware/ for 4.2.2
2013-10-22 11:50:19 -07:00
The Android Open Source Project
3f69a24699
am d56f7074: (-s ours) Update master manifest to match jb-mr1.1-dev
...
* commit 'd56f7074fffc169eeefc9a70d693abfbb3d50e17':
Manifest for jb-mr1.1-dev
Extra projects to match release branch
Manifest for jb-mr1-dev
2013-10-22 11:50:18 -07:00
The Android Open Source Project
7e5125e92b
am c8a40b6b: (-s ours) Add tools groups on prebuilts/tools
...
* commit 'c8a40b6b1cc33e72b3be16cbf84f2817828a6ab6':
Add tools groups on prebuilts/tools
2013-10-22 11:50:16 -07:00
The Android Open Source Project
35d5de31eb
am bc65e60b: (-s ours) Add mockito and objenesis
...
* commit 'bc65e60b0366a9c1de396ef58e996a3540d3d198':
Add mockito and objenesis
2013-10-22 11:50:15 -07:00
The Android Open Source Project
d563abdb6f
am e046a83b: (-s ours) Add nist-pkits
...
* commit 'e046a83bf17b787e4cfd10181f6c007eeefe277c':
Add nist-pkits
2013-10-22 11:50:14 -07:00
The Android Open Source Project
32798ec4b8
am e4b6c172: (-s ours) New location for fat32lib
...
* commit 'e4b6c17240cd47bcf90698be38632772a6b331e8':
New location for fat32lib
2013-10-22 11:50:12 -07:00
The Android Open Source Project
1b9e9b6ac3
am 6747c5e5: (-s ours) Add prebuilts/devtools
...
* commit '6747c5e51aec2a4ed584ca64c8e4c33071486a19':
Add prebuilts/devtools
2013-10-22 11:50:11 -07:00
The Android Open Source Project
4ae4a279fe
am 70b1a769: (-s ours) Modernize the manifest groups
...
* commit '70b1a769944706a2f2567b975e5d7e9284251154':
Modernize the manifest groups
2013-10-22 11:50:09 -07:00
The Android Open Source Project
1de131b48b
am b05bfe82: (-s ours) Add new devtools projects
...
* commit 'b05bfe82d0f9e6bf58f4012c7628cc450089a771':
Add new devtools projects
2013-10-22 11:50:08 -07:00
The Android Open Source Project
7dc15a68e8
am b1bab4dc: (-s ours) Add new devtools projects
...
* commit 'b1bab4dc6628e2b254307613f5d56f5331646777':
Add new devtools projects
2013-10-22 11:50:07 -07:00
The Android Open Source Project
9b7609af82
am a1123ee5: (-s ours) Tune tools groups
...
* commit 'a1123ee5545e2099792c640a6f00c533bd473099':
Tune tools groups
2013-10-22 11:50:06 -07:00
The Android Open Source Project
5bc34e053a
am 596d9d99: (-s ours) Add tools/base
...
* commit '596d9d99602be75146a84b9dd70d7eb672aaf7b9':
Add tools/base
2013-10-22 11:50:04 -07:00
The Android Open Source Project
39268f3012
am 50138b5a: (-s ours) Add darwin host headers
...
* commit '50138b5a7f354c681720e425ce513e35495a529b':
Add darwin host headers
2013-10-22 11:50:03 -07:00
The Android Open Source Project
78689a99b9
am 0cc40d32: (-s ours) Add eigen
...
* commit '0cc40d32e50323ae356f64b4d84af08ab963eef5':
Add eigen
2013-10-22 11:50:02 -07:00
The Android Open Source Project
7bb6648571
am aefb1473: (-s ours) Extra projects to match release branch
...
* commit 'aefb1473b172e387393b795b6609e48c64fc4cdf':
Extra projects to match release branch
2013-10-22 11:50:01 -07:00
The Android Open Source Project
466aa85a64
am cb5004d3: (-s ours) Manifest for master, updated for 4.2
...
* commit 'cb5004d3709a4bb0764b777ba1787677860ce714':
Manifest for master, updated for 4.2
2013-10-22 11:50:00 -07:00
The Android Open Source Project
0d623d9246
am fe20f3cb: (-s ours) Add MacOS host toolchain
...
* commit 'fe20f3cb92b3a1138e769106e5b3d7a805f41b4b':
Add MacOS host toolchain
2013-10-22 11:49:59 -07:00
The Android Open Source Project
7b7ea8e47e
am dfefa4af: (-s ours) Add frameworks/volley
...
* commit 'dfefa4af0d2bb858908cdd4231ad624abf717bab':
Add frameworks/volley
2013-10-22 11:49:57 -07:00
The Android Open Source Project
3c8e7a0c83
am f1b2e439: (-s ours) Add projects for gcc 4.7 prebuilts
...
* commit 'f1b2e439a4077a61d6ba214a77ede37c75dc19c9':
Add projects for gcc 4.7 prebuilts
2013-10-22 11:49:56 -07:00
The Android Open Source Project
25ff5bed70
am d1848bab: (-s ours) Add harfbuzz_ng
...
* commit 'd1848babe1466a2fd43d4e1c31a5288d334c1d59':
Add harfbuzz_ng
2013-10-22 11:49:55 -07:00
The Android Open Source Project
56d4106201
am db11c6ad: (-s ours) Base manifest for 4.2 GPL components
...
* commit 'db11c6ad8fba5d9d955a4b0d505b4d7d8f1d6ac0':
Base manifest for 4.2 GPL components
2013-10-22 11:49:54 -07:00
The Android Open Source Project
ced6d2be54
am f46b8df3: (-s ours) Replace torospr with toroplus
...
* commit 'f46b8df32efc4979bdca52bf52e83fd816819f60':
Replace torospr with toroplus
2013-10-22 11:49:52 -07:00
The Android Open Source Project
9932f838ea
am a89ea088: (-s ours) Add hardware/akm
...
* commit 'a89ea088f4f64e06000f82589bffae5f66dc0e0c':
Add hardware/akm
2013-10-22 11:49:51 -07:00
The Android Open Source Project
9355cbb0c0
am 08dca174: (-s ours) Add optional eclipse-related prebuilts
...
* commit '08dca174fb4807a68f5edbc234c358a60a43a665':
Add optional eclipse-related prebuilts
2013-10-22 11:49:50 -07:00
The Android Open Source Project
43510b65a3
am a07bad60: (-s ours) Unmap MIPS 4.4 toolchains
...
* commit 'a07bad6077fabb77ef04226f8611ce6c74932bbc':
Unmap MIPS 4.4 toolchains
2013-10-22 11:49:49 -07:00
The Android Open Source Project
a6f33a2984
am 4cf09a29: (-s ours) Add fat32lib
...
* commit '4cf09a2953ac3cd6a7d2d3fb98712f04cb609137':
Add fat32lib
2013-10-22 11:49:47 -07:00
The Android Open Source Project
94d88cb576
am 7d0d8f01: (-s ours) Add device/sony/lt26
...
* commit '7d0d8f01e2dcf2c475b16e0f508da173ee0c87c0':
Add device/sony/lt26
2013-10-22 11:49:46 -07:00
The Android Open Source Project
0168606d31
am 73ce405e: (-s ours) give tools/build its own group
...
* commit '73ce405ee0d574be6c589641a0807bd0c494485e':
give tools/build its own group
2013-10-22 11:49:44 -07:00
The Android Open Source Project
47d364a28d
am d479f201: (-s ours) Update projects
...
* commit 'd479f201d05968e2328d153245c5b1eb721283b4':
Update projects
2013-10-22 11:49:43 -07:00
The Android Open Source Project
cf7089aa28
am 25a5770c: (-s ours) Add manifest groups.
...
* commit '25a5770ceab45476b86a5081d96e0757df0fcce3':
Add manifest groups.
2013-10-22 11:49:41 -07:00
The Android Open Source Project
8d0d5e9ffc
am ce42277e: (-s ours) Add motodev
...
* commit 'ce42277e6be673e7d7ef38ba2acae3c5719de3f2':
Add motodev
2013-10-22 11:49:32 -07:00
The Android Open Source Project
948c7a54d1
am 6f056451: (-s ours) Update manifest for Jelly Bean
...
* commit '6f056451e4eee641872a4a8b9165f9c9f9799d39':
Update manifest for Jelly Bean
2013-10-22 11:49:30 -07:00
The Android Open Source Project
bf185341cd
am 39541968: (-s ours) Add aac and gcc-demangle
...
* commit '39541968899a7b6ca5e0f075641665134ed23d8a':
Add aac and gcc-demangle
2013-10-22 11:49:29 -07:00
The Android Open Source Project
7aeb0f606a
am 0cd29e3a: (-s ours) Switch to snapshots for dalvik and libcore
...
* commit '0cd29e3a3268f99ef0cb72a51782a35f407de1ae':
Switch to snapshots for dalvik and libcore
2013-10-22 11:49:28 -07:00
The Android Open Source Project
9e0719b51e
am b5a0d13b: (-s ours) Add chromium-trace
...
* commit 'b5a0d13b2f49a9fb5e2ae619331c5e6f17c8f46e':
Add chromium-trace
2013-10-22 11:49:27 -07:00
The Android Open Source Project
885c3e990d
am 00ece54b: (-s ours) Remove i686-android-linux-4.4.3 toolchain
...
* commit '00ece54b1be0831140102c453d2e108bbd2072ec':
Remove i686-android-linux-4.4.3 toolchain
2013-10-22 11:49:25 -07:00
The Android Open Source Project
32713903db
am 8c701771: (-s ours) Add ant-glob
...
* commit '8c70177169eab0247227667fb1d318f770617a68':
Add ant-glob
2013-10-22 11:49:24 -07:00
The Android Open Source Project
f6a79b9e25
am 03fc9565: (-s ours) Add prebuilts/misc
...
* commit '03fc9565bbe48f8a74cb8333f31febf8f228b138':
Add prebuilts/misc
2013-10-22 11:49:22 -07:00
The Android Open Source Project
1415d76baa
am 8f95dff3: (-s ours) Switch to the proper location of IA 4.6 toolchain
...
* commit '8f95dff32fcbe4287582bb481de67e210ae158bd':
Switch to the proper location of IA 4.6 toolchain
2013-10-22 11:49:21 -07:00
The Android Open Source Project
cdc2a45d56
am e56e10bf: (-s ours) Add 4.6 toolchains
...
* commit 'e56e10bfa2344561c5b4d0f65661d0e65742e622':
Add 4.6 toolchains
2013-10-22 11:49:18 -07:00
The Android Open Source Project
29bd36b6c9
am 527678f0: (-s ours) Add new toolchains
...
* commit '527678f04df1205ddf229cd114d978fa63130f73':
Add new toolchains
2013-10-22 11:49:17 -07:00
The Android Open Source Project
3444267d6b
am 23f0e783: (-s ours) Add prebuilts/eclipse
...
* commit '23f0e7830de760d2a907fbf4ede543042df41beb':
Add prebuilts/eclipse
2013-10-22 11:49:15 -07:00
The Android Open Source Project
912bc11caa
am 9a452a71: (-s ours) Add MIPS toolchains
...
* commit '9a452a7168a75f1950ca5155ed2c13a4219a53a8':
Add MIPS toolchains
2013-10-22 11:49:13 -07:00
The Android Open Source Project
f0e84e13cd
am 1dd8491e: (-s ours) Add checkpolicy
...
* commit '1dd8491e5ef0c6f5b5d5ae29c8200d67f71e0721':
Add checkpolicy
2013-10-22 11:49:12 -07:00
The Android Open Source Project
427f4b3a2f
am 12c5c7e4: (-s ours) Add basebuilder
...
* commit '12c5c7e418326a733ed62215a0ef424eaa9a13d2':
Add basebuilder
2013-10-22 11:49:11 -07:00
The Android Open Source Project
edd311d4fa
am dd6bc4ec: (-s ours) Merge from ics-mr1, add torospr
...
* commit 'dd6bc4ecde623c4f8a5a40b0bded3154eb70ffcc':
Add torospr
Add replicaisland
Manifest for icr-mr1
2013-10-22 11:49:10 -07:00
The Android Open Source Project
53c25207fd
am 2ba9cf74: (-s ours) Add clat and gcc 4.6 host prebuilts
...
* commit '2ba9cf7435b6845ef089a4b7f53b3c5ba8d1f7e3':
Add clat and gcc 4.6 host prebuilts
2013-10-22 11:49:08 -07:00
The Android Open Source Project
364f79190d
am 422710ca: (-s ours) Add windowbuilder
...
* commit '422710ca238a659d7d7435ccbdda8e6d0ff688de':
Add windowbuilder
2013-10-22 11:49:07 -07:00
The Android Open Source Project
4d85d5e7c7
am e8fe688b: (-s ours) add ti/wpan
...
* commit 'e8fe688bee2bdbb71fc648e14918fb15fc5c90ed':
add ti/wpan
Add selinux-related projects
Add replicaisland
Add review URI.
Add new projects to match 4.0.3
Add prebuilts/qemu-kernel and prebuilts/tools
Manifest for post-ICS master
Bases on top of which the GPL components of 3.0 and 3.1 can be built
Base on top of which the GPL components of 3.2 can be built
Add external/qemu-pc-bios
Switch to a relative fetch URI
Restore additional projects.
Set sync default to -j4
Initial manifest for gingerbread
First pass at master manifest
Start from an empty project
2013-10-22 11:49:07 -07:00
Kenny Root
616b4d03e9
Add bouncycastle to the pdk group
...
Change-Id: If89ac5135b0155199f2828cc12e6409bf86eabb2
2013-10-18 12:17:41 -07:00
Maurice Chu
5d5561ec24
Remove frameworks/multidex from master manifest.
...
Change-Id: I624f3e4ef68c50000e518e637de2eaa78d61f137
Reviewed-on: https://googleplex-android-review.git.corp.google.com/377312
Reviewed-by: Jeff Hamilton <jham@google.com >
2013-10-17 18:53:59 +00:00
Ed Heyl
39a0b0db96
remove Launcher3 to fix build
...
Change-Id: I3622770d89a72d33612b1c44c690a5dc1d3bb21e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/376833
Reviewed-by: Ed Heyl <edheyl@google.com >
2013-10-16 23:54:18 +00:00
Ed Heyl
b80ed1462c
am a1b6c45b: am b8e07536: am 4178b4e7: Pull in Launcher3 (for aosp), remove GoogleLauncher2.
...
* commit 'a1b6c45b6cda6a1be1db1ca03530e2ae82325562':
Pull in Launcher3 (for aosp), remove GoogleLauncher2.
2013-10-16 12:43:18 -07:00
Ed Heyl
a1b6c45b6c
am b8e07536: am 4178b4e7: Pull in Launcher3 (for aosp), remove GoogleLauncher2.
...
* commit 'b8e075361dc5d4f1e9a3f8f3729771ae0939a933':
Pull in Launcher3 (for aosp), remove GoogleLauncher2.
2013-10-16 12:39:45 -07:00
Ed Heyl
b8e075361d
am 4178b4e7: Pull in Launcher3 (for aosp), remove GoogleLauncher2.
...
* commit '4178b4e7071843105244191a138fa6cc9b108144':
Pull in Launcher3 (for aosp), remove GoogleLauncher2.
2013-10-16 12:38:04 -07:00
Ed Heyl
4178b4e707
Pull in Launcher3 (for aosp), remove GoogleLauncher2.
...
Change-Id: Iffd310550293d2e3540a5dafcfeafaf704496a7b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/376367
Reviewed-by: Bjorn Bringert <bringert@android.com >
Reviewed-by: Sascha Prueter <saschap@google.com >
2013-10-16 19:35:10 +00:00
Geoff Mendal
2551ef3cb1
Add project platform/frameworks/multidex for master
...
Bug: 11235041
Change-Id: I1cd1a7856f3ac62a8e5185301604cfb378ee1aa4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/376020
Reviewed-by: Jeff Hamilton <jham@google.com >
2013-10-15 18:12:39 +00:00
Torne (Richard Coles)
4981c362ac
am a312d99f: am 17e1dfcc: am e61bf07f: Drop external/webkit from the manifest.
...
* commit 'a312d99fa0e955fb3a85352604f899866633cace':
Drop external/webkit from the manifest.
2013-10-15 06:26:49 -07:00
Torne (Richard Coles)
a312d99fa0
am 17e1dfcc: am e61bf07f: Drop external/webkit from the manifest.
...
* commit '17e1dfcc31a506aca1b4f7881459f890a8938537':
Drop external/webkit from the manifest.
2013-10-15 05:06:34 -07:00
Torne (Richard Coles)
17e1dfcc31
am e61bf07f: Drop external/webkit from the manifest.
...
* commit 'e61bf07fa379ef9b6588a9cb54afd6dde97f173d':
Drop external/webkit from the manifest.
2013-10-15 05:03:40 -07:00
Torne (Richard Coles)
e61bf07fa3
Drop external/webkit from the manifest.
...
This was only needed to build the old WebView, which has now been
removed.
Bug: 10427705
Change-Id: I21bf3ff73cc2ec01d8af5c1f5865c0c03a4e381c
Reviewed-on: https://googleplex-android-review.git.corp.google.com/375398
Reviewed-by: Ben Murdoch <benm@google.com >
Reviewed-by: Andrei Popescu <andreip@google.com >
2013-10-15 11:51:28 +00:00
Torne (Richard Coles)
b6c1e75c33
Resolve conflicts for merge of 2b8ebb67 to master
...
Change-Id: I598a57da0a3332d9a02d4550b3e64435699362ae
2013-10-15 12:18:22 +01:00
Allen Hair
2b8ebb6784
am 049abfb6: am 2ff1ccf5: Added frameworks/uiautomator
...
* commit '049abfb69eb5b73211051746139f36fa286649b8':
Added frameworks/uiautomator
2013-10-14 19:01:20 -07:00
Allen Hair
049abfb69e
am 2ff1ccf5: Added frameworks/uiautomator
...
* commit '2ff1ccf5a26ea402c7eecc4d0d6d581de904c39a':
Added frameworks/uiautomator
2013-10-14 17:19:42 -07:00
Allen Hair
2ff1ccf5a2
Added frameworks/uiautomator
...
Change-Id: Ie38808e15adc5e094d15e0491b20f107ea3d4a7d
Reviewed-on: https://googleplex-android-review.git.corp.google.com/373609
Reviewed-by: Ying Wang <wangying@google.com >
Reviewed-by: Guang Zhu <guangzhu@google.com >
2013-10-14 23:17:05 +00:00
Geoff Mendal
75b3e1ed89
am be386e6a: am addc9bcd: am 1eef3b7c: Add platform/vendor/hp/prebuilt to klp-dev Bug: 11146893 Change-Id: Ic69320fcfd5d93e3b0878ce9e3422cc4b6fedc59 Reviewed-on: https://googleplex-android-review.git.corp.google.com/374708 Reviewed-by: Svetoslav Ganov <svetoslavganov@
...
* commit 'be386e6ae931fcdcd74de8d1e15f6028c9f83d00':
Add platform/vendor/hp/prebuilt to klp-dev Bug: 11146893 Change-Id: Ic69320fcfd5d93e3b0878ce9e3422cc4b6fedc59 Reviewed-on: https://googleplex-android-review.git.corp.google.com/374708 Reviewed-by: Svetoslav Ganov <svetoslavganov@google.com > Reviewed-by: Sascha Prueter <saschap@google.com >
2013-10-14 10:49:02 -07:00
Geoff Mendal
be386e6ae9
am addc9bcd: am 1eef3b7c: Add platform/vendor/hp/prebuilt to klp-dev Bug: 11146893 Change-Id: Ic69320fcfd5d93e3b0878ce9e3422cc4b6fedc59 Reviewed-on: https://googleplex-android-review.git.corp.google.com/374708 Reviewed-by: Svetoslav Ganov <svetoslavganov@google.com> R
...
* commit 'addc9bcdf596efdff0446c42a5ec49570845aaa4':
Add platform/vendor/hp/prebuilt to klp-dev Bug: 11146893 Change-Id: Ic69320fcfd5d93e3b0878ce9e3422cc4b6fedc59 Reviewed-on: https://googleplex-android-review.git.corp.google.com/374708 Reviewed-by: Svetoslav Ganov <svetoslavganov@google.com > Reviewed-by: Sascha Prueter <saschap@google.com >
2013-10-11 17:21:07 -07:00
Geoff Mendal
addc9bcdf5
am 1eef3b7c: Add platform/vendor/hp/prebuilt to klp-dev Bug: 11146893 Change-Id: Ic69320fcfd5d93e3b0878ce9e3422cc4b6fedc59 Reviewed-on: https://googleplex-android-review.git.corp.google.com/374708 Reviewed-by: Svetoslav Ganov <svetoslavganov@google.com> Reviewed-by: S
...
* commit '1eef3b7cbdafcb1dee1af15cfa70601cc2897562':
Add platform/vendor/hp/prebuilt to klp-dev Bug: 11146893 Change-Id: Ic69320fcfd5d93e3b0878ce9e3422cc4b6fedc59 Reviewed-on: https://googleplex-android-review.git.corp.google.com/374708 Reviewed-by: Svetoslav Ganov <svetoslavganov@google.com > Reviewed-by: Sascha Prueter <saschap@google.com >
2013-10-11 17:19:28 -07:00
Geoff Mendal
1eef3b7cbd
Add platform/vendor/hp/prebuilt to klp-dev
...
Bug: 11146893
Change-Id: Ic69320fcfd5d93e3b0878ce9e3422cc4b6fedc59
Reviewed-on: https://googleplex-android-review.git.corp.google.com/374708
Reviewed-by: Svetoslav Ganov <svetoslavganov@google.com >
Reviewed-by: Sascha Prueter <saschap@google.com >
2013-10-12 00:16:44 +00:00
Ben Cheng
1a368cb08f
Add various gcc-4.8 projects.
2013-10-11 10:32:09 -07:00
Ed Heyl
551b9a8534
am 1f49f841: am ffe99e2e: am de229217: remove cruft/quake
...
* commit '1f49f8419fa6005586b8e51b51829cc61629ab69':
remove cruft/quake
2013-10-11 06:56:26 -07:00
Ed Heyl
1f49f8419f
am ffe99e2e: am de229217: remove cruft/quake
...
* commit 'ffe99e2ecda6b0d1a4cd9ce0d961e969f34c8483':
remove cruft/quake
2013-10-11 06:53:32 -07:00
Ed Heyl
ffe99e2ecd
am de229217: remove cruft/quake
...
* commit 'de229217c2da1b1311431192144d313d15ed675e':
remove cruft/quake
2013-10-11 06:51:50 -07:00
Ed Heyl
de229217c2
remove cruft/quake
...
Change-Id: Ida926aac6038f798d24865c96f97d49b67a9adc4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/373375
Reviewed-by: Jeff Brown <jeffbrown@google.com >
Reviewed-by: Ed Heyl <edheyl@google.com >
2013-10-11 13:50:09 +00:00
Baligh Uddin
3c68fbb9f3
Adding GoogleSearchLangPacks to master manifest
...
Bug: 11118670
Change-Id: I093d51e0b32ca8a7103f4968a40ed037d6f42a29
Reviewed-on: https://googleplex-android-review.git.corp.google.com/372749
Reviewed-by: Bjorn Bringert <bringert@android.com >
2013-10-09 17:45:16 +00:00
Conley Owens
fcfe1e98d1
Remove the hardware/msm7k project
...
This no longer needs to be in the master manifest
2013-10-08 23:02:41 +00:00
Ben Cheng
8138d780bb
Add {darwin,linux}-x86/aarch64-gcc prebuilts to master manifest.
...
BUG: 11085457
Change-Id: Ieec9220fc05bc12b388c35c75d45b0cfd0232a52
Reviewed-on: https://googleplex-android-review.git.corp.google.com/372263
Reviewed-by: Ben Cheng <bccheng@google.com >
2013-10-08 22:37:05 +00:00
Geoff Mendal
f6149c280f
Add platform/external/libcxx for master
...
Bug: 11071816
Change-Id: I1df4c9aee46001657e85fbc8c0fcc25783ec4582
Reviewed-on: https://googleplex-android-review.git.corp.google.com/371225
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-10-07 13:50:55 +00:00
Christopher Ferris
cfbce7698b
am c56df88f: am e6bca63c: am 82cf1773: Add external/libunwind.
...
* commit 'c56df88fba52a5dc8eecadf9a1e1e6070c1267cd':
Add external/libunwind.
2013-10-04 11:11:22 -07:00
Conley Owens
e739e282db
am eb509baa: Merge commit \'c615da4a\' into klp-dev-plus-aosp
...
* commit 'eb509baa014e309ef3e7554ef251ecf2b1fb891b':
Add external/libunwind.
2013-10-04 11:11:18 -07:00
Chad Jones
2d8bcdb451
am 3410be15: am 49099283: am bba03e82: Add vendor/nvidia/build
...
* commit '3410be15cf20f3013e531344e60df3a1c1c4cef8':
Add vendor/nvidia/build
2013-10-04 11:08:31 -07:00
Christopher Ferris
c56df88fba
am e6bca63c: am 82cf1773: Add external/libunwind.
...
* commit 'e6bca63ca7a873ba0bec1fdff224af044f0bf52c':
Add external/libunwind.
2013-10-04 09:58:22 -07:00
Conley Owens
eb509baa01
Merge commit 'c615da4a' into klp-dev-plus-aosp
2013-10-03 16:26:13 -07:00
Christopher Ferris
e6bca63ca7
am 82cf1773: Add external/libunwind.
...
* commit '82cf177372cbb515cc1e4e652bf2fc5c24983a1c':
Add external/libunwind.
2013-10-03 16:09:30 -07:00
Christopher Ferris
82cf177372
Add external/libunwind.
...
Change-Id: I5705ad6d2b4cc6634fccf8f266c2134b85f5634e
Reviewed-on: https://googleplex-android-review.git.corp.google.com/370007
Reviewed-by: Geoff Mendal <mendal@google.com >
Reviewed-by: Conley Owens <cco3@android.com >
2013-10-03 23:07:03 +00:00
Christopher Ferris
c615da4a59
Add external/libunwind.
...
Change-Id: Id61f9726bc429bb94918a296a682b20a04b64f97
Reviewed-on: https://googleplex-android-review.git.corp.google.com/369986
Reviewed-by: Geoff Mendal <mendal@google.com >
Reviewed-by: Conley Owens <cco3@android.com >
2013-10-03 23:06:58 +00:00
Chad Jones
3410be15cf
am 49099283: am bba03e82: Add vendor/nvidia/build
...
* commit '49099283b7f7f1477030259a84c57a99d42f406c':
Add vendor/nvidia/build
2013-10-03 15:42:04 -07:00
Chad Jones
49099283b7
am bba03e82: Add vendor/nvidia/build
...
* commit 'bba03e82a00d1e3f525043852c6b4e262d0a2101':
Add vendor/nvidia/build
2013-10-03 14:45:58 -07:00
Chad Jones
bba03e82a0
Add vendor/nvidia/build
...
Bug: 11052461
Change-Id: I5d72d6f98d11823572a77ef1a96573730c9ed409
Reviewed-on: https://googleplex-android-review.git.corp.google.com/369933
Reviewed-by: Colin Cross <ccross@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-10-03 21:44:23 +00:00
Geoff Mendal
a56a00888d
Add platform/external/lldb for master
...
Bug: 11051230
Change-Id: I7923f2b89d1fc502d72ef983a7f6775c9b5a2792
Reviewed-on: https://googleplex-android-review.git.corp.google.com/369252
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-10-03 12:30:46 +00:00
Christopher Ferris
50c7e54337
Remove the pdk group for libunwind.
2013-10-02 12:49:22 -07:00
Chad Jones
3f0e15f472
Remove groups=pdk for external/libunwind
...
Change-Id: Ia3ad38599bcb16ff8eb740059501e83dc0c38abe
Reviewed-on: https://googleplex-android-review.git.corp.google.com/369034
Reviewed-by: Chad Jones <chadj@google.com >
2013-10-02 17:42:10 +00:00
Kenny Root
22e6e43958
am 2092d4a0: am a44e9d79: am 231cbfdb: Add external/conscrypt to manifest
...
* commit '2092d4a03815a7b56c4e16d5e044054cfd2ae386':
Add external/conscrypt to manifest
2013-10-02 10:05:51 -07:00
Kenny Root
2092d4a038
am a44e9d79: am 231cbfdb: Add external/conscrypt to manifest
...
* commit 'a44e9d79a066486b31dc0ffd9ab8db1e2bdb961f':
Add external/conscrypt to manifest
2013-10-02 10:00:55 -07:00
Kenny Root
a44e9d79a0
am 231cbfdb: Add external/conscrypt to manifest
...
* commit '231cbfdb25a945f2b0ae9cb202dbf8934fb41194':
Add external/conscrypt to manifest
2013-10-02 09:58:04 -07:00
Kenny Root
231cbfdb25
Add external/conscrypt to manifest
...
Change-Id: I9a326768906639d2e5222e116de997856a047f27
Reviewed-on: https://googleplex-android-review.git.corp.google.com/368966
Reviewed-by: Conley Owens <cco3@android.com >
2013-10-02 16:43:12 +00:00
Geoff Mendal
94d37aab16
am 47087fae: resolved conflicts for merge of ed3ae1a9 to klp-dev-plus-aosp
...
* commit '47087fae8bf792f127f0795bf48789ed5491f383':
klp-ub-dev manifest Bug: 10933019
2013-10-01 20:58:03 -07:00
Geoff Mendal
0fbb326514
am 5147301d: am a6497bf5: Add volantis projects for klp-dev
...
* commit '5147301df78c931b8758340db0a822e47f72c892':
2013-10-01 20:58:02 -07:00
Geoff Mendal
61f86fa340
Add platform/external/conscrypt to master
2013-10-01 13:26:13 -07:00
Geoff Mendal
5ab1be1951
Add platform/external/conscrypt to master
...
Bug: 11027057
Change-Id: Ia02fcade29a5f2d134d040292ab89e4d43a74602
Reviewed-on: https://googleplex-android-review.git.corp.google.com/368513
Reviewed-by: Kenny Root <kroot@google.com >
2013-10-01 20:09:41 +00:00
Christopher Ferris
7c70c183b8
Add external/libunwind to manifest.
...
Change-Id: Iff9036b8dc20168c09d4a3603f099ca55c56c2fd
Reviewed-on: https://googleplex-android-review.git.corp.google.com/367582
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-10-01 18:01:27 +00:00
Geoff Mendal
47087fae8b
resolved conflicts for merge of ed3ae1a9 to klp-dev-plus-aosp
2013-10-01 05:18:32 -07:00
Geoff Mendal
5147301df7
am a6497bf5: Add volantis projects for klp-dev
...
* commit 'a6497bf5f611f054f5c507e4b7c7d6324cd1d80a':
Add volantis projects for klp-dev
2013-09-30 22:13:02 -07:00
Christopher Ferris
b199a96229
Add external/libunwind to manifest.
2013-09-30 17:33:46 -07:00
Geoff Mendal
522cd15346
am a6497bf5: Add volantis projects for klp-dev
...
* commit 'a6497bf5f611f054f5c507e4b7c7d6324cd1d80a':
Add volantis projects for klp-dev
2013-09-30 14:12:48 -07:00
Geoff Mendal
ed3ae1a9b2
klp-ub-dev manifest
...
Bug: 10933019
2013-09-27 11:11:22 -07:00
Geoff Mendal
a6497bf5f6
Add volantis projects for klp-dev
...
Bug: 10897564
Change-Id: I3fc36c9d59914473036e876b6b6a12a8b3d631dc
Reviewed-on: https://googleplex-android-review.git.corp.google.com/366473
Reviewed-by: Colin Cross <ccross@google.com >
2013-09-26 23:36:14 +00:00
keunyoung
a7815d7866
am 4ef9372d: am 55d6bc31: add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
...
* commit '4ef9372dd5f34595ccdd56254cd3fe506c978061':
add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
2013-09-26 14:29:15 -07:00
keunyoung
4ef9372dd5
am 55d6bc31: add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
...
* commit '55d6bc31f1a06fb99746a0994348cc0821f16093':
add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
2013-09-26 14:26:10 -07:00
keunyoung
55d6bc31f1
add vendor/unbundled_google/packages/GearHead, which replaces vendor/auto/projection
...
Change-Id: I00280275a4fc6079f51ce0a93f515d5715e8d234
Reviewed-on: https://googleplex-android-review.git.corp.google.com/366336
Reviewed-by: Qiwen Zhao <zhao@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-09-26 21:21:28 +00:00
keunyoung
cceb337ac3
am 0e464569: am 31bdea88: remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
...
* commit '0e464569e8e94b4cf5962466f771c785eb75d3c0':
remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
2013-09-26 13:47:38 -07:00
keunyoung
0e464569e8
am 31bdea88: remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
...
* commit '31bdea887d9cf51fcd3b0384a461d8e3fd9ff149':
remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
2013-09-26 13:44:40 -07:00
keunyoung
31bdea887d
remove vendor/auto/projection due to migration to vendor/unbundled_google/packages/GearHead
...
- old code breaks build in various branches
Change-Id: I1dd5bdc0a384aceb086d180d5c59d6c1a92e62f4
Reviewed-on: https://googleplex-android-review.git.corp.google.com/366306
Reviewed-by: Rakesh Iyer <rni@google.com >
Reviewed-by: Keun-young Park <keunyoung@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-09-26 20:41:21 +00:00
Ying Wang
12b9abcb64
am 85c505f7: am 71941e59: Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
...
* commit '85c505f7ae5fcca044c6d97f7ce89aa9cd0b39eb':
Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
2013-09-24 11:28:05 -07:00
Ying Wang
85c505f7ae
am 71941e59: Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
...
* commit '71941e59c04761490e7c889b4a1374279efdf38a':
Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
2013-09-24 11:24:46 -07:00
Ying Wang
71941e59c0
Add groups="vendor" to vendor/unbundled_google/packages/PrebuiltGmsCore
...
Change-Id: Ic21db806625bc6b59d54af4d93b887e22bffe840
Reviewed-on: https://googleplex-android-review.git.corp.google.com/364854
Reviewed-by: Chad Jones <chadj@google.com >
2013-09-24 18:20:16 +00:00
Ying Wang
d91297be0c
am d9bca403: am 2bef1b2e: Add back \'groups="vendor"\'
...
* commit 'd9bca403e7f997b17003eec2991b221251bdfa41':
Add back 'groups="vendor"'
2013-09-24 10:50:32 -07:00
Ying Wang
d9bca403e7
am 2bef1b2e: Add back \'groups="vendor"\'
...
* commit '2bef1b2eb9d402ed81d512b2159191511f018289':
Add back 'groups="vendor"'
2013-09-24 10:47:31 -07:00
Ying Wang
2bef1b2eb9
Add back 'groups="vendor"'
...
which I believe was removed by accident in the previous change.
Change-Id: Ifcc11f2ca1eb8318b40087553d0980bc2b6ea956
Reviewed-on: https://googleplex-android-review.git.corp.google.com/364797
Reviewed-by: Chad Jones <chadj@google.com >
2013-09-24 17:44:06 +00:00
Geoff Mendal
98c6e5dbd3
am cfbccb94: am fb7e4a7b: Remove vendor/unbundled_google/packages/CastMirroring, repo not needed Bug: 10726512 Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43 Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752 Reviewed-by: Justin Ho <justin
...
* commit 'cfbccb9467d696965eff8b0df9b5d35d4dda9c96':
Remove vendor/unbundled_google/packages/CastMirroring, repo not needed Bug: 10726512 Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43 Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752 Reviewed-by: Justin Ho <justinho@google.com >
2013-09-24 10:26:48 -07:00
Jeff Hamilton
73d8f39f95
am a27a21de: am 76eee955: Attempt to fix the build.
...
* commit 'a27a21de3cd63494f1b85940daae6e78e8a2ad36':
Attempt to fix the build.
2013-09-24 10:25:03 -07:00
Maurice Chu
2d112f37fb
am 5370f1b4: am 6a1860bd: Change klp-dev to point to Gouda branch for PrebuiltGmsCore project.
...
* commit '5370f1b46757ecc519d5876a479ae8f29664c2e9':
Change klp-dev to point to Gouda branch for PrebuiltGmsCore project.
2013-09-24 10:24:56 -07:00
Geoff Mendal
cfbccb9467
am fb7e4a7b: Remove vendor/unbundled_google/packages/CastMirroring, repo not needed Bug: 10726512 Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43 Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752 Reviewed-by: Justin Ho <justinho@google.com
...
* commit 'fb7e4a7bb24e93d71d8feaf7cb930823f6064714':
Remove vendor/unbundled_google/packages/CastMirroring, repo not needed Bug: 10726512 Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43 Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752 Reviewed-by: Justin Ho <justinho@google.com >
2013-09-24 09:17:59 -07:00
Geoff Mendal
fb7e4a7bb2
Remove vendor/unbundled_google/packages/CastMirroring, repo not needed
...
Bug: 10726512
Change-Id: Ie036fb76cbad9f640b8688fc9799c85bf38f8c43
Reviewed-on: https://googleplex-android-review.git.corp.google.com/364752
Reviewed-by: Justin Ho <justinho@google.com >
2013-09-24 16:16:03 +00:00
Chad Jones
9cfab517e0
Add external/python3
...
Change-Id: I0d0a54e507e880582dac8626212e571cc35fb5c9
Reviewed-on: https://googleplex-android-review.git.corp.google.com/364595
Reviewed-by: Chad Jones <chadj@google.com >
2013-09-24 15:58:35 +00:00
Maurice Chu
f8ede96d96
Change master to point to Gouda PrebuiltGmsCore
...
Change-Id: Ibda00716094f2f493d77ea60de649ca8be24ca1a
Reviewed-on: https://googleplex-android-review.git.corp.google.com/364656
Reviewed-by: Jeff Hamilton <jham@google.com >
2013-09-24 15:53:49 +00:00
Jeff Hamilton
a27a21de3c
am 76eee955: Attempt to fix the build.
...
* commit '76eee9558fbc06835703dc5984baaa4c3277eea3':
Attempt to fix the build.
2013-09-23 19:00:59 -07:00
Maurice Chu
5370f1b467
am 6a1860bd: Change klp-dev to point to Gouda branch for PrebuiltGmsCore project.
...
* commit '6a1860bd01497d0001ab2457dffe6d5821d91a37':
Change klp-dev to point to Gouda branch for PrebuiltGmsCore project.
2013-09-23 19:00:30 -07:00
Jeff Hamilton
76eee9558f
Attempt to fix the build.
...
Change-Id: I66e8ccdd92b35d904d5c7d1a4beac235a7aad3f8
Reviewed-on: https://googleplex-android-review.git.corp.google.com/364114
Reviewed-by: Jeff Hamilton <jham@google.com >
2013-09-24 01:50:01 +00:00
Maurice Chu
6a1860bd01
Change klp-dev to point to Gouda branch for PrebuiltGmsCore project.
...
Change-Id: Iab26381e9cab0872bd0f688b900d615011847966
Reviewed-on: https://googleplex-android-review.git.corp.google.com/364066
Reviewed-by: Justin Ho <justinho@google.com >
2013-09-23 23:11:04 +00:00
Chad Jones
81afa7b08e
Empty commit
2013-09-22 20:28:17 -07:00
Ed Heyl
55b709a4e0
am 11b9fe70: (-s ours) am 36427c52: (-s ours) Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '11b9fe70967d7b4fea5cf0d612386cf431c0c621':
Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
2013-09-18 10:13:23 -07:00
Ed Heyl
11b9fe7096
am 36427c52: (-s ours) Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '36427c528c81e1938f204b1ca85d992ceef61077':
Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
2013-09-18 10:10:51 -07:00
Ed Heyl
36427c528c
Revert: Unify with jb-mr2-dev-plus-aosp - do not merge
...
This reverts commit 2281429d31https://googleplex-android-review.git.corp.google.com/361700
Reviewed-by: Qiwen Zhao <zhao@google.com >
Reviewed-by: Baligh Uddin <baligh@google.com >
2013-09-18 17:08:55 +00:00
Ed Heyl
6bc216f437
am f99f4ac7: (-s ours) am ad74957c: remove libvterm and Terminal projects. do not merge
...
* commit 'f99f4ac737273f1a17a56328ea5c83f46ffa23ed':
remove libvterm and Terminal projects. do not merge
2013-09-16 15:22:55 -07:00
Ed Heyl
f99f4ac737
am ad74957c: remove libvterm and Terminal projects. do not merge
...
* commit 'ad74957c6c6a33e9b8fcea2b88e392e38ca2e652':
remove libvterm and Terminal projects. do not merge
2013-09-16 15:19:21 -07:00
Ed Heyl
ad74957c6c
remove libvterm and Terminal projects. do not merge
...
Change-Id: If8474dea308969cc0290d07b6f66de14ee3732c7
Reviewed-on: https://googleplex-android-review.git.corp.google.com/360644
Reviewed-by: Baligh Uddin <baligh@google.com >
Reviewed-by: Jeff Sharkey <jsharkey@google.com >
2013-09-16 22:17:43 +00:00
Griff Hazen
f782ffb74c
Add google_embedded package to master manifest.
...
We will have various apps and libraries that run against main
android within the google_embedded/apps and google_embedded/frameworks
directories.
Change-Id: I27d2fc0e3216415bba7094e283754867e39bc25b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/360401
Reviewed-by: Fred Quintana <fredq@google.com >
Reviewed-by: Mike Lockwood <lockwood@google.com >
2013-09-16 19:42:43 +00:00
Stephen Hines
59376046b7
prebuilts/clang/*/host/* need to be present in the pdk.
...
BUG: 10653601
Change-Id: I8612477e81763f5af65c50c97a4d8b90d30b0b51
Reviewed-on: https://googleplex-android-review.git.corp.google.com/359788
Reviewed-by: Stephen Hines <srhines@google.com >
2013-09-14 06:02:40 +00:00
Chad Jones
4fe26f1db6
am 6bb0ec23: am 6dbf0c13: Add device/lge/mako_svelte-kernel to mako_svelte repo group
...
* commit '6bb0ec23ffcedb861bd1c620eb676973d0c7ea48':
Add device/lge/mako_svelte-kernel to mako_svelte repo group
2013-09-13 13:26:55 -07:00
Geoff Mendal
922e40cd63
am 3692d6a3: am 232f2f8f: Add project platform/vendor/unbundled_google/packages/CastMirroring Bug: 10726512 Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121 Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203 Reviewed-by: Andreas Huber <andih
...
* commit '3692d6a3b7a15443965e3898909f25f49b92bf14':
Add project platform/vendor/unbundled_google/packages/CastMirroring Bug: 10726512 Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121 Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203 Reviewed-by: Andreas Huber <andih@google.com > Reviewed-by: Justin Ho <justinho@google.com > Reviewed-by: Rachad Alao <rachad@google.com >
2013-09-13 13:26:54 -07:00
Chad Jones
6bb0ec23ff
am 6dbf0c13: Add device/lge/mako_svelte-kernel to mako_svelte repo group
...
* commit '6dbf0c1369083e5f49fdba5c7cac281c6efdc3b9':
Add device/lge/mako_svelte-kernel to mako_svelte repo group
2013-09-13 13:20:56 -07:00
Geoff Mendal
3692d6a3b7
am 232f2f8f: Add project platform/vendor/unbundled_google/packages/CastMirroring Bug: 10726512 Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121 Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203 Reviewed-by: Andreas Huber <andih@google.com>
...
* commit '232f2f8f25852b434dc8fe8767facb7fa03ca9e0':
Add project platform/vendor/unbundled_google/packages/CastMirroring Bug: 10726512 Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121 Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203 Reviewed-by: Andreas Huber <andih@google.com > Reviewed-by: Justin Ho <justinho@google.com > Reviewed-by: Rachad Alao <rachad@google.com >
2013-09-13 13:20:37 -07:00
Chad Jones
6dbf0c1369
Add device/lge/mako_svelte-kernel to mako_svelte repo group
...
Bug: 10686568
Change-Id: I7b233fe89ac240a80a608e3e899b62340acae28b
Reviewed-on: https://googleplex-android-review.git.corp.google.com/359317
Reviewed-by: Chad Jones <chadj@google.com >
2013-09-13 18:29:25 +00:00
Geoff Mendal
232f2f8f25
Add project platform/vendor/unbundled_google/packages/CastMirroring
...
Bug: 10726512
Change-Id: I13e0dbc140928326f7a3745642eccfb4c211e121
Reviewed-on: https://googleplex-android-review.git.corp.google.com/359203
Reviewed-by: Andreas Huber <andih@google.com >
Reviewed-by: Justin Ho <justinho@google.com >
Reviewed-by: Rachad Alao <rachad@google.com >
2013-09-13 17:04:55 +00:00
Baligh Uddin
ead14d81fe
Add tools/studio/translation to Internal master manifest
...
Bug: 10690868
Change-Id: I7ef69ae5b951f3720aeff858ce02e22a59c476ae
Reviewed-on: https://googleplex-android-review.git.corp.google.com/357848
Reviewed-by: Baligh Uddin <baligh@google.com >
2013-09-12 15:26:49 +00:00
Geoff Mendal
690b71855a
am c3a8acf7: am 44707b81: Remove AndroidCastReceiver from klp-dev Bug: 10708905 Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001 Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783 Reviewed-by: Chad Jones <chadj@google.com>
...
* commit 'c3a8acf732f25026aba69096cefa764c496eb968':
Remove AndroidCastReceiver from klp-dev Bug: 10708905 Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001 Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783 Reviewed-by: Chad Jones <chadj@google.com >
2013-09-11 17:23:57 -07:00
Baligh Uddin
c58307057d
Add tools/studio/translation to AOSP master manifest
2013-09-11 15:13:18 -07:00
Geoff Mendal
c3a8acf732
am 44707b81: Remove AndroidCastReceiver from klp-dev Bug: 10708905 Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001 Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783 Reviewed-by: Chad Jones <chadj@google.com>
...
* commit '44707b81e267bb856962c3eee9e336fad4d7676b':
Remove AndroidCastReceiver from klp-dev Bug: 10708905 Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001 Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783 Reviewed-by: Chad Jones <chadj@google.com >
2013-09-11 14:45:47 -07:00
Geoff Mendal
44707b81e2
Remove AndroidCastReceiver from klp-dev
...
Bug: 10708905
Change-Id: I87ed73d0f4cce2ecb0f4c4e483ab9cda4a051001
Reviewed-on: https://googleplex-android-review.git.corp.google.com/357783
Reviewed-by: Chad Jones <chadj@google.com >
2013-09-11 21:44:12 +00:00
Geoff Mendal
9ffa91fbc0
Remove AndroidCastReceiver from master
...
Bug: 10708905
Change-Id: Ib37d6f8edf178340faf15c8c4d28c354d454e2b1
Reviewed-on: https://googleplex-android-review.git.corp.google.com/357759
Reviewed-by: Ying Wang <wangying@google.com >
Reviewed-by: Anton Vayvod <avayvod@google.com >
2013-09-11 21:05:55 +00:00
Ed Heyl
ca19d568a6
am bf73dbf9: am 5ac9752b: am ba1edc7a: am c756d712: merge manifest and resolve conflicts
...
* commit 'bf73dbf961dd8f7761c844a8b465a26e2eaf2ebb':
Rollback review URL update
Update review URL
jb-mr2-docs
2013-09-11 10:19:17 -07:00
Ed Heyl
bf73dbf961
am 5ac9752b: am ba1edc7a: am c756d712: merge manifest and resolve conflicts
...
* commit '5ac9752bdca524d0a335ed01f608ba6b8b82c0dd':
Rollback review URL update
Update review URL
jb-mr2-docs
2013-09-11 10:15:21 -07:00
Ed Heyl
5ac9752bdc
am ba1edc7a: am c756d712: merge manifest and resolve conflicts
...
* commit 'ba1edc7a27ca55c1c8222cb66a50a4a4427c0052':
Rollback review URL update
Update review URL
jb-mr2-docs
2013-09-11 10:13:13 -07:00
Ed Heyl
ba1edc7a27
am c756d712: merge manifest and resolve conflicts
...
* commit 'c756d71265a7ea848cff0b42cbc63cbca52bd1bb':
Rollback review URL update
Update review URL
jb-mr2-docs
2013-09-11 10:11:43 -07:00
Ed Heyl
c756d71265
merge manifest and resolve conflicts
2013-09-11 10:06:48 -07:00
Chad Jones
025c8a8a8c
am a1bab2b2: am 3a8ff655: Add external/sil-fonts
...
* commit 'a1bab2b24ad2e18002404b5fe0e3303efdc72160':
Add external/sil-fonts
2013-09-10 15:43:57 -07:00
Chad Jones
a1bab2b24a
am 3a8ff655: Add external/sil-fonts
...
* commit '3a8ff6551f63441ddb810807ee05371e0c6d2904':
Add external/sil-fonts
2013-09-10 15:39:11 -07:00
Chad Jones
3a8ff6551f
Add external/sil-fonts
...
Bug: 10625246
Change-Id: I422e501c0f64e6689f59fb7f94cb8cbec82af0f2
Reviewed-on: https://googleplex-android-review.git.corp.google.com/357129
Reviewed-by: Bart Sears <bsears@google.com >
2013-09-10 22:35:46 +00:00
Chad Jones
3999945af1
am fd78dd20: am 3e4dc128: am 71edb48b: am 1788940d: am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit 'fd78dd204ab4f30d781fd4952e815ec106b606a3':
Rollback review URL update
2013-09-09 15:09:35 -07:00
Chad Jones
72140dd546
am 521e52d4: am c2c657d3: am ecf5c69d: am 1b13b462: am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit '521e52d41d610543315846045bf7c4e76fa69e72':
Rollback review URL update
2013-09-09 15:09:34 -07:00
Chad Jones
fd78dd204a
am 3e4dc128: am 71edb48b: am 1788940d: am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit '3e4dc128c637de19baa8e397609f34af71ea2fac':
Rollback review URL update
2013-09-09 15:06:47 -07:00
Chad Jones
521e52d41d
am c2c657d3: am ecf5c69d: am 1b13b462: am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit 'c2c657d33a7076d3dfcfd4bb4a930aaa7bef8712':
Rollback review URL update
2013-09-09 15:06:46 -07:00
Chad Jones
3e4dc128c6
am 71edb48b: am 1788940d: am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit '71edb48b933ae5951ae03aaabf1575e097beb21e':
Rollback review URL update
2013-09-09 15:01:35 -07:00
Chad Jones
c2c657d33a
am ecf5c69d: am 1b13b462: am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit 'ecf5c69d5970f241163050cc3dbdb196429685e3':
Rollback review URL update
2013-09-09 15:01:34 -07:00
Chad Jones
3018277ac3
am 28a63dc9: am 4308d90d: am fc60bd6e: am 19ec5e9f: am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit '28a63dc9c2402ea27988b37963fc90b551e31746':
2013-09-09 14:59:23 -07:00
Chad Jones
983b738874
am 9828c114: am 18a23161: am b65e48c0: am 6706a7ff: resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
...
* commit '9828c114fc3890911f38f6102362bd077cd57bab':
Rollback review URL update
2013-09-09 14:59:22 -07:00
Chad Jones
7506fa7a4e
am 87a260e0: am 92d4609c: am becedbaf: am 59eecc13: Merge branch \'jb-mr2-ub-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
...
* commit '87a260e01758943fb5ecb6e96ddc22140abcf58c':
2013-09-09 14:59:21 -07:00
Chad Jones
3762fa566a
am d8c26f02: am 09294dfd: am b3e2f51c: resolved conflicts for merge of d80e3b00 to jb-mr2-dev-plus-aosp
...
* commit 'd8c26f023c334eccc164b3eb9f69f575bdaf2d49':
Rollback review URL update
2013-09-09 14:59:20 -07:00
Chad Jones
71edb48b93
am 1788940d: am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit '1788940d6ace84c6eb68ebfa1f0f5f60b5aee560':
Rollback review URL update
2013-09-09 14:58:35 -07:00
Chad Jones
ecf5c69d59
am 1b13b462: am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit '1b13b462560c3fb179db67e2236c46c6c3f034d4':
Rollback review URL update
2013-09-09 14:58:34 -07:00
Chad Jones
28a63dc9c2
am 4308d90d: am fc60bd6e: am 19ec5e9f: am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit '4308d90d506988cb3bcee2347dde931403bc03ea':
2013-09-09 14:57:46 -07:00
Chad Jones
9828c114fc
am 18a23161: am b65e48c0: am 6706a7ff: resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
...
* commit '18a23161a9297af3016bd5f62600ce5d97318244':
Rollback review URL update
2013-09-09 14:57:45 -07:00
Chad Jones
87a260e017
am 92d4609c: am becedbaf: am 59eecc13: Merge branch \'jb-mr2-ub-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
...
* commit '92d4609cf5eb2ff79b24bef99b69a79bab06d610':
2013-09-09 14:57:44 -07:00
Chad Jones
d8c26f023c
am 09294dfd: am b3e2f51c: resolved conflicts for merge of d80e3b00 to jb-mr2-dev-plus-aosp
...
* commit '09294dfd01440da1c24aefd6568a198fc4280acb':
Rollback review URL update
2013-09-09 14:57:43 -07:00
Chad Jones
29dbe2b25e
am d1e279c0: am d1ee7c73: am f8628ca7: Merge branch \'jb-mr2-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev-plus-aosp
...
* commit 'd1e279c070d556e7e69cd9cfcbe862f7dde31564':
2013-09-09 14:55:46 -07:00
Chad Jones
e39f060b78
am a40641be: am 943004fa: resolved conflicts for merge of 21754470 to klp-dev
...
* commit 'a40641be0954cf25c7c2dd1023c3e096a1186de4':
Rollback review URL update
2013-09-09 14:55:45 -07:00
Chad Jones
1788940d6a
am f4c989a9: am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit 'f4c989a9ea025db4ba42818c69ecbd383b3e141a':
Rollback review URL update
2013-09-09 14:54:39 -07:00
Chad Jones
1b13b46256
am eab25b00: am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit 'eab25b004a3bd2f759bc752a5de00f3e87e9c199':
Rollback review URL update
2013-09-09 14:54:38 -07:00
Chad Jones
4308d90d50
am fc60bd6e: am 19ec5e9f: am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit 'fc60bd6e88ca01da74426065989d05db32ae59fa':
2013-09-09 14:53:05 -07:00
Chad Jones
18a23161a9
am b65e48c0: am 6706a7ff: resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
...
* commit 'b65e48c0d61f2f5feeb68bc30e237962ee2004f6':
Rollback review URL update
2013-09-09 14:53:04 -07:00
Chad Jones
92d4609cf5
am becedbaf: am 59eecc13: Merge branch \'jb-mr2-ub-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
...
* commit 'becedbafcb0b3678870b2fb77ae2aa214523031e':
2013-09-09 14:53:03 -07:00
Chad Jones
09294dfd01
am b3e2f51c: resolved conflicts for merge of d80e3b00 to jb-mr2-dev-plus-aosp
...
* commit 'b3e2f51c8808e1176e868f0a7b3f2b72e39292fa':
Rollback review URL update
2013-09-09 14:53:02 -07:00
Chad Jones
f4c989a9ea
am 51a98429: am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit '51a98429d2ad2fa0773bc2dbbcf9c70c636e77f4':
Rollback review URL update
2013-09-09 14:51:30 -07:00
Chad Jones
eab25b004a
am a8fdea4e: am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit 'a8fdea4edf59c8d2a0c1c75b1b1fbbe6ad3b9a57':
Rollback review URL update
2013-09-09 14:51:29 -07:00
Chad Jones
fc60bd6e88
am 19ec5e9f: am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit '19ec5e9ff0a63eea2a4e519b53674ab7aee50293':
2013-09-09 14:51:07 -07:00
Chad Jones
b65e48c0d6
am 6706a7ff: resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
...
* commit '6706a7ff0d67feeeddf24fbeb640a42c98e9bfc2':
Rollback review URL update
2013-09-09 14:51:05 -07:00
Chad Jones
becedbafcb
am 59eecc13: Merge branch \'jb-mr2-ub-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
...
* commit '59eecc136dad78ea8be5db7c8edb12d53c6b4efb':
2013-09-09 14:51:04 -07:00
Chad Jones
d1e279c070
am d1ee7c73: am f8628ca7: Merge branch \'jb-mr2-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev-plus-aosp
...
* commit 'd1ee7c73457bcecde9b9d73ef3b16c15184b29af':
2013-09-09 14:50:54 -07:00
Chad Jones
a40641be09
am 943004fa: resolved conflicts for merge of 21754470 to klp-dev
...
* commit '943004fa9ae08cd3fe64b90a1d0a8b72acc5e770':
Rollback review URL update
2013-09-09 14:50:53 -07:00
Chad Jones
b3e2f51c88
resolved conflicts for merge of d80e3b00 to jb-mr2-dev-plus-aosp
2013-09-09 14:49:55 -07:00
Chad Jones
d1ee7c7345
am f8628ca7: Merge branch \'jb-mr2-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev-plus-aosp
...
* commit 'f8628ca72bf3c468ddf0f319ac9baea4825ac34e':
2013-09-09 14:49:43 -07:00
Chad Jones
943004fa9a
resolved conflicts for merge of 21754470 to klp-dev
2013-09-09 14:48:51 -07:00
Chad Jones
ea319e22c9
am ea3fbb05: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/platform/manifest into klp-dev-plus-aosp
...
* commit 'ea3fbb052c4c1065a7ba60aeed008b76a8cb764b':
2013-09-09 14:48:41 -07:00
Chad Jones
51a98429d2
am c916edb2: am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit 'c916edb25b3430ce730e5d16a5ba1116f31d332f':
Rollback review URL update
2013-09-09 14:48:16 -07:00
Chad Jones
a8fdea4edf
am 9159ed70: resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
...
* commit '9159ed704f9afe05c916b87433119727a1423217':
Rollback review URL update
2013-09-09 14:48:15 -07:00
Chad Jones
e1627b58b7
resolved conflicts for merge of 1bd3daa8 to master
2013-09-09 14:47:46 -07:00
Chad Jones
19ec5e9ff0
am ed39cefa: Merge branch \'jb-mr2-dev\' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
...
* commit 'ed39cefad6587ca4dd4fec0ea9d2e60c3ad126ec':
2013-09-09 14:47:12 -07:00
Chad Jones
6706a7ff0d
resolved conflicts for merge of 7eea5614 to jb-mr2-ub-dev
2013-09-09 14:46:25 -07:00
Chad Jones
c916edb25b
am 3b6427e9: resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
...
* commit '3b6427e9695a61ce05e98d7caa402f6ba6890e4e':
Rollback review URL update
2013-09-09 14:45:58 -07:00
Chad Jones
9159ed704f
resolved conflicts for merge of 63131368 to jb-mr1-aah-dev
2013-09-09 14:45:09 -07:00
Chad Jones
3b6427e969
resolved conflicts for merge of 4d17d21a to jb-mr1.1-dev
2013-09-09 14:35:31 -07:00
Chad Jones
ea3fbb052c
Merge branch 'klp-dev-plus-aosp' of sso://googleplex-android.git.corp.google.com/platform/manifest into klp-dev-plus-aosp
2013-09-09 14:34:13 -07:00
Chad Jones
59eecc136d
Merge branch 'jb-mr2-ub-dev' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-ub-dev
2013-09-09 14:31:57 -07:00
Chad Jones
f8628ca72b
Merge branch 'jb-mr2-dev-plus-aosp' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev-plus-aosp
2013-09-09 14:31:38 -07:00
Chad Jones
ed39cefad6
Merge branch 'jb-mr2-dev' of sso://googleplex-android.git.corp.google.com/platform/manifest into jb-mr2-dev
2013-09-09 14:30:42 -07:00
Chad Jones
342bcebe7c
am bd4dc518: am 6623b0e5: am 20ff57c7: am 31b7e38f: am 2bf324d3: am 3a02b732: am e720c249: am 9fc57747: resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
...
* commit 'bd4dc518a04bf33cb750d6285d6782533fcc72fa':
Update review URL
2013-09-09 14:29:23 -07:00
Chad Jones
2ce731dd8c
am 82cfce6f: am 9fc3615e: am 4dfa0db4: am 7c931a9e: am 24bec107: am 9bae641b: am 99aafa2b: resolved conflicts for merge of 8c94eaae to jb-mr1-aah-dev
...
* commit '82cfce6f3e0e6b8e85aa7c8f36078136d7bd788f':
Update review URL
2013-09-09 14:29:22 -07:00
Chad Jones
c3826f0363
am ea541b74: am 2145e42a: am fe42c3c1: am 72211432: resolved conflicts for merge of a6a4bf90 to jb-mr2-ub-dev
...
* commit 'ea541b74e945c5ea8cf379b553e6e14b67ef0ee4':
Update review URL
2013-09-09 14:29:21 -07:00
Chad Jones
3496c83cbb
am 884de454: am 28caf325: am e44780de: resolved conflicts for merge of 614263c6 to jb-mr2-dev-plus-aosp
...
* commit '884de454e122dbb8e6f456432deaf3e14d935367':
Update review URL
2013-09-09 14:29:20 -07:00
Chad Jones
5a4df19d03
am 79cd2def: am 0ea841da: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev
...
* commit '79cd2defc42da5ec33fff665ef1b5177ac36a866':
2013-09-09 14:29:18 -07:00
Jean-Baptiste Queru
1eab4bc78a
am 69b205cb: (-s ours) am d6b693e0: am 491ff44b: (-s ours) am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '69b205cbe9a6a219d893918e0e9f6c6b800433cd':
2013-09-09 14:29:17 -07:00
Chad Jones
a2e1b31987
am 62d920ec: resolved conflicts for merge of 0a783358 to klp-dev-plus-aosp
...
* commit '62d920ec4e5b63c702efca8a7df63b465f899685':
Rollback review URL update
2013-09-09 14:25:42 -07:00
Chad Jones
bd4dc518a0
am 6623b0e5: am 20ff57c7: am 31b7e38f: am 2bf324d3: am 3a02b732: am e720c249: am 9fc57747: resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
...
* commit '6623b0e57a422b70744773927a3c51cc4bcb3a2b':
Update review URL
2013-09-09 14:25:29 -07:00
Chad Jones
82cfce6f3e
am 9fc3615e: am 4dfa0db4: am 7c931a9e: am 24bec107: am 9bae641b: am 99aafa2b: resolved conflicts for merge of 8c94eaae to jb-mr1-aah-dev
...
* commit '9fc3615e1de83ed45b6dc87de0a53952806f337f':
Update review URL
2013-09-09 14:25:28 -07:00
Chad Jones
ea541b74e9
am 2145e42a: am fe42c3c1: am 72211432: resolved conflicts for merge of a6a4bf90 to jb-mr2-ub-dev
...
* commit '2145e42a6375f9d57c7c5793e8cfdb47f357cb1e':
Update review URL
2013-09-09 14:25:25 -07:00
Chad Jones
884de454e1
am 28caf325: am e44780de: resolved conflicts for merge of 614263c6 to jb-mr2-dev-plus-aosp
...
* commit '28caf325ab41612815a9cd01a90d0e81248004b1':
Update review URL
2013-09-09 14:25:24 -07:00
Chad Jones
79cd2defc4
am 0ea841da: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev
...
* commit '0ea841da5224caf1f1e1b5ef4137aa61b4127f09':
2013-09-09 14:25:23 -07:00
Jean-Baptiste Queru
69b205cbe9
am d6b693e0: am 491ff44b: (-s ours) am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit 'd6b693e0d2b6e1cf0049e7981bb75aeaed690c01':
2013-09-09 14:25:22 -07:00
Chad Jones
62d920ec4e
resolved conflicts for merge of 0a783358 to klp-dev-plus-aosp
2013-09-09 14:23:54 -07:00
Chad Jones
6623b0e57a
am 20ff57c7: am 31b7e38f: am 2bf324d3: am 3a02b732: am e720c249: am 9fc57747: resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
...
* commit '20ff57c7c64bf43ebcd28798ebf39990e84174d8':
Update review URL
2013-09-09 14:22:31 -07:00
Chad Jones
9fc3615e1d
am 4dfa0db4: am 7c931a9e: am 24bec107: am 9bae641b: am 99aafa2b: resolved conflicts for merge of 8c94eaae to jb-mr1-aah-dev
...
* commit '4dfa0db42cc35f7e26be08a81336581f78b9342c':
Update review URL
2013-09-09 14:22:30 -07:00
Chad Jones
20ff57c7c6
am 31b7e38f: am 2bf324d3: am 3a02b732: am e720c249: am 9fc57747: resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
...
* commit '31b7e38f7cc182f61a8d1de767b3b1130afc3295':
Update review URL
2013-09-09 14:20:47 -07:00
Chad Jones
4dfa0db42c
am 7c931a9e: am 24bec107: am 9bae641b: am 99aafa2b: resolved conflicts for merge of 8c94eaae to jb-mr1-aah-dev
...
* commit '7c931a9e71404de2a9d92501107cbc0fd47323ce':
Update review URL
2013-09-09 14:20:46 -07:00
Chad Jones
a059318711
am 0db85cfd: am 59d9890e: resolved conflicts for merge of c777cef0 to klp-dev
...
* commit '0db85cfda8c93c3a32ca523544e665f8a5534228':
Update review URL
2013-09-09 14:20:15 -07:00
Chad Jones
fa5f93870c
am fafedfa4: resolved conflicts for merge of e5146722 to klp-dev-plus-aosp
...
* commit 'fafedfa42f66c266d786b86b3ec85fd1d4d46c82':
Update review URL
2013-09-09 14:20:14 -07:00
Chad Jones
0db85cfda8
am 59d9890e: resolved conflicts for merge of c777cef0 to klp-dev
...
* commit '59d9890e758d1aa12ba17ffc6b84f4579b87768d':
Update review URL
2013-09-09 14:19:43 -07:00
Chad Jones
fafedfa42f
resolved conflicts for merge of e5146722 to klp-dev-plus-aosp
2013-09-09 14:18:10 -07:00
Chad Jones
31b7e38f7c
am 2bf324d3: am 3a02b732: am e720c249: am 9fc57747: resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
...
* commit '2bf324d39ce11fec6ebf38fdeb687800665859a0':
Update review URL
2013-09-09 14:17:57 -07:00
Chad Jones
7c931a9e71
am 24bec107: am 9bae641b: am 99aafa2b: resolved conflicts for merge of 8c94eaae to jb-mr1-aah-dev
...
* commit '24bec1078538abf37c463603c2a21a3b2095320a':
Update review URL
2013-09-09 14:17:56 -07:00
Chad Jones
2bf324d39c
am 3a02b732: am e720c249: am 9fc57747: resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
...
* commit '3a02b732951508f0384e09ff4eda280b0a80c6e1':
Update review URL
2013-09-09 14:15:05 -07:00
Chad Jones
24bec10785
am 9bae641b: am 99aafa2b: resolved conflicts for merge of 8c94eaae to jb-mr1-aah-dev
...
* commit '9bae641b6c9c4d034ee966fa4fc7e1dca5035b68':
Update review URL
2013-09-09 14:15:04 -07:00
Chad Jones
2145e42a63
am fe42c3c1: am 72211432: resolved conflicts for merge of a6a4bf90 to jb-mr2-ub-dev
...
* commit 'fe42c3c1abef5cd78ed167c22476e246cd61e554':
Update review URL
2013-09-09 14:14:00 -07:00
Chad Jones
28caf325ab
am e44780de: resolved conflicts for merge of 614263c6 to jb-mr2-dev-plus-aosp
...
* commit 'e44780def4c33a6656998458c7bc9c04eff60e4d':
Update review URL
2013-09-09 14:13:59 -07:00
Chad Jones
0ea841da52
Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev
2013-09-09 14:13:59 -07:00
Chad Jones
549b754b3b
resolved conflicts for merge of 8284bfe1 to master
2013-09-09 14:13:43 -07:00
Chad Jones
fe42c3c1ab
am 72211432: resolved conflicts for merge of a6a4bf90 to jb-mr2-ub-dev
...
* commit '72211432bc21ea4bacc381379940cb88dc6a013d':
Update review URL
2013-09-09 14:13:17 -07:00
Chad Jones
e44780def4
resolved conflicts for merge of 614263c6 to jb-mr2-dev-plus-aosp
2013-09-09 14:12:10 -07:00
Chad Jones
3a02b73295
am e720c249: am 9fc57747: resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
...
* commit 'e720c249cc922df00820954b2fb06e48764c9690':
Update review URL
2013-09-09 14:11:51 -07:00
Chad Jones
9bae641b6c
am 99aafa2b: resolved conflicts for merge of 8c94eaae to jb-mr1-aah-dev
...
* commit '99aafa2bef544b95e6ed62df7c882f5024a9627e':
Update review URL
2013-09-09 14:11:50 -07:00
Chad Jones
e720c249cc
am 9fc57747: resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
...
* commit '9fc577475de304d9bf2d29674fdf522998507d93':
Update review URL
2013-09-09 14:08:37 -07:00
Chad Jones
99aafa2bef
resolved conflicts for merge of 8c94eaae to jb-mr1-aah-dev
2013-09-09 14:08:02 -07:00
Chad Jones
b2e7a79eae
Rollback review URL update
2013-09-09 13:59:12 -07:00
Chad Jones
1bd3daa8ab
Rollback review URL update
2013-09-09 13:59:11 -07:00
Chad Jones
0a78335871
Rollback review URL update
2013-09-09 13:59:10 -07:00
Chad Jones
30e7e8ed8b
Rollback review URL update
2013-09-09 13:59:08 -07:00
Chad Jones
d80e3b0080
Rollback review URL update
2013-09-09 13:59:08 -07:00
Chad Jones
2175447016
Rollback review URL update
2013-09-09 13:59:08 -07:00
Chad Jones
7eea561483
Rollback review URL update
2013-09-09 13:59:08 -07:00
Chad Jones
631313685f
Rollback review URL update
2013-09-09 13:59:07 -07:00
Chad Jones
4d17d21a14
Rollback review URL update
2013-09-09 13:59:07 -07:00
Chad Jones
9fc577475d
resolved conflicts for merge of dd3ccb45 to jb-mr1.1-dev
2013-09-09 13:11:37 -07:00
Chad Jones
72211432bc
resolved conflicts for merge of a6a4bf90 to jb-mr2-ub-dev
2013-09-09 13:10:15 -07:00
Chad Jones
59d9890e75
resolved conflicts for merge of c777cef0 to klp-dev
2013-09-09 13:08:31 -07:00
Jean-Baptiste Queru
d6b693e0d2
am 491ff44b: (-s ours) am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '491ff44b79c2224542428d33c3e36798a26def79':
2013-09-09 12:53:42 -07:00
Chad Jones
1f21f9dd92
Update review URL
2013-09-09 11:44:23 -07:00
Chad Jones
8284bfe13e
Update review URL
2013-09-09 11:44:21 -07:00
Chad Jones
e514672295
Update review URL
2013-09-09 11:44:21 -07:00
Chad Jones
c777cef01d
Update review URL
2013-09-09 11:44:18 -07:00
Chad Jones
614263c6ee
Update review URL
2013-09-09 11:44:18 -07:00
Chad Jones
1684f3666d
Update review URL
2013-09-09 11:44:18 -07:00
Chad Jones
a6a4bf903c
Update review URL
2013-09-09 11:44:17 -07:00
Chad Jones
8c94eaaecb
Update review URL
2013-09-09 11:44:17 -07:00
Chad Jones
dd3ccb4506
Update review URL
2013-09-09 11:44:17 -07:00
Chad Jones
9382be51a1
am b9447bda: resolved conflicts for merge of 1633a64f to klp-dev-plus-aosp
...
* commit 'b9447bda2ef0a46c16e48528b7c20a5f787ba1e2':
Add platform/external/sil-fonts
2013-09-06 09:53:10 -07:00
Chad Jones
b9447bda2e
resolved conflicts for merge of 1633a64f to klp-dev-plus-aosp
2013-09-06 09:48:03 -07:00
Chad Jones
1633a64f47
Add platform/external/sil-fonts
...
Change-Id: Ic4707dea718063f799faf5d05d3737d4ebe335c1
Reviewed-on: https://googleplex-android-review.git.corp.google.com/355300
Reviewed-by: Chad Jones <chadj@google.com >
2013-09-06 16:43:12 +00:00
Chad Jones
e9fa485024
am 0b6b7031: (-s ours) am 4d0f0bf0: Add projects for ardbeg - DO NOT MERGE
...
* commit '0b6b703178c4cdefe829d46b9d721d0e80c77b35':
Add projects for ardbeg - DO NOT MERGE
2013-09-05 23:52:14 -07:00
Chad Jones
0b6b703178
am 4d0f0bf0: Add projects for ardbeg - DO NOT MERGE
...
* commit '4d0f0bf034d7964ad567ff9a5a1c466b4a0da5d7':
Add projects for ardbeg - DO NOT MERGE
2013-09-05 16:46:12 -07:00
Chad Jones
4d0f0bf034
Add projects for ardbeg - DO NOT MERGE
...
Bug: 10623438
Change-Id: I54f5e16c479cccb3013198f3e1755a1f6fce34a2
Reviewed-on: https://googleplex-android-review.git.corp.google.com/354992
Reviewed-by: Colin Cross <ccross@google.com >
2013-09-05 23:44:11 +00:00
Maurice Chu
5d8de15652
am 85d4673e: am cf6835df: Change KLP-dev to point to GMS Core Fontal
...
* commit '85d4673ec1a353da7627c35a469f25ee24a24e29':
Change KLP-dev to point to GMS Core Fontal
2013-08-30 16:47:09 -07:00
Maurice Chu
85d4673ec1
am cf6835df: Change KLP-dev to point to GMS Core Fontal
...
* commit 'cf6835dfe4938fb8b84b9835eaa15fd0840ed675':
Change KLP-dev to point to GMS Core Fontal
2013-08-30 16:45:16 -07:00
Maurice Chu
cf6835dfe4
Change KLP-dev to point to GMS Core Fontal
...
Change-Id: Icc3cd664be093402109ed319cd51ca0d36b98982
Reviewed-on: https://googleplex-android-review.googlesource.com/352650
Reviewed-by: Carlos Valdivia <carlosvaldivia@google.com >
2013-08-30 23:42:30 +00:00
Chad Jones
ba87129ecc
am cb370c33: am 828eb2e3: Add external/tinycompress to set pulled in by PDK pushes.
...
* commit 'cb370c330b4bcf034ac50dd62489163b78f98130':
Add external/tinycompress to set pulled in by PDK pushes.
2013-08-29 13:24:40 -07:00
Chad Jones
cb370c330b
am 828eb2e3: Add external/tinycompress to set pulled in by PDK pushes.
...
* commit '828eb2e3830f66b17d1e9a65a9dc9132ed9eaabe':
Add external/tinycompress to set pulled in by PDK pushes.
2013-08-29 13:21:14 -07:00
Chad Jones
828eb2e383
Add external/tinycompress to set pulled in by PDK pushes.
...
Change-Id: I9f5ce75033aea5cdcfe86f5fb0fefa1a642774e0
Reviewed-on: https://googleplex-android-review.googlesource.com/351645
Reviewed-by: Keun-young Park <keunyoung@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-29 20:18:28 +00:00
keunyoung
2003708742
am 1c75d9e1: am 6bdaeae6: add vendor/auto/projection_protocol to default manifest
...
* commit '1c75d9e17f3556b794ef9d896bb8a234e5426fcd':
add vendor/auto/projection_protocol to default manifest
2013-08-29 12:05:40 -07:00
keunyoung
1c75d9e17f
am 6bdaeae6: add vendor/auto/projection_protocol to default manifest
...
* commit '6bdaeae6c3f5dfa6997ec7af9830aa03ec5a1395':
add vendor/auto/projection_protocol to default manifest
2013-08-29 12:03:29 -07:00
keunyoung
6bdaeae6c3
add vendor/auto/projection_protocol to default manifest
...
- The project is excuded from Dr No: No code shipping for klp release
- The project is for holding car-mobile protocol, which will be used by vendor/auto/projection.
- It is separated from vendor/auto/projection to share it with partners.
Change-Id: I00e7c3664ff3e97474f3894680af7ad0ebc1cb87
Reviewed-on: https://googleplex-android-review.googlesource.com/351585
Reviewed-by: Zhen Yu Song <zhensong@google.com >
Reviewed-by: Rakesh Iyer <rni@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Ying Wang <wangying@google.com >
2013-08-29 18:59:45 +00:00
Geoff Mendal
1898802a36
Rename tegra5 projects to tegra124 in master branch
...
Bug: 10520688
Change-Id: Icc4760936178174408f8a4e4255fc17eed681db8
Reviewed-on: https://googleplex-android-review.googlesource.com/350365
Reviewed-by: Colin Cross <ccross@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-28 17:55:01 +00:00
Mike Lockwood
34c8c66692
Add platform/frameworks/tools project
...
Change-Id: Iddeb2af87dd90b29bae0b1c68462e94cfc73557d
Reviewed-on: https://googleplex-android-review.googlesource.com/350553
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-08-28 17:16:23 +00:00
Geoff Mendal
0c78e62645
am 1d0bc26f: am 53883097: Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev Bug: 10493211 Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50 Reviewed-on: https://googleplex-android-review.googlesource.com/349370 Reviewed-by: Justin Ho <justi
...
* commit '1d0bc26f6dc47379cd3a3b4d7f48d6b07a31b33c':
Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev Bug: 10493211 Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50 Reviewed-on: https://googleplex-android-review.googlesource.com/349370 Reviewed-by: Justin Ho <justinho@google.com >
2013-08-27 13:28:08 -07:00
Geoff Mendal
1d0bc26f6d
am 53883097: Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev Bug: 10493211 Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50 Reviewed-on: https://googleplex-android-review.googlesource.com/349370 Reviewed-by: Justin Ho <justinho@google.co
...
* commit '538830977e57b482ffb291c2914297f3b513ec7e':
Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev Bug: 10493211 Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50 Reviewed-on: https://googleplex-android-review.googlesource.com/349370 Reviewed-by: Justin Ho <justinho@google.com >
2013-08-27 13:18:54 -07:00
Geoff Mendal
538830977e
Add project platform/vendor/unbundled_google/packages/Phonesky for klp-dev
...
Bug: 10493211
Change-Id: I94fbc45c3f4c06aa4d09a13469b0b2722989df50
Reviewed-on: https://googleplex-android-review.googlesource.com/349370
Reviewed-by: Justin Ho <justinho@google.com >
2013-08-27 20:16:57 +00:00
Ying Wang
56f4dbe8ba
am 69c0db3c: am 41698d48: Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
...
* commit '69c0db3c07cdaae3a5a1a065838a0249910e34e5':
Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
2013-08-26 16:05:36 -07:00
Ying Wang
69c0db3c07
am 41698d48: Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
...
* commit '41698d48042d2a60de9bf85ac79f70f3a2e6a92a':
Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
2013-08-26 16:04:05 -07:00
Ying Wang
41698d4804
Remove vendor/unbundled_google/packages/NetworkLocation from klp-dev
...
Bug: 8245654
Change-Id: Ifc4ecaa4f8dc7b782c6707bd9475773e960de2dd
Reviewed-on: https://googleplex-android-review.googlesource.com/349272
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Stan Chesnutt <chesnutt@google.com >
Reviewed-by: Ying Wang <wangying@google.com >
2013-08-26 23:02:03 +00:00
Baligh Uddin
5f257569e3
Add hardware/nvidia/tegra5 to master manifest
...
Change-Id: I0c4420334e50bca6f15183201d38be142d3fc725
Reviewed-on: https://googleplex-android-review.googlesource.com/349054
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-08-26 21:01:31 +00:00
Geoff Mendal
d862ee050e
am ae30e4a2: am a7c33da2: Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev Bug: 10447068 Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62 Reviewed-on: https://googleplex-android-review.googlesource.com/348033 Reviewed-by: Bart Sears <bsears@go
...
* commit 'ae30e4a23dcbf10d48800cc13e459a466880eda0':
Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev Bug: 10447068 Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62 Reviewed-on: https://googleplex-android-review.googlesource.com/348033 Reviewed-by: Bart Sears <bsears@google.com >
2013-08-23 05:22:10 -07:00
Geoff Mendal
ae30e4a23d
am a7c33da2: Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev Bug: 10447068 Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62 Reviewed-on: https://googleplex-android-review.googlesource.com/348033 Reviewed-by: Bart Sears <bsears@google.com>
...
* commit 'a7c33da2be99e2771c3491b1a543f0eef28071d1':
Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev Bug: 10447068 Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62 Reviewed-on: https://googleplex-android-review.googlesource.com/348033 Reviewed-by: Bart Sears <bsears@google.com >
2013-08-23 05:19:05 -07:00
Geoff Mendal
a7c33da2be
Add platform/vendor/unbundled_google/packages/CloudPrint2 for klp-dev
...
Bug: 10447068
Change-Id: I7de590fc9b732f67c16d02aefca062c1b574ce62
Reviewed-on: https://googleplex-android-review.googlesource.com/348033
Reviewed-by: Bart Sears <bsears@google.com >
2013-08-23 12:17:01 +00:00
Ying Wang
051cac945d
am 5e407ab9: am 2715f4c8: Remove device/ti/panda from klp-dev manifest.
...
* commit '5e407ab9427506950850770bc2b7f0024dec8f86':
Remove device/ti/panda from klp-dev manifest.
2013-08-20 20:22:54 -07:00
Ying Wang
5e407ab942
am 2715f4c8: Remove device/ti/panda from klp-dev manifest.
...
* commit '2715f4c8dc28c54fa24069e2a712d03d760b6dfa':
Remove device/ti/panda from klp-dev manifest.
2013-08-20 20:21:14 -07:00
Ying Wang
2715f4c8dc
Remove device/ti/panda from klp-dev manifest.
...
Bug: 10414965
Change-Id: I714ddfc028fb0d5daae872062086923ee6eab032
Reviewed-on: https://googleplex-android-review.googlesource.com/346309
Reviewed-by: Ed Heyl <edheyl@google.com >
2013-08-21 03:19:16 +00:00
Scott Kennedy
93905e2645
Remove obsolete mailcommon
...
Change-Id: I9c7dc7708cc10c7821edf78944037042d7dd925e
Reviewed-on: https://googleplex-android-review.googlesource.com/345954
Reviewed-by: Paul Westbrook <pwestbro@google.com >
2013-08-20 17:32:45 +00:00
Bart Sears
dd7d230096
am 87a25278: am 4f775eb0: Remove obsolete CloudPrint and Print apps
...
* commit '87a25278e516d9e546cb2f1104c151545d3654a8':
Remove obsolete CloudPrint and Print apps
2013-08-19 17:15:43 -07:00
Bart Sears
87a25278e5
am 4f775eb0: Remove obsolete CloudPrint and Print apps
...
* commit '4f775eb00ef3cdb9edc39ec221a7dd24fb15a0eb':
Remove obsolete CloudPrint and Print apps
2013-08-19 17:12:20 -07:00
Bart Sears
4f775eb00e
Remove obsolete CloudPrint and Print apps
...
All of the files in these projects have previous been removed
with the approval of the original author (asapperstein) and the
current developer doing printing (svetoslavganov) in these CLs:
https://googleplex-android-review.googlesource.com/#/c/343417/
https://googleplex-android-review.googlesource.com/#/c/343420/
Bug: 10329495
Change-Id: I31a94a5f08330c50c6e57d59a43af2a5d7de3892
Reviewed-on: https://googleplex-android-review.googlesource.com/344825
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Bart Sears <bsears@google.com >
2013-08-20 00:11:01 +00:00
Chad Jones
dd75980f9d
am c70e4da7: am 8aef9b70: Add prebuilts/gcc/...4.8 projects
...
* commit 'c70e4da7483c73fb60be404665ca4609a8191f87':
Add prebuilts/gcc/...4.8 projects
2013-08-19 13:47:43 -07:00
Marco Nelissen
d5366423c5
am 0cc91f28: Merge branch \'klp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev-plus-aosp
...
* commit '0cc91f28a6bf4955f2f87cd4291a504cefd043eb':
2013-08-19 13:47:42 -07:00
Jean-Baptiste Queru
e065ad1730
am f982a70e: (-s ours) am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit 'f982a70e1fc979c8d7a67be8f5b475ce3414acf6':
2013-08-19 13:47:41 -07:00
Chad Jones
c70e4da748
am 8aef9b70: Add prebuilts/gcc/...4.8 projects
...
* commit '8aef9b70b9c3153d4bb4235401616c1ea5c82926':
Add prebuilts/gcc/...4.8 projects
2013-08-19 13:46:15 -07:00
Marco Nelissen
0cc91f28a6
Merge branch 'klp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/manifest into klp-dev-plus-aosp
2013-08-19 13:46:15 -07:00
Chad Jones
8aef9b70b9
Add prebuilts/gcc/...4.8 projects
...
Bug: 10321554
Change-Id: Id408ce2557059621b33872adc15da848b7c46ece
Reviewed-on: https://googleplex-android-review.googlesource.com/343381
Reviewed-by: Ben Cheng <bccheng@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-19 20:43:21 +00:00
Geoff Mendal
099a06f13b
am 714372d5: am 5f84525a: Add project platform/external/sfntly for klp-dev Bug: 10330905 Change-Id: Ie8af314a28c1a33963c97ede6965728769073524 Reviewed-on: https://googleplex-android-review.googlesource.com/343539 Reviewed-by: Justin Ho <justinho@google.com>
...
* commit '714372d5721b4b14066c8dfeee2c6b2055075b6f':
Add project platform/external/sfntly for klp-dev Bug: 10330905 Change-Id: Ie8af314a28c1a33963c97ede6965728769073524 Reviewed-on: https://googleplex-android-review.googlesource.com/343539 Reviewed-by: Justin Ho <justinho@google.com >
2013-08-14 17:18:23 -07:00
Chad Jones
89557bc46d
Add ardbeg group name to ardbeg projects
...
Bug: 10188954
Change-Id: Id2a2da9f3f4c0f14a9ea7bd7252613a116327eb2
Reviewed-on: https://googleplex-android-review.googlesource.com/343471
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-15 00:16:35 +00:00
Geoff Mendal
714372d572
am 5f84525a: Add project platform/external/sfntly for klp-dev Bug: 10330905 Change-Id: Ie8af314a28c1a33963c97ede6965728769073524 Reviewed-on: https://googleplex-android-review.googlesource.com/343539 Reviewed-by: Justin Ho <justinho@google.com>
...
* commit '5f84525ae1da36389ad0c7abbe68a9e1fbcfa140':
Add project platform/external/sfntly for klp-dev Bug: 10330905 Change-Id: Ie8af314a28c1a33963c97ede6965728769073524 Reviewed-on: https://googleplex-android-review.googlesource.com/343539 Reviewed-by: Justin Ho <justinho@google.com >
2013-08-14 17:14:21 -07:00
Geoff Mendal
5f84525ae1
Add project platform/external/sfntly for klp-dev
...
Bug: 10330905
Change-Id: Ie8af314a28c1a33963c97ede6965728769073524
Reviewed-on: https://googleplex-android-review.googlesource.com/343539
Reviewed-by: Justin Ho <justinho@google.com >
2013-08-15 00:10:17 +00:00
Jean-Baptiste Queru
b6b0e75e94
am a69c7969: Merge from klp-dev
...
* commit 'a69c7969f0230538a435f35ca7ec9fe36afec613':
Remove ping/ping6
2013-08-14 11:56:27 -07:00
Jean-Baptiste Queru
a69c7969f0
Merge from klp-dev
2013-08-14 11:53:37 -07:00
Jean-Baptiste Queru
f2e2c01b44
Merge from stage-aosp-master
...
Change-Id: I53059cf906c4276fe1be2efa7454d4f97775e963
2013-08-14 10:57:23 -07:00
Jean-Baptiste Queru
f982a70e1f
am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '2281429d310792932bf10beedc732e077cd46eb6':
Unify with jb-mr2-dev-plus-aosp - do not merge
2013-08-14 10:53:30 -07:00
Jean-Baptiste Queru
bcef365284
Merge from mirror-aosp-master
2013-08-14 10:35:44 -07:00
Jeff Hamilton
6a242af8ff
am 32e8c1c1: (-s ours) am c362d939: DO NOT MERGE Update GMS core client prebuilts to finn.
...
* commit '32e8c1c15a7f90468a344fed15463381a9556fb4':
DO NOT MERGE Update GMS core client prebuilts to finn.
2013-08-12 15:52:05 -07:00
Jean-Baptiste Queru
047ae672ba
Remove ping/ping6
...
Change-Id: Iad36d662688d31994a681ff7db38cb0c0ec573b4
Reviewed-on: https://googleplex-android-review.googlesource.com/342018
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-12 21:34:38 +00:00
Jeff Hamilton
32e8c1c15a
am c362d939: DO NOT MERGE Update GMS core client prebuilts to finn.
...
* commit 'c362d9399b926efca2d210e5302171e498154def':
DO NOT MERGE Update GMS core client prebuilts to finn.
2013-08-12 14:26:15 -07:00
The Android Open Source Project
1c546d573e
Remove obsolete ping/ping6
...
Change-Id: I4929adc3be1f363b21037f3ff8f69f6bf2c76ea9
2013-08-12 13:56:23 -07:00
Jeff Hamilton
c362d9399b
DO NOT MERGE Update GMS core client prebuilts to finn.
...
Change-Id: I9f741f7a6cf8b28b5fd9329f08963c8325daba85
Reviewed-on: https://googleplex-android-review.googlesource.com/341716
Reviewed-by: Jeff Hamilton <jham@google.com >
2013-08-12 20:17:22 +00:00
Sascha Haeberling
97331dd92e
am db650ab2: am 70be1dad: Adding Camera2 and GoogleCamera to klp-dev manifest.
...
* commit 'db650ab247b7fd76a5ed2d79c933494ce333b7a5':
Adding Camera2 and GoogleCamera to klp-dev manifest.
2013-08-12 13:14:37 -07:00
Sascha Haeberling
db650ab247
am 70be1dad: Adding Camera2 and GoogleCamera to klp-dev manifest.
...
* commit '70be1dad3a25351b3bbec482ce66c93abd892845':
Adding Camera2 and GoogleCamera to klp-dev manifest.
2013-08-12 13:13:15 -07:00
Sascha Haeberling
70be1dad3a
Adding Camera2 and GoogleCamera to klp-dev manifest.
...
Change-Id: I555ddda4851833f24980d3baff47508cbcf313ce
Reviewed-on: https://googleplex-android-review.googlesource.com/341940
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-08-12 20:10:36 +00:00
Torne (Richard Coles)
c9b91004a6
am f1723480: am 8fed2f9d: Remove external/chromium_org/googleurl.
...
* commit 'f1723480891d7ea29ca22da0bfd9eb29e9f17402':
Remove external/chromium_org/googleurl.
2013-08-12 11:08:47 -07:00
Chad Jones
881f99aefc
am d931a35c: (-s ours) am 0cada6b0: fix two small whitespace diff from master - DO NOT MERGE
...
* commit 'd931a35c14db451cbf1f3f98fb1158a24e5d0e14':
fix two small whitespace diff from master - DO NOT MERGE
2013-08-12 11:08:46 -07:00
Ed Heyl
99bc6a1b22
resolve conflicts w/8db93645
2013-08-12 11:07:39 -07:00
Ed Heyl
cdd739285c
resovle 3aa9630c63
2013-08-12 10:32:32 -07:00
Torne (Richard Coles)
f172348089
am 8fed2f9d: Remove external/chromium_org/googleurl.
...
* commit '8fed2f9d064dba9dfec49bc03a6a975a5930798d':
Remove external/chromium_org/googleurl.
2013-08-12 09:58:48 -07:00
Chad Jones
d931a35c14
am 0cada6b0: fix two small whitespace diff from master - DO NOT MERGE
...
* commit '0cada6b03b6272ec5b77faa9a62d0696bede3511':
fix two small whitespace diff from master - DO NOT MERGE
2013-08-12 09:58:48 -07:00
Baligh Uddin
8db936452d
am a08fafee: Add overwrites for 3 unbundled projects
...
* commit 'a08fafeeea04e71b6e10a03cecedce6de0b9c8a0':
Add overwrites for 3 unbundled projects
2013-08-12 09:58:48 -07:00
The Android Automerger
3aa9630c63
am 84a060d5: "updated manifest from master@1aae7da5"
...
* commit '84a060d584948d885f4c60b7b239551fa3b91a34':
"updated manifest from master@1aae7da5"
2013-08-12 09:58:48 -07:00
Torne (Richard Coles)
8fed2f9d06
Remove external/chromium_org/googleurl.
...
googleurl has been merged into the main chromium repository, so this
project is no longer needed.
Change-Id: I69f02f0e21cdaccc437b48aa78346ceddfdc2fa5
Reviewed-on: https://googleplex-android-review.googlesource.com/341697
Reviewed-by: Ben Murdoch <benm@google.com >
2013-08-12 13:51:50 +00:00
Jeff Hamilton
bcd0c8db94
Update PrebuiltGmsCore to finn
...
Change-Id: Ief4b8a1fb5e8365ad2666a1f6280f3ba4f866471
Reviewed-on: https://googleplex-android-review.googlesource.com/341260
Reviewed-by: Ying Wang <wangying@google.com >
Reviewed-by: Jeff Hamilton <jham@google.com >
2013-08-09 18:56:35 +00:00
Chad Jones
0cada6b03b
fix two small whitespace diff from master - DO NOT MERGE
...
Change-Id: I840f84e35b70f64f2365fdc8efecb6117b435aa6
Reviewed-on: https://googleplex-android-review.googlesource.com/341152
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-09 16:54:22 +00:00
Chad Jones
31fe473a07
Change default revision back to master - DO NOT MERGE
...
Change-Id: If0ea6a94f253fdc8bf717ef8c9ef80e93fdf14f5
Reviewed-on: https://googleplex-android-review.googlesource.com/341138
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-09 16:46:18 +00:00
Jean-Baptiste Queru
484eada861
am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '2281429d310792932bf10beedc732e077cd46eb6':
Unify with jb-mr2-dev-plus-aosp - do not merge
2013-08-09 06:05:59 -07:00
Baligh Uddin
3d19bcc257
am d471df6a: klp-dev-plus-aosp manifest.
...
* commit 'd471df6a0dcd993728b82b3ef11889bea4d0cd92':
klp-dev-plus-aosp manifest.
2013-08-09 06:05:59 -07:00
Baligh Uddin
5160c2d8a3
am 3d9df6a5: klp-dev manifest.
...
* commit '3d9df6a5765e8a86361e3af793a6c4b36d7d1093':
klp-dev manifest.
2013-08-09 06:05:59 -07:00
Baligh Uddin
a08fafeeea
Add overwrites for 3 unbundled projects
...
Change-Id: I5e2172e75e2d830051fee866d67a21f0c5f57e44
Reviewed-on: https://googleplex-android-review.googlesource.com/340491
Reviewed-by: Jeff Hamilton <jham@google.com >
2013-08-08 19:58:25 +00:00
Colin Cross
d107b08955
Add nvidia ardbeg projects to master manifest
...
Bug: 10188954
Change-Id: Ie524e8e17c43e843d9056bb09e9c79f31715ec7c
Reviewed-on: https://googleplex-android-review.googlesource.com/340402
Reviewed-by: Ying Wang <wangying@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-08 19:31:58 +00:00
Jean-Baptiste Queru
491ff44b79
am 2281429d: (-s ours) Unify with jb-mr2-dev-plus-aosp - do not merge
...
* commit '2281429d310792932bf10beedc732e077cd46eb6':
Unify with jb-mr2-dev-plus-aosp - do not merge
2013-08-08 09:38:25 -07:00
Jean-Baptiste Queru
2281429d31
Unify with jb-mr2-dev-plus-aosp - do not merge
...
Change-Id: I329ab5c9d2976b769abb6733fec1152f3ec8da01
Reviewed-on: https://googleplex-android-review.googlesource.com/340122
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-08-08 16:35:30 +00:00
The Android Automerger
84a060d584
"updated manifest from master@1aae7da5"
2013-08-07 08:34:09 -07:00
Baligh Uddin
d471df6a0d
klp-dev-plus-aosp manifest.
...
Bug: 10206624
2013-08-06 12:31:10 -07:00
Baligh Uddin
3d9df6a576
klp-dev manifest.
...
Bug: 10206624
2013-08-06 12:28:43 -07:00
Ying Wang
1aae7da583
Revert "Master now uses froyo-ub-gcore-finn PrebuiltGmsCore."
...
This reverts commit 9724215f33https://googleplex-android-review.googlesource.com/339350
Reviewed-by: Jeff Hamilton <jham@google.com >
2013-08-06 19:05:26 +00:00
Ying Wang
9724215f33
Master now uses froyo-ub-gcore-finn PrebuiltGmsCore.
...
Bug: 10203516
Change-Id: Icd25bd280e1d0fd3b59edfa04b5031a1dbab0cfa
Reviewed-on: https://googleplex-android-review.googlesource.com/339299
Reviewed-by: Jeff Hamilton <jham@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-06 18:12:35 +00:00
Geoff Mendal
49abffcd6e
Add project platform/external/libssh2 for master
...
Bug: 10149837
Change-Id: I76f263fde3225c9236746265dab379e8225dbdf8
Reviewed-on: https://googleplex-android-review.googlesource.com/338944
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
Reviewed-by: Benoit Goby <benoitgoby@google.com >
2013-08-05 22:01:22 +00:00
Jeff Hamilton
47c6c353ed
Remove the source for GMS core.
...
The APK is delivered prebuilt in vendor/google
and the client is delivered prebuilt in
vendor/unbundled_google/packages/PrebuiltGmsCore.
Change-Id: I3fc0d72121278e65e296eb014f8c22c848aa2696
Reviewed-on: https://googleplex-android-review.googlesource.com/338890
Reviewed-by: Ying Wang <wangying@google.com >
2013-08-05 20:30:16 +00:00
Baligh Uddin
631c59733a
Add p/v/u_g/package/FindMyPhone to master manifest
...
Bug: 10182704
Change-Id: Ia1e212e257f4fbd452b53bfd1c64f9da69ed5d1c
Reviewed-on: https://googleplex-android-review.googlesource.com/338793
Reviewed-by: Chad Jones <chadj@google.com >
2013-08-05 18:16:16 +00:00
Torne (Richard Coles)
959e5da157
Switch to new libjingle project from chromium.
...
Chromium upstream rearranged the libjingle checkout to pull from webrtc;
switch manifest to the new project/checkout location.
Change-Id: I63cc20510c1265d038022af32abf5048f1d15d30
Reviewed-on: https://googleplex-android-review.googlesource.com/338660
Reviewed-by: Ben Murdoch <benm@google.com >
2013-08-05 15:56:52 +00:00
Anton Hansson
48a09711ea
Add appdatasearchhelper to master manifest.
...
Bug 10146523
Change-Id: I0e82179fc28b5d3a4527d8239ca2b9748674e193
Reviewed-on: https://googleplex-android-review.googlesource.com/338621
Reviewed-by: Piotr Jastrzebski <haaawk@google.com >
2013-08-05 13:24:33 +00:00
Narayan Kamath
8273668967
Switch GoogleSearch over to prebuilt APK - attempt 2
...
Bug: 9920814
Change-Id: Icf8c435180aea691238035b5e862aca2b6a9b937
Reviewed-on: https://googleplex-android-review.googlesource.com/337905
Reviewed-by: Narayan Kamath <narayan@google.com >
Reviewed-by: Ying Wang <wangying@google.com >
2013-08-02 17:37:10 +00:00
Narayan Kamath
7fa0669aa1
Revert "Switch GoogleSearch over to prebuilt APK"
...
Accidentally submitted before the dependant change, which
isn't ready for review yet.
This reverts commit 226c694fb0https://googleplex-android-review.googlesource.com/337904
Reviewed-by: Narayan Kamath <narayan@google.com >
2013-08-02 08:48:24 +00:00
Ying Wang
226c694fb0
Switch GoogleSearch over to prebuilt APK
...
Bug: 9920814
Change-Id: Id28c3f846b9a046d02169faa459a106d161cabe5
Reviewed-on: https://googleplex-android-review.googlesource.com/337643
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Narayan Kamath <narayan@google.com >
2013-08-02 08:41:45 +00:00
Chad Jones
29a0cf5062
Remove mako_svelte-kernel from mako group
...
Being in the mako group included it in the mako PDK push when
a decision to include it has not been reached yet.
Change-Id: Idedb0677a3ebd97cadfeef3a5cebe7b7b9af97cc
Reviewed-on: https://googleplex-android-review.googlesource.com/337644
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-08-01 19:36:04 +00:00
Rom Lemarchand
4b333bebcf
Add mako_svelte-kernel project to master
...
Change-Id: I87ff8dc8b120b331488140221b3e45ad59fc1029
Reviewed-on: https://googleplex-android-review.googlesource.com/337081
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-07-31 19:31:12 +00:00
Torne (Richard Coles)
7d1263b59d
Remove obsolete chromium projects.
...
We no longer merge or use external/chromium_org/third_party/angle
(replaced with angle_dx11) or external/chromium_org/third_party/v8-i18n
(merged into v8), so remove them from the manifest.
Change-Id: I9ee80fbd7940da3610e2b0fa875c28b9177d0047
Reviewed-on: https://googleplex-android-review.googlesource.com/335254
Reviewed-by: Torne (Richard Coles) <torne@google.com >
Reviewed-by: Ben Murdoch <benm@google.com >
2013-07-31 13:25:43 +00:00
Tsu Chiang Chuang
5f9b74014b
Add prebuilt/runtime.
...
Change-Id: I465582022d7c4a3d467c513b06cead9517427f7a
Reviewed-on: https://googleplex-android-review.googlesource.com/336619
Reviewed-by: Qiwen Zhao <zhao@google.com >
2013-07-30 18:45:30 +00:00
Geoff Mendal
ce0abb9995
Add project platform/external/lzma for master
...
Bug: 10040084
Change-Id: I3d8552b576e1cabcc37c1c58bd8f368680e527f5
Reviewed-on: https://googleplex-android-review.googlesource.com/335934
Reviewed-by: Geremy Condra <gcondra@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-07-27 00:31:12 +00:00
Geoff Mendal
97285f09eb
Add platform/vendor/unbundled_google/packages/AndroidCastReceiver to master
...
Bug: 10031224
Change-Id: I4b1a2f1f00fb3c282109203510ba33017e4789ce
Reviewed-on: https://googleplex-android-review.googlesource.com/335675
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-26 16:55:21 +00:00
Geoff Mendal
84695a8109
Add project platform/external/pixman for master
...
Bug: 10019929
Change-Id: Ia98886bd2d632ba42ccc0554053af96b9ecc7fe7
Reviewed-on: https://googleplex-android-review.googlesource.com/335434
Reviewed-by: John Reck <jreck@google.com >
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-07-25 21:38:01 +00:00
Chad Jones
05d3c6f87d
Add groups tags for crespo PDK
...
Bug: 9904620
Change-Id: Ife2d31a6d308fba0da21eadd06cbae757fee1eb0
Reviewed-on: https://googleplex-android-review.googlesource.com/335126
Reviewed-by: Colin Cross <ccross@google.com >
2013-07-25 16:57:45 +00:00
Chad Jones
bf92628008
Add external/libnfc-nxp to pdk group
...
Bug: 9105153
Change-Id: I5b17e91f7b874e559fcc2cadeb8a5fe5e7349ac2
Reviewed-on: https://googleplex-android-review.googlesource.com/335204
Reviewed-by: Colin Cross <ccross@google.com >
Reviewed-by: Keun-young Park <keunyoung@google.com >
2013-07-25 16:57:15 +00:00
Jean-Baptiste Queru
87f287c9cd
am 0bd6b229: (-s ours) am d7d95a38: (-s ours) am d6c1bd81: (-s ours) Manifest for jb-mr2-era AOSP mirror - do not merge
...
* commit '0bd6b229599f8193d397fcd05a9942afa2ea253e':
Manifest for jb-mr2-era AOSP mirror - do not merge
2013-07-25 00:47:04 -07:00
Jean-Baptiste Queru
0bd6b22959
am d7d95a38: (-s ours) am d6c1bd81: (-s ours) Manifest for jb-mr2-era AOSP mirror - do not merge
...
* commit 'd7d95a38580144b9c9f8e96a6abf563b0bf56e01':
Manifest for jb-mr2-era AOSP mirror - do not merge
2013-07-25 00:44:01 -07:00
Jean-Baptiste Queru
d7d95a3858
am d6c1bd81: (-s ours) Manifest for jb-mr2-era AOSP mirror - do not merge
...
* commit 'd6c1bd8148cbd2c0272bc86d4d256587dd0ec4dc':
Manifest for jb-mr2-era AOSP mirror - do not merge
2013-07-25 00:40:06 -07:00
Ed Heyl
909f3f294b
Merge remote-tracking branch 'goog/jb-mr2-ub-dev' into jb-mr2-docs
2013-07-24 16:18:06 -07:00
Jean-Baptiste Queru
d6c1bd8148
Manifest for jb-mr2-era AOSP mirror - do not merge
...
Change-Id: Id692c8d39b23606b5870f49ac7af9ac3399cc0a5
Reviewed-on: https://googleplex-android-review.googlesource.com/334828
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-24 17:45:00 +00:00
The Android Open Source Project
b0ff0cc0da
Updated master manifest after jb-mr2-dev
...
Change-Id: Id7d916e67b61c10fa2dc1d1eb2dcb1e52f21d29d
2013-07-23 19:31:12 -07:00
The Android Open Source Project
a3ae5c9156
Manifest for jb-mr2-dev
...
Change-Id: I27a20070bf1b3e124c858b4503800e10cdb8db08
2013-07-23 19:18:42 -07:00
Jean-Baptiste Queru
70f4e48f04
am 3de51db6: (-s ours) am 27e7a42c: (-s ours) Remove google samples - do not merge
...
* commit '3de51db66ec500be215f6783ff7c3f6324a4b5a9':
Remove google samples - do not merge
2013-07-23 19:14:22 -07:00
Jean-Baptiste Queru
3de51db66e
am 27e7a42c: (-s ours) Remove google samples - do not merge
...
* commit '27e7a42c0f763f93a193cc600e297a866b79e87e':
Remove google samples - do not merge
2013-07-23 19:12:20 -07:00
Jean-Baptiste Queru
27e7a42c0f
Remove google samples - do not merge
...
Change-Id: Ia17d155fb78c001be59bcc2988b69a87cf92786f
Reviewed-on: https://googleplex-android-review.googlesource.com/334607
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-24 02:10:21 +00:00
Chad Jones
ff24348c49
am e9de322f: resolved conflicts for merge of 1b5f0c92 to jb-mr2-dev-plus-aosp
...
* commit 'e9de322f9744fbbf9e797d5e681fd8bb84b3957d':
Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
2013-07-23 13:04:13 -07:00
Chad Jones
e9de322f97
resolved conflicts for merge of 1b5f0c92 to jb-mr2-dev-plus-aosp
2013-07-23 13:01:21 -07:00
Chad Jones
1b5f0c9255
am 9cbe760d: Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
...
* commit '9cbe760d8720c6e1e780bdd8c4087de29a60f04b':
Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
2013-07-23 12:57:20 -07:00
Chad Jones
9cbe760d87
Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
...
Change-Id: I5b5ed1f63b961d5bcdcb87c9558d1744bee517d6
Reviewed-on: https://googleplex-android-review.googlesource.com/334171
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-07-23 19:55:43 +00:00
Chad Jones
228f629709
am 863d94ab: am dc606af0: Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
...
* commit '863d94abb7ef889a3cc7c5d523e2175f23dbffa1':
Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
2013-07-23 08:54:12 -07:00
Chad Jones
863d94abb7
am dc606af0: Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
...
* commit 'dc606af004492f8f4afbfaccf22173366518ad32':
Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
2013-07-23 08:52:52 -07:00
Chad Jones
dc606af004
Drop groups=pdk from prebuilts/{gradle-plugin,maven_repo/android}
...
Change-Id: Iad73953797f1908e5fd411de5eec5af371f8c3e3
Reviewed-on: https://googleplex-android-review.googlesource.com/334038
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-23 15:50:22 +00:00
Jean-Baptiste Queru
7bd385caa2
am c7f367b8: (-s ours) am 6130208d: (-s ours) Update for maven/gradle projects. Do not merge.
...
* commit 'c7f367b85bbfb650b422b22068b77e5edf200381':
Update for maven/gradle projects. Do not merge.
2013-07-23 07:59:02 -07:00
Jean-Baptiste Queru
c7f367b85b
am 6130208d: (-s ours) Update for maven/gradle projects. Do not merge.
...
* commit '6130208d65c350434bc6c1e85d76df8aa8ed5813':
Update for maven/gradle projects. Do not merge.
2013-07-23 07:56:49 -07:00
Jean-Baptiste Queru
6130208d65
Update for maven/gradle projects. Do not merge.
...
Change-Id: Ie3cacb6e4acce9da3b497118b3edac5ccbd19211
Reviewed-on: https://googleplex-android-review.googlesource.com/334033
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-23 14:54:34 +00:00
Chad Jones
977a41f2e7
drop groups=pdk from external/chromium-libpac
...
Change-Id: I57b37a899ad98b03917bdc5c4613d38fa008612d
Reviewed-on: https://googleplex-android-review.googlesource.com/334006
Reviewed-by: Chad Jones <chadj@google.com >
2013-07-23 04:03:18 +00:00
Baligh Uddin
f49465a0fe
Add packages/app/OMA-DM to master manifest.
...
Bug: 9626966
Change-Id: I03c5fd3d8a3a02cc2b4e4f8449bf1cfc8600f3b7
Reviewed-on: https://googleplex-android-review.googlesource.com/333914
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-07-23 00:16:55 +00:00
Geoff Mendal
5a518180df
am 4913862a: resolved conflicts for merge of 52360af5 to jb-mr2-dev-plus-aosp
...
* commit '4913862aa2fd968712cf18ae6e6b45481fde361f':
Add projects platform/prebuilts/maven_repo and platform/prebuilts/gradle-plugin/android Revise group setting for project platform/tools/external/gradle Bugs: 9940520 Change-Id: I20a6ba9daf22ea235d49a319d01cf625a9a2ffb3 Reviewed-on: https://googleplex-android-review.googlesource.com/333431 Reviewed-by: Jean-Baptiste Queru <jbq@google.com > Reviewed-by: Xavier Ducrohet <xav@google.com >
2013-07-22 17:14:25 -07:00
Geoff Mendal
4913862aa2
resolved conflicts for merge of 52360af5 to jb-mr2-dev-plus-aosp
2013-07-22 17:00:37 -07:00
Geoff Mendal
52360af58d
am efbe7762: Add projects platform/prebuilts/maven_repo and platform/prebuilts/gradle-plugin/android Revise group setting for project platform/tools/external/gradle Bugs: 9940520 Change-Id: I20a6ba9daf22ea235d49a319d01cf625a9a2ffb3 Reviewed-on: https://googleplex-andr
...
* commit 'efbe7762c5d2c9c18ebc8a8a81cd2b27e2a74887':
Add projects platform/prebuilts/maven_repo and platform/prebuilts/gradle-plugin/android Revise group setting for project platform/tools/external/gradle Bugs: 9940520 Change-Id: I20a6ba9daf22ea235d49a319d01cf625a9a2ffb3 Reviewed-on: https://googleplex-android-review.googlesource.com/333431 Reviewed-by: Jean-Baptiste Queru <jbq@google.com > Reviewed-by: Xavier Ducrohet <xav@google.com >
2013-07-22 16:46:37 -07:00
Geoff Mendal
efbe7762c5
Add projects platform/prebuilts/maven_repo and platform/prebuilts/gradle-plugin/android
...
Revise group setting for project platform/tools/external/gradle
Bugs: 9940520
Change-Id: I20a6ba9daf22ea235d49a319d01cf625a9a2ffb3
Reviewed-on: https://googleplex-android-review.googlesource.com/333431
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
Reviewed-by: Xavier Ducrohet <xav@google.com >
2013-07-22 23:45:15 +00:00
Geoff Mendal
b33334520a
Add project platform/frameworks/opt/widget for master
...
Bugs: 9920762
Change-Id: I4997b014cd91e212da58ae7afd47f3c2d8a560a2
Reviewed-on: https://googleplex-android-review.googlesource.com/333591
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-22 16:44:00 +00:00
Geoff Mendal
e652fa4451
Add project platform/external/chromium-libpac for master
...
Bugs: 9962215
Change-Id: Iaf6cc101620d9b4d2e1af0e99f9bce9140044159
Reviewed-on: https://googleplex-android-review.googlesource.com/333572
Reviewed-by: Geoffrey Borggaard <geoffreyb@google.com >
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-22 16:09:49 +00:00
Ed Heyl
e559a1dd99
remove Music2 from master (prebuilt now)
...
Change-Id: I5b73c48e74b5c989d180b49aec555049c6d6088d
Reviewed-on: https://googleplex-android-review.googlesource.com/333242
Reviewed-by: Qiwen Zhao <zhao@google.com >
Reviewed-by: Ying Wang <wangying@google.com >
2013-07-19 21:36:48 +00:00
Ed Heyl
e9877b8ea1
jb-mr2-docs
2013-07-18 17:46:31 -07:00
Geoff Mendal
9aab7f511f
Add project platform/vendor/unbundled_google/packages/GoogleSearchPrebuilt for master
...
Bug: 9920814
Change-Id: Ifb22b7be3b81ee4e9101f84bca5bf68b8f8cf3c2
Reviewed-on: https://googleplex-android-review.googlesource.com/332701
Reviewed-by: Bjorn Bringert <bringert@android.com >
Reviewed-by: Justin Ho <justinho@google.com >
2013-07-18 22:29:24 +00:00
Jean-Baptiste Queru
93282222a4
am 0681a82b: (-s ours) am 5fd4f465: (-s ours) am 43baa535: (-s ours) Add x86-64 compilers. do not merge
...
* commit '0681a82beb2762157f41562b8eaf688dd4ad1913':
Add x86-64 compilers. do not merge
2013-07-17 11:15:25 -07:00
Jean-Baptiste Queru
0681a82beb
am 5fd4f465: (-s ours) am 43baa535: (-s ours) Add x86-64 compilers. do not merge
...
* commit '5fd4f465d51d135ca88aa343a68ca2699c9ba265':
Add x86-64 compilers. do not merge
2013-07-17 11:11:57 -07:00
Jean-Baptiste Queru
5fd4f465d5
am 43baa535: (-s ours) Add x86-64 compilers. do not merge
...
* commit '43baa5350534447ea40cc0a4f3b34e705c2e5a72':
Add x86-64 compilers. do not merge
2013-07-17 11:08:49 -07:00
Jean-Baptiste Queru
43baa53505
Add x86-64 compilers. do not merge
...
Change-Id: I6b3761cbe5346551ffb7b55027a0d22a79ec1e21
Reviewed-on: https://googleplex-android-review.googlesource.com/332123
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-17 18:02:53 +00:00
The Android Open Source Project
83b7677518
Add x86_64 toolchains
...
Change-Id: I008d78b6cfa1397adccd8fd51ea0e2723fbca532
2013-07-17 10:22:19 -07:00
Chad Jones
86315955f2
am d416e17d: am db937c9e: Add prebuilts/gcc/{linux-x86,darwin-x86}/x86/x86_64-linux-android-4.7
...
* commit 'd416e17dd4b1d6321f9c07b178ebdc0a5d9f4d59':
Add prebuilts/gcc/{linux-x86,darwin-x86}/x86/x86_64-linux-android-4.7
2013-07-16 16:38:20 -07:00
Chad Jones
d416e17dd4
am db937c9e: Add prebuilts/gcc/{linux-x86,darwin-x86}/x86/x86_64-linux-android-4.7
...
* commit 'db937c9ed5995e8f805196351a119ff0c1f58c7e':
Add prebuilts/gcc/{linux-x86,darwin-x86}/x86/x86_64-linux-android-4.7
2013-07-16 16:32:04 -07:00
Chad Jones
db937c9ed5
Add prebuilts/gcc/{linux-x86,darwin-x86}/x86/x86_64-linux-android-4.7
...
Change-Id: Idfcafc56f176ad38a6beae196c3c868c2b9ba3c1
Reviewed-on: https://googleplex-android-review.googlesource.com/331786
Reviewed-by: Andrew Hsieh <andrewhsieh@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-16 23:27:04 +00:00
Jean-Baptiste Queru
9f7d221a90
am 5642f6f6: (-s ours) am 7040dff6: (-s ours) Update stage-aosp-master manifest for flo/deb - do not merge
...
* commit '5642f6f6a04967e6a451975fefcd29b421b67dc2':
Update stage-aosp-master manifest for flo/deb - do not merge
2013-07-16 15:30:23 -07:00
Geoff Mendal
564df96077
Add project platform/vendor/unbundled_google/packages/Scribble for master
...
Change-Id: I9fe322caf609b8c22db8b9ad5e5c6bb3e97d8d0b
Reviewed-on: https://googleplex-android-review.googlesource.com/331753
Reviewed-by: Ed Heyl <edheyl@google.com >
2013-07-16 22:17:11 +00:00
Jean-Baptiste Queru
5642f6f6a0
am 7040dff6: (-s ours) Update stage-aosp-master manifest for flo/deb - do not merge
...
* commit '7040dff6b2d3633ce2de1b932802d78270ede182':
Update stage-aosp-master manifest for flo/deb - do not merge
2013-07-16 12:01:24 -07:00
Jean-Baptiste Queru
7040dff6b2
Update stage-aosp-master manifest for flo/deb - do not merge
...
Change-Id: I1125b9f2b6b7e6a92e69e3b88239764cc4836789
Reviewed-on: https://googleplex-android-review.googlesource.com/331638
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-16 18:50:13 +00:00
Geoff Mendal
d91c2b8f83
am 36b7c479: am 2fbeaa88: am d84926c9: Add project platform/vendor/unbundled_google/packages/Drive for jb-mr2-dev. Bug: 9798864 Change-Id: I4d91974bfeed6f7da14a3f50b9269234a8094b8c Reviewed-on: https://googleplex-android-review.googlesource.com/330077 Reviewed-by: Cha
...
* commit '36b7c4796f62dd97c2b366126e409d485cfd707c':
Add project platform/vendor/unbundled_google/packages/Drive for jb-mr2-dev. Bug: 9798864 Change-Id: I4d91974bfeed6f7da14a3f50b9269234a8094b8c Reviewed-on: https://googleplex-android-review.googlesource.com/330077 Reviewed-by: Chad Jones <chadj@google.com > Reviewed-by: Justin Ho <justinho@google.com >
2013-07-12 09:35:24 -07:00
Ed Heyl
ff9dbc54db
am 8045b6a8: am 15f1e3dd: (-s ours) jb-mr2-ub-dev
...
* commit '8045b6a85228f880655952b0a27e5243e4433255':
jb-mr2-ub-dev
2013-07-12 09:35:23 -07:00
Geoff Mendal
36b7c4796f
am 2fbeaa88: am d84926c9: Add project platform/vendor/unbundled_google/packages/Drive for jb-mr2-dev. Bug: 9798864 Change-Id: I4d91974bfeed6f7da14a3f50b9269234a8094b8c Reviewed-on: https://googleplex-android-review.googlesource.com/330077 Reviewed-by: Chad Jones <chad
...
* commit '2fbeaa880733943fe6e12898b62fde1fbbf0baf9':
Add project platform/vendor/unbundled_google/packages/Drive for jb-mr2-dev. Bug: 9798864 Change-Id: I4d91974bfeed6f7da14a3f50b9269234a8094b8c Reviewed-on: https://googleplex-android-review.googlesource.com/330077 Reviewed-by: Chad Jones <chadj@google.com > Reviewed-by: Justin Ho <justinho@google.com >
2013-07-12 09:32:17 -07:00
Ed Heyl
8045b6a852
am 15f1e3dd: (-s ours) jb-mr2-ub-dev
...
* commit '15f1e3ddbe0e71a3a0960ca838d9887ad7d63511':
jb-mr2-ub-dev
2013-07-12 09:32:16 -07:00
Geoff Mendal
2fbeaa8807
am d84926c9: Add project platform/vendor/unbundled_google/packages/Drive for jb-mr2-dev. Bug: 9798864 Change-Id: I4d91974bfeed6f7da14a3f50b9269234a8094b8c Reviewed-on: https://googleplex-android-review.googlesource.com/330077 Reviewed-by: Chad Jones <chadj@google.com>
...
* commit 'd84926c97ff24817687e11e31e4e9c245501ca52':
Add project platform/vendor/unbundled_google/packages/Drive for jb-mr2-dev. Bug: 9798864 Change-Id: I4d91974bfeed6f7da14a3f50b9269234a8094b8c Reviewed-on: https://googleplex-android-review.googlesource.com/330077 Reviewed-by: Chad Jones <chadj@google.com > Reviewed-by: Justin Ho <justinho@google.com >
2013-07-12 07:40:03 -07:00
Geoff Mendal
d84926c97f
Add project platform/vendor/unbundled_google/packages/Drive for jb-mr2-dev.
...
Bug: 9798864
Change-Id: I4d91974bfeed6f7da14a3f50b9269234a8094b8c
Reviewed-on: https://googleplex-android-review.googlesource.com/330077
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Justin Ho <justinho@google.com >
2013-07-12 14:37:43 +00:00
Jean-Baptiste Queru
7aed01a512
am 6d67a675: (-s ours) am 84abb955: (-s ours) am 1826a699: (-s ours) Add new projects - iputils, studio/cloud - do not merge
...
* commit '6d67a675634d607b1d14b6f2346496f4fd7d9157':
Add new projects - iputils, studio/cloud - do not merge
2013-07-08 15:09:57 -07:00
Jean-Baptiste Queru
6d67a67563
am 84abb955: (-s ours) am 1826a699: (-s ours) Add new projects - iputils, studio/cloud - do not merge
...
* commit '84abb955b74478591e386d71438aa52644b67ce4':
Add new projects - iputils, studio/cloud - do not merge
2013-07-08 14:58:43 -07:00
Jean-Baptiste Queru
84abb955b7
am 1826a699: (-s ours) Add new projects - iputils, studio/cloud - do not merge
...
* commit '1826a699e5aad6a4fe66574e7374cea5ed423780':
Add new projects - iputils, studio/cloud - do not merge
2013-07-08 14:55:40 -07:00
Jean-Baptiste Queru
1826a699e5
Add new projects - iputils, studio/cloud - do not merge
...
Change-Id: If30f4138d9552e8a19e1a7dc09b1fb1bd48d8f63
2013-07-08 14:53:06 -07:00
The Android Open Source Project
022658e6b4
Add new projects - iputils, studio/cloud
...
Change-Id: I7785f292e76376cbe9c4bf2700410ef5b80e70b9
2013-07-08 14:46:57 -07:00
Geoff Mendal
fefb07d1ff
am 7872fb17: resolved conflicts for merge of 664ad257 to jb-mr2-dev-plus-aosp
...
* commit '7872fb176e78d94d83cbbb02aff29c5a54b06ab7':
Add projects platform/external/iputils and platform/tools/studio/cloud for stage-aosp-master
2013-07-08 14:44:27 -07:00
Geoff Mendal
7872fb176e
resolved conflicts for merge of 664ad257 to jb-mr2-dev-plus-aosp
2013-07-08 14:37:25 -07:00
Geoff Mendal
664ad2575b
Add projects platform/external/iputils and platform/tools/studio/cloud for stage-aosp-master
...
Change-Id: I9d1051882df6baac829e89a98a7d3e786046ebdc
Reviewed-on: https://googleplex-android-review.googlesource.com/328299
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-07-08 21:24:22 +00:00
keunyoung
efb3002405
add external/scrypt to PDK
...
Change-Id: I5426430dff222db07775b69fdcfcbdf6d9792ea7
Reviewed-on: https://googleplex-android-review.googlesource.com/325389
Reviewed-by: Vineeta Srivastava <vsrivastava@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-06-27 01:00:01 +00:00
keunyoung
22c3a2b744
add vendor/auto/projection
...
Change-Id: I44bbbf2c551e84a079f85febbf2795ec0d4f7796
Reviewed-on: https://googleplex-android-review.googlesource.com/325230
Reviewed-by: Ying Wang <wangying@google.com >
Reviewed-by: Keun-young Park <keunyoung@google.com >
2013-06-26 21:58:48 +00:00
Jean-Baptiste Queru
4e21d10d8a
am ea71237d: am 2bb9db4f: Add mesa3d back
...
* commit 'ea71237df4147e3d8fe70f84e5d5be7db153602c':
Add mesa3d back
2013-06-20 16:22:45 -07:00
Jean-Baptiste Queru
ea71237df4
am 2bb9db4f: Add mesa3d back
...
* commit '2bb9db4f1ada7e3afcf669c9458d38996ff4d63f':
Add mesa3d back
2013-06-20 16:20:28 -07:00
Jean-Baptiste Queru
2bb9db4f1a
Add mesa3d back
...
Change-Id: I4f1f78147f594e857c76ca244c8f6f891fbe7d66
Reviewed-on: https://googleplex-android-review.googlesource.com/323405
Reviewed-by: Chad Jones <chadj@google.com >
2013-06-20 23:18:28 +00:00
Jean-Baptiste Queru
23addfd9af
am e652e30b: am fc570470: am 152b0e0e: New projects for telephony and prebuilt python
...
* commit 'e652e30b3eaabe6cf13d8879b688c334b060ad63':
New projects for telephony and prebuilt python
2013-06-20 13:56:32 -07:00
Jean-Baptiste Queru
e652e30b3e
am fc570470: am 152b0e0e: New projects for telephony and prebuilt python
...
* commit 'fc5704708c0b643edefcad8e809e0b602b24f777':
New projects for telephony and prebuilt python
2013-06-20 13:54:28 -07:00
Jean-Baptiste Queru
fc5704708c
am 152b0e0e: New projects for telephony and prebuilt python
...
* commit '152b0e0e83955a47071a60b561e61e9d06fda4eb':
New projects for telephony and prebuilt python
2013-06-20 13:52:32 -07:00
Jean-Baptiste Queru
152b0e0e83
New projects for telephony and prebuilt python
...
Change-Id: Ia6cd73cfe7ccecf98ad4142d099446d1c8ba22db
Reviewed-on: https://googleplex-android-review.googlesource.com/323321
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-06-20 20:49:56 +00:00
The Android Open Source Project
1fed5706c9
New projects for telephony and prebuilt python
...
Change-Id: I7c496411d62d212250b979565ec5c8805e872d5e
2013-06-20 12:46:44 -07:00
Geoff Mendal
86c88a0282
am e7dcc1bb: am 82bbe644: Add projects InCallUI and Telephony for stage-aosp-master
...
* commit 'e7dcc1bb44b7d21b93cf97b9097f22c31619fab7':
Add projects InCallUI and Telephony for stage-aosp-master
2013-06-20 12:23:53 -07:00
Geoff Mendal
e7dcc1bb44
am 82bbe644: Add projects InCallUI and Telephony for stage-aosp-master
...
* commit '82bbe644e6b3cf4b93c821fc72465c4c451de368':
Add projects InCallUI and Telephony for stage-aosp-master
2013-06-20 12:21:48 -07:00
Geoff Mendal
82bbe644e6
Add projects InCallUI and Telephony for stage-aosp-master
...
Change-Id: I6d86458ba2abc77867d4c0d434c533ce3f9a5b53
Reviewed-on: https://googleplex-android-review.googlesource.com/323237
Reviewed-by: Wink Saville <wink@google.com >
2013-06-20 19:18:04 +00:00
Geoff Mendal
f14d0b3c4d
Add project platform/external/chromium_org/third_party/angle_dx11 for master branch
...
Change-Id: I45f99257f232d51d8e76da50d0683243915229ee
Reviewed-on: https://googleplex-android-review.googlesource.com/321970
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-06-18 16:47:19 +00:00
Geoff Mendal
cd61a9bb89
Add projects GoogleDialer and GooglePhone for master
...
Change-Id: I4c6a49fb4d23f48af950207ca11dfb1de9337263
Reviewed-on: https://googleplex-android-review.googlesource.com/321654
Reviewed-by: Chad Jones <chadj@google.com >
2013-06-17 22:06:11 +00:00
Ed Heyl
15f1e3ddbe
jb-mr2-ub-dev
2013-06-13 15:20:42 -07:00
Jean-Baptiste Queru
32394961ca
am b34f7fa2: (-s ours) am 408bb1c4: (-s ours) am 6861cac0: (-s ours) Update mirror manifest - do not merge
...
* commit 'b34f7fa23ca0110c73bc3283efb8fd8af8ab4670':
Update mirror manifest - do not merge
2013-06-12 17:01:41 -07:00
Jean-Baptiste Queru
b34f7fa23c
am 408bb1c4: (-s ours) am 6861cac0: (-s ours) Update mirror manifest - do not merge
...
* commit '408bb1c410991c6d3aea43df5c64db8d73a2310e':
Update mirror manifest - do not merge
2013-06-12 16:58:23 -07:00
Jean-Baptiste Queru
408bb1c410
am 6861cac0: (-s ours) Update mirror manifest - do not merge
...
* commit '6861cac009c8a43db7c289b18973f92806e41269':
Update mirror manifest - do not merge
2013-06-12 16:56:13 -07:00
Jean-Baptiste Queru
6861cac009
Update mirror manifest - do not merge
...
Change-Id: I605e0db86727604d49ed61f362edef104a0298bb
Reviewed-on: https://googleplex-android-review.googlesource.com/320092
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-06-12 23:54:12 +00:00
The Android Open Source Project
27ce518b08
Add scrypt and prebuilt clang projects
...
Change-Id: Ia3708697c52d8fbdad8212e97239b2753ee2d187
2013-06-12 16:41:16 -07:00
Chad Jones
90f53e50ad
am 2bfc8ff3: am 9afa2cca: Add prebuilts/clang 3.3 projects
...
* commit '2bfc8ff3003f680fe12997806acad128dec991d7':
Add prebuilts/clang 3.3 projects
2013-06-12 14:37:55 -07:00
Chad Jones
2bfc8ff300
am 9afa2cca: Add prebuilts/clang 3.3 projects
...
* commit '9afa2cca0ff798bb65ea555281f69064a4aab95b':
Add prebuilts/clang 3.3 projects
2013-06-12 14:33:18 -07:00
Chad Jones
6af47d82d6
am c706b013: am 51cd8b26: Add external/scrypt
...
* commit 'c706b0132f1cc68eb875f5ad0c1c086de241d930':
Add external/scrypt
2013-06-12 14:30:19 -07:00
Jean-Baptiste Queru
cd453eadc5
am 3ee06f4f: (-s ours) am 89a15918: (-s ours) Remove qcom/camera from AOSP - do not merge
...
* commit '3ee06f4fb85536381b742328f30e8524adc8294e':
Remove qcom/camera from AOSP - do not merge
2013-06-12 14:30:18 -07:00
Chad Jones
9afa2cca0f
Add prebuilts/clang 3.3 projects
...
Change-Id: I4b77c98b37019158071d339617a747ae250b9010
Reviewed-on: https://googleplex-android-review.googlesource.com/319879
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-06-12 21:28:03 +00:00
Chad Jones
c706b0132f
am 51cd8b26: Add external/scrypt
...
* commit '51cd8b266d5380a25a0674170b52621f0a1a19e7':
Add external/scrypt
2013-06-12 13:47:54 -07:00
Jean-Baptiste Queru
3ee06f4fb8
am 89a15918: (-s ours) Remove qcom/camera from AOSP - do not merge
...
* commit '89a15918341f77cdfb112339b186669f2886382d':
Remove qcom/camera from AOSP - do not merge
2013-06-12 13:47:53 -07:00
Chad Jones
51cd8b266d
Add external/scrypt
...
Change-Id: Ic685e826aca4992e1a4b15e15c1ea83a68467036
Reviewed-on: https://googleplex-android-review.googlesource.com/319511
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-06-12 20:45:10 +00:00
Jean-Baptiste Queru
89a1591834
Remove qcom/camera from AOSP - do not merge
...
Change-Id: I53189cdb8b70676ffa08b5d217af463e0d6858bc
Reviewed-on: https://googleplex-android-review.googlesource.com/319055
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-06-11 21:46:25 +00:00
Ben Murdoch
8928f7bddb
Add external/chromium_org/third_party/mesa/src to manifest.
...
Change-Id: I5ad9ac0f088ae24d51a55d4f5e1b2cc42d2da6eb
Reviewed-on: https://googleplex-android-review.googlesource.com/318580
Reviewed-by: Torne (Richard Coles) <torne@google.com >
2013-06-10 17:05:38 +00:00
Jean-Baptiste Queru
c6bae96e45
Add missing vendor group
...
Change-Id: I2af0473dda4ccd2316dfe4cdcbf919f855495a0b
Reviewed-on: https://googleplex-android-review.googlesource.com/317790
Reviewed-by: Siva Velusamy <vsiva@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-06-07 15:08:29 +00:00
Stephen Hines
5973cb76f5
Revert "Add project platform/packages/apps/Launcher3 for master"
...
This reverts commit 947c31e1dchttps://googleplex-android-review.googlesource.com/317455
Reviewed-by: Ying Wang <wangying@google.com >
2013-06-06 03:14:15 +00:00
Geoff Mendal
947c31e1dc
Add project platform/packages/apps/Launcher3 for master
...
Change-Id: I42432975df574373cbffde15e08e6865f217627c
Reviewed-on: https://googleplex-android-review.googlesource.com/316709
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-06-04 21:32:33 +00:00
Chad Jones
2834c5ac94
am a753ad90: am a9eff877: Empty commit
...
* commit 'a753ad90e60a354cfac0ce4b218ace0f2ab8b3f9':
Empty commit
2013-05-30 14:24:02 -07:00
Chad Jones
a753ad90e6
am a9eff877: Empty commit
...
* commit 'a9eff8779cb3d47b02a75d80c5ad5c20f7368e0f':
Empty commit
2013-05-29 23:30:14 -07:00
Chad Jones
a9eff8779c
Empty commit
2013-05-29 23:27:35 -07:00
Jean-Baptiste Queru
ec2d091529
Revert "Revert "Remove vendor/unbundled_google/packages/LatinIMEDictionaryPack""
...
This reverts commit bd9d94a9f1https://googleplex-android-review.googlesource.com/314553
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-05-29 18:15:38 +00:00
Jean-Baptiste Queru
bd9d94a9f1
Revert "Remove vendor/unbundled_google/packages/LatinIMEDictionaryPack"
...
This reverts commit 2c1c77f532https://googleplex-android-review.googlesource.com/314392
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-05-29 15:24:23 +00:00
Jean-Baptiste Queru
2c1c77f532
Remove vendor/unbundled_google/packages/LatinIMEDictionaryPack
...
Change-Id: I1973f18070a2ca7394770c828497be3be99c39b6
Reviewed-on: https://googleplex-android-review.googlesource.com/314306
Reviewed-by: Ken Wakasa <kwakasa@google.com >
Reviewed-by: Geoff Mendal <mendal@google.com >
2013-05-29 14:39:46 +00:00
Stephen Hines
e892ffae57
Remove gdk and frameworks/compile/llvm-ndk-cc from default manifest.
...
Change-Id: I382f79bcad4074d4485bb93efa0dd0436330a470
Reviewed-on: https://googleplex-android-review.googlesource.com/313497
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
Reviewed-by: Andrew Hsieh <andrewhsieh@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-05-24 23:31:14 +00:00
Jean-Baptiste Queru
076b8e458a
am f9cb2b1a: am b67eb727: Match jb-mr2-dev-plus-aosp changes
...
* commit 'f9cb2b1a1a8a2faa4861981043d6066dfeaf476b':
Match jb-mr2-dev-plus-aosp changes
2013-05-24 15:39:21 -07:00
Jean-Baptiste Queru
f9cb2b1a1a
am b67eb727: Match jb-mr2-dev-plus-aosp changes
...
* commit 'b67eb7271772f043199b4c3b6c74cfa05380a5a8':
Match jb-mr2-dev-plus-aosp changes
2013-05-24 15:36:43 -07:00
Jean-Baptiste Queru
b67eb72717
Match jb-mr2-dev-plus-aosp changes
...
Change-Id: I84f2bc4d382a11dfc35dbe41bc513b206e0350e2
Reviewed-on: https://googleplex-android-review.googlesource.com/313531
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-05-24 22:34:57 +00:00
Jean-Baptiste Queru
0ffd09c3a6
am e45315f6: (-s ours) am b208548b: (-s ours) Update stage-aosp-master - do not merge
...
* commit 'e45315f6c8a64b1d4011e0355591cabd53febeeb':
Update stage-aosp-master - do not merge
2013-05-24 15:25:54 -07:00
Jean-Baptiste Queru
e45315f6c8
am b208548b: (-s ours) Update stage-aosp-master - do not merge
...
* commit 'b208548b545e884582daf199b96f33f3581c896c':
Update stage-aosp-master - do not merge
2013-05-24 15:24:08 -07:00
Jean-Baptiste Queru
b208548b54
Update stage-aosp-master - do not merge
...
This makes it match the latest state of jb-mr2-dev-plus-aosp-without-vendor
Change-Id: I0ac50fcee5b5f955ec2f5976a2bb8f550a570459
Reviewed-on: https://googleplex-android-review.googlesource.com/313492
Reviewed-by: Chad Jones <chadj@google.com >
2013-05-24 22:22:16 +00:00
Chad Jones
57a798d653
am 923410f5: am 886e002f: Add \'cts\' group tag to platform/cts project
...
* commit '923410f568e5230fd772af8fc335fcb257ab24df':
Add 'cts' group tag to platform/cts project
2013-05-24 14:41:11 -07:00
Chad Jones
923410f568
am 886e002f: Add \'cts\' group tag to platform/cts project
...
* commit '886e002f0ef2e3020ffae513f8ca6db1a619d6fa':
Add 'cts' group tag to platform/cts project
2013-05-24 14:39:38 -07:00
Chad Jones
886e002f0e
Add 'cts' group tag to platform/cts project
...
Bug: 8329029
Change-Id: Id8d6009a9e12374cea7c8c7d344bd9998a426bd4
Reviewed-on: https://googleplex-android-review.googlesource.com/313468
Reviewed-by: Chad Jones <chadj@google.com >
2013-05-24 21:37:19 +00:00
Ed Heyl
65e761ad14
add new GoogleLauncher2 project
...
Change-Id: Ic72c70d859ad087cd95ba11ee9622c50e7f546e3
Reviewed-on: https://googleplex-android-review.googlesource.com/313348
Reviewed-by: Ed Heyl <edheyl@google.com >
2013-05-24 18:04:05 +00:00
Chad Jones
c67da24ff1
Revert "add new GoogleLauncher2 project"
...
This reverts commit 082f1c79d3https://googleplex-android-review.googlesource.com/313354
Reviewed-by: Chad Jones <chadj@google.com >
2013-05-24 17:45:16 +00:00
Ed Heyl
082f1c79d3
add new GoogleLauncher2 project
...
Change-Id: Iea4b2e67cf4bf394229d7e181431a258d88afcd3
Reviewed-on: https://googleplex-android-review.googlesource.com/312927
Reviewed-by: Ed Heyl <edheyl@google.com >
2013-05-24 17:21:22 +00:00
Chad Jones
07d58b4c28
am 05f4859e: am 73c33626: Drop molly group tag from vendor/google_devices/molly
...
* commit '05f4859e66265f627a5863b069a826608b1c4fdf':
Drop molly group tag from vendor/google_devices/molly
2013-05-23 11:20:59 -07:00
Chad Jones
05f4859e66
am 73c33626: Drop molly group tag from vendor/google_devices/molly
...
* commit '73c336266647cf5e20d6179ad2701c6109f33a4a':
Drop molly group tag from vendor/google_devices/molly
2013-05-23 11:17:03 -07:00
Chad Jones
73c3362666
Drop molly group tag from vendor/google_devices/molly
...
Change-Id: I4589abad01b33ca271c920ae2f34c2762021fbc0
Reviewed-on: https://googleplex-android-review.googlesource.com/312951
Reviewed-by: Adam Hampson <ahampson@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-05-23 18:15:23 +00:00
Geoff Mendal
13dd588a55
Add prebuilts/python projects for master, 3rd try
...
Change-Id: Ifb6f80e24c069621c9724d4c4f28c643e3be4bd1
Reviewed-on: https://googleplex-android-review.googlesource.com/312858
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-05-23 17:01:04 +00:00
Chad Jones
f7c1a0317b
am 0576b496: am 567df3b9: Add vendor/primesense/sauron to molly pdk
...
* commit '0576b49603cb8543feb553e95866e222db029f73':
Add vendor/primesense/sauron to molly pdk
2013-05-21 16:07:35 -07:00
Chad Jones
0576b49603
am 567df3b9: Add vendor/primesense/sauron to molly pdk
...
* commit '567df3b9dae6894e6f28411652b26c5d60671be1':
Add vendor/primesense/sauron to molly pdk
2013-05-21 16:05:53 -07:00
Chad Jones
567df3b9da
Add vendor/primesense/sauron to molly pdk
...
Change-Id: Iebe36d23daf800d161549fbe755ffa5512f4bcd9
Reviewed-on: https://googleplex-android-review.googlesource.com/311900
Reviewed-by: Adam Hampson <ahampson@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Sascha Prueter <saschap@google.com >
2013-05-21 23:03:10 +00:00
Chad Jones
de52872990
Drop platform/system/bluetooth
...
Change-Id: I6a0299cbbe75c1d51631e0d432126e9e35bab2f4
Reviewed-on: https://googleplex-android-review.googlesource.com/311819
Reviewed-by: Matthew Xie <mattx@google.com >
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-05-21 18:43:58 +00:00
Baligh Uddin
3636e0b89f
Add project: tools/vendor/microsoft to master manifest
...
Change-Id: I5b93973cfc28ed1d436273a52647578c13c35462
Reviewed-on: https://googleplex-android-review.googlesource.com/311381
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-05-20 20:05:09 +00:00
The Android Open Source Project
659b658472
Un-branch master-dalvik from master
2013-05-20 09:19:55 -07:00
Chad Jones
f45d1f4c40
resolved conflicts for merge of 38a34dfb to master
2013-05-17 13:20:42 -07:00
Chad Jones
723811499e
am 7204dfda: am 6886aee9: Add external/smack
...
* commit '7204dfdaed861f1cf5d767e5e0c1140f45816d41':
Add external/smack
2013-05-17 13:18:36 -07:00
Chad Jones
38a34dfb0d
am 9db18316: Add \'molly\' to groups on molly projects
...
* commit '9db183163215d24c4981e3b74d4bff966709d73f':
Add 'molly' to groups on molly projects
2013-05-17 13:15:49 -07:00
Chad Jones
7204dfdaed
am 6886aee9: Add external/smack
...
* commit '6886aee91730a7ebfd6dac6900da1ca360da0c92':
Add external/smack
2013-05-17 13:15:48 -07:00
Chad Jones
9db1831632
Add 'molly' to groups on molly projects
...
Change-Id: I8a430b038596ad74a0b1d5ebceb74648be75d323
Reviewed-on: https://googleplex-android-review.googlesource.com/310469
Reviewed-by: Sascha Prueter <saschap@google.com >
2013-05-17 20:14:43 +00:00
Chad Jones
6886aee917
Add external/smack
...
Change-Id: I2282b31532e535270dc53246008e4e7339fd596e
Reviewed-on: https://googleplex-android-review.googlesource.com/310832
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
Reviewed-by: Sascha Prueter <saschap@google.com >
2013-05-17 20:14:16 +00:00
Jean-Baptiste Queru
7d42374aaf
am c150df2d: (-s ours) am c8bfbbf1: (-s ours) Manifest for jb-mr2-era stage-aosp-master - do not merge
...
* commit 'c150df2d68036c7192f985aa3d00c1e1aff016c0':
Manifest for jb-mr2-era stage-aosp-master - do not merge
2013-05-16 08:49:39 -07:00
Jean-Baptiste Queru
c150df2d68
am c8bfbbf1: (-s ours) Manifest for jb-mr2-era stage-aosp-master - do not merge
...
* commit 'c8bfbbf12fd6fd46de54fe1c0372f0684d42a4f2':
Manifest for jb-mr2-era stage-aosp-master - do not merge
2013-05-16 08:47:26 -07:00
Jean-Baptiste Queru
c8bfbbf12f
Manifest for jb-mr2-era stage-aosp-master - do not merge
...
Change-Id: I351c28de53baa85871a4fafd828a668e4db1f174
Reviewed-on: https://googleplex-android-review.googlesource.com/310301
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-05-16 14:15:59 +00:00
Jean-Baptiste Queru
315e0dd1cb
am 9417dea5: am af339739: am 531a8eef: add idea projects
...
* commit '9417dea5aa86fabf82f7dbd3ef048b61dcd904c5':
add idea projects
2013-05-15 12:35:24 -07:00
Jean-Baptiste Queru
9417dea5aa
am af339739: am 531a8eef: add idea projects
...
* commit 'af33973979636bfcc14dc3b569fdf8f3ef0c98ac':
add idea projects
2013-05-15 12:30:33 -07:00
Jean-Baptiste Queru
af33973979
am 531a8eef: add idea projects
...
* commit '531a8eef421bdc47b797d936b91dafaad3cd9192':
add idea projects
2013-05-15 12:28:49 -07:00
Jean-Baptiste Queru
531a8eef42
add idea projects
...
Change-Id: Ie9cd6f0b26ed53fb2405c3cf371bf6c5a1fe8f5b
Reviewed-on: https://googleplex-android-review.googlesource.com/310032
Reviewed-by: Jean-Baptiste Queru <jbq@google.com >
2013-05-15 19:27:36 +00:00
The Android Open Source Project
bf7ac6708a
Merge from master
2013-05-15 12:13:02 -07:00
The Android Open Source Project
ced9b3334e
Add idea projects
...
Change-Id: Ic0a87271dca5c97057164c4c4b832da7c0c85f5d
2013-05-15 12:11:45 -07:00
Jean-Baptiste Queru
7c654c08cf
am f07724ca: am 80615317: Add idea to stage-aosp-master, for I/O
...
* commit 'f07724ca2ea99a0a18f9e8b02987b19cbc4ac0f3':
Add idea to stage-aosp-master, for I/O
2013-05-14 12:56:26 -07:00
Jean-Baptiste Queru
f07724ca2e
am 80615317: Add idea to stage-aosp-master, for I/O
...
* commit '8061531702762408673184f0bce7cc5c74a01393':
Add idea to stage-aosp-master, for I/O
2013-05-14 12:54:07 -07:00
Jean-Baptiste Queru
8061531702
Add idea to stage-aosp-master, for I/O
...
Change-Id: I152db19ffe79a5e17a9c11673abb9570df75b716
Reviewed-on: https://googleplex-android-review.googlesource.com/309529
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Xavier Ducrohet <xav@google.com >
2013-05-14 19:51:40 +00:00
Anatol Pomazau
c1c0cc9111
Add art
...
(cherry picked from commit e96ead068fd0e50aaedc3623209b575ef7e427e2)
Change-Id: I180896ee9feab9933d3458fb7ebac6c5bb5c949d
Reviewed-on: https://googleplex-android-review.googlesource.com/309397
Reviewed-by: Ying Wang <wangying@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
Reviewed-by: Brian Carlstrom <bdc@google.com >
2013-05-14 17:28:18 +00:00
Rom Lemarchand
09d3acdfcf
Add crespo and crespo4g projects back
...
Change-Id: I75a74a3ab7c86b30c7b88a7b850b26337541ac20
Reviewed-on: https://googleplex-android-review.googlesource.com/305243
Reviewed-by: Chad Jones <chadj@google.com >
2013-05-04 00:07:51 +00:00
Elliott Hughes
60670fb148
Remove the long-dead hardware/msm7k.
...
Change-Id: I59e26d9314bcba184d351f9a6b6ab28344f4757b
Reviewed-on: https://googleplex-android-review.googlesource.com/303199
Reviewed-by: Conley Owens <cco3@android.com >
Reviewed-by: Elliott Hughes <enh@google.com >
2013-05-01 21:35:57 +00:00
Chad Jones
d4b0683743
am 62277831: am 0b49afa8: Drop anchovy projects
...
* commit '622778310beb474402378322d9bd0f3b7e848cf2':
Drop anchovy projects
2013-05-01 14:01:26 -07:00
Chad Jones
622778310b
am 0b49afa8: Drop anchovy projects
...
* commit '0b49afa824fed8cc194127cf513a71ff9cc8f898':
Drop anchovy projects
2013-05-01 13:59:04 -07:00
Chad Jones
0b49afa824
Drop anchovy projects
...
Change-Id: I23361f45f190ee5a314b0c474b18496e28110d91
Reviewed-on: https://googleplex-android-review.googlesource.com/304572
Reviewed-by: Chad Jones <chadj@google.com >
2013-05-01 20:54:51 +00:00
Chris Wren
c6ca48d40b
am 1172bdce: am 80c9308a: FIX BUILD: denim calendar requires emmenthaler gmscore
...
* commit '1172bdce478fbddd6b1376c0f67e264f2d72b4a8':
FIX BUILD: denim calendar requires emmenthaler gmscore
2013-05-01 10:37:22 -07:00
Eric Laurent
dd7a083e68
Add external/tinycompress
...
Change-Id: Ib1bce80e17e3176b7b682ae5f14169e208959a43
Reviewed-on: https://googleplex-android-review.googlesource.com/282048
Reviewed-by: Eric Laurent <elaurent@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-05-01 17:34:08 +00:00
Chris Wren
1172bdce47
am 80c9308a: FIX BUILD: denim calendar requires emmenthaler gmscore
...
* commit '80c9308aa6e8a1733c07ff81b2722345ae0174fd':
FIX BUILD: denim calendar requires emmenthaler gmscore
2013-05-01 10:32:58 -07:00
Chris Wren
80c9308aa6
FIX BUILD: denim calendar requires emmenthaler gmscore
...
Change-Id: I41cc97cb0781f53b95f48024687c30627e35ae42
Reviewed-on: https://googleplex-android-review.googlesource.com/303446
Reviewed-by: Isaac Katzenelson <isaack@android.com >
Reviewed-by: Jeff Hamilton <jham@google.com >
Reviewed-by: Justin Ho <justinho@google.com >
2013-05-01 16:10:38 +00:00
Chris Wren
37d7ca0d85
FIX BUILD: denim calendar requires emmenthaler gmscore
...
Change-Id: I92172bb6c3900306bfed27003532492373492165
Reviewed-on: https://googleplex-android-review.googlesource.com/303847
Reviewed-by: Chris Wren <cwren@android.com >
2013-05-01 15:18:37 +00:00
Kenny Root
a874325f0d
resolved conflicts for merge of 59011c00 to master
...
Change-Id: Icaf5b42ba1e645d846406857169f673ce55e4252
2013-04-30 08:51:08 -07:00
Mike Lockwood
aad8c6330f
Remove packages/providers/DrmProvider
...
Change-Id: Ibf5b74d9ee0d5fdd060f05e9e8bbb0e2e25fed40
Reviewed-on: https://googleplex-android-review.googlesource.com/303456
Reviewed-by: Chad Jones <chadj@google.com >
2013-04-30 00:21:58 +00:00
Chad Jones
59011c0048
am ba09edde: Add projects for molly
...
* commit 'ba09edde8a800f9eb7e1687c278bb6f5d132b4ce':
Add projects for molly
2013-04-29 13:49:28 -07:00
Chad Jones
ba09edde8a
Add projects for molly
...
Change-Id: I372f130c4b6178a8c315e8f23773c2b8d4724223
Reviewed-on: https://googleplex-android-review.googlesource.com/303300
Reviewed-by: Adam Hampson <ahampson@google.com >
Reviewed-by: Mike Chen <mjchen@google.com >
Reviewed-by: Chad Jones <chadj@google.com >
2013-04-29 20:44:51 +00:00
Chad Jones
0179875dff
am fd628040: am bddb39cd: Add external/timezonepicker-support
...
* commit 'fd628040603ce90fe765ea57b9dce3cb2e8c3124':
Add external/timezonepicker-support
2013-04-29 12:14:29 -07:00
Chad Jones
fd62804060
am bddb39cd: Add external/timezonepicker-support
...
* commit 'bddb39cdf8b3029d1fb8423899a6ef9f007023de':
Add external/timezonepicker-support
2013-04-26 20:22:30 -07:00
Michael Chan
24f75147df
Add external/timezonepicker-support
...
Bug: 8737406
Change-Id: I01374ee1f4a54b8a7b4bc0bfc7d53d08b3de1a70
Reviewed-on: https://googleplex-android-review.googlesource.com/302956
Reviewed-by: Attila Bodis <attila@google.com >
2013-04-27 03:21:00 +00:00
Chad Jones
bddb39cdf8
Add external/timezonepicker-support
...
Bug: 8737406
Change-Id: I5a7d2404054e4b52b65136ddbb32ff870bb72d55
Reviewed-on: https://googleplex-android-review.googlesource.com/302904
Reviewed-by: Michael Chan <mchan@android.com >
Reviewed-by: Attila Bodis <attila@google.com >
2013-04-27 03:20:56 +00:00
Chad Jones
7353b2f0f8
am cef100c7: am 391da2e0: Drop external/dbus
...
* commit 'cef100c7a30764b527c9ef256646db8d00f9fcf0':
Drop external/dbus
2013-04-24 14:24:29 -07:00
Chad Jones
cef100c7a3
am 391da2e0: Drop external/dbus
...
* commit '391da2e0cfa5f224b587351b43a384770a8fc73b':
Drop external/dbus
2013-04-24 14:21:50 -07:00
Chad Jones
391da2e0cf
Drop external/dbus
...
Bug: 6872904
Change-Id: Ib818fa95fe3fc039b3f507609164fa249d37a9bc
Reviewed-on: https://googleplex-android-review.googlesource.com/301444
Reviewed-by: John Huang <jsh@google.com >
Reviewed-by: Matthew Xie <mattx@google.com >
2013-04-24 20:26:11 +00:00
Chad Jones
1c354fa8f9
Empty commit
2013-04-23 07:14:57 -07:00
Chad Jones
bb07a76b86
am a3f33640: Merge commit \'0f0692b5215f8cdfad500ecab2884d326fb54dac\' into jb-mr2-dev-plus-aosp
...
* commit 'a3f3364093b8758b2340fc19f3d59e2a1e5166ed':
2013-04-20 00:00:04 -07:00
Android Git Automerger
36abead8a9
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/manifest
2013-04-20 00:00:04 -07:00
Chad Jones
37eaa87536
Merge commit '0f0692b5215f8cdfad500ecab2884d326fb54dac'
2013-04-19 21:13:17 -07:00
Chad Jones
a3f3364093
Merge commit '0f0692b5215f8cdfad500ecab2884d326fb54dac' into jb-mr2-dev-plus-aosp
2013-04-19 21:12:09 -07:00
Chad Jones
0f0692b521
Merge in 07bd9840/I07bd9840e5c0635b08568e68a3dc4cd955355412
...
Delete obsolete fonts
The cibu-fonts and lohit-fonts external repos are no longer used, as
they are superseded by newer fonts in noto-fonts. This fulfills the
request in bug 8666501: jb-mr2 AOSP release should not ship with Cibu
and Lohit fonts
2013-04-19 20:06:40 -07:00
Geoff Mendal
777d4145a3
am c165c6e1: resolved conflicts for merge of 405d2c99 to jb-mr2-dev-plus-aosp
...
* commit 'c165c6e18cee9c2a0ce16462cc1ce170a4e16b4f':
2013-04-19 15:39:36 -07:00
Geoff Mendal
c165c6e18c
resolved conflicts for merge of 405d2c99 to jb-mr2-dev-plus-aosp
2013-04-19 15:35:31 -07:00
Chad Jones
09acc6bf3c
am e54b5017: am 672bc573: am 5bcff790: am 6503fff9: Revert "Revert "Add projects for hammerhead""
...
* commit 'e54b50179101f0863ad43a5b88dd61a78b3337eb':
2013-04-19 15:12:46 -07:00
Ying Wang
e323c53660
am 8a519d01: am a5cfca7f: am 49960a33: am 987de1e7: Revert "Add projects for hammerhead"
...
* commit '8a519d0184557989ccc8d5c6b65f8955e2ace805':
2013-04-19 15:12:45 -07:00
Geoff Mendal
c55cd3f438
am e6d73422: am d3efc7dd: am 78e96614: am f4518b6e: Add projects for hammerhead
...
* commit 'e6d734228e0b2e792ea394511e465926012e1e9b':
2013-04-19 15:12:44 -07:00
Torne (Richard Coles)
604194fc09
am 5e5c97bf: am 6a89d3e7: Merge "Add external/chromium_org and subprojects."
...
* commit '5e5c97bf77987850174d447d68d302fc88d2a19d':
2013-04-19 15:12:43 -07:00
Chad Jones
3d1fe2bab3
am 15341102: am ffca543e: am db072feb: (-s ours) am b71a4aa5: am ff341d54: (-s ours) am 889d55f8: Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
...
* commit '15341102caf46f483e79ef527cc3957349b9e6db':
2013-04-19 15:12:42 -07:00
Chad Jones
95b3e88578
am 372037f0: am 7b9fe70d: am 806bfbab: am 677a75db: Separate msm8x74 device group from qcom_msm8x74 hardware group
...
* commit '372037f0f9514994a89945e78e9228376732adde':
2013-04-19 15:12:41 -07:00
Chad Jones
cb09d2dfe5
am 0df544a3: am 803e6cda: am e1e12c3b: am f1f6d3a3: Setup rest of project groups for anchovy
...
* commit '0df544a3ea999fe19caf616680c2a7a3cf14a09e':
2013-04-19 15:12:40 -07:00
Chad Jones
8af8842010
am 52cd114f: am ed86adbe: am 976d85c2: am ff59c429: fix typo on device/qcom/msm8x74
...
* commit '52cd114f7743a8cb441b821bcfbf550d63306c7b':
2013-04-19 15:12:39 -07:00
Chad Jones
9e123458f6
am 1dcce20c: am 38053cbf: Add hardware/qcom/msm8x27
...
* commit '1dcce20c9fd9d251674705db34c57b97ca33e0d6':
2013-04-19 15:12:38 -07:00
Chad Jones
7447a5956a
am e3f08f3a: am 63be96d7: am d67d0308: am 2721fbe7: Add projects for anchovy
...
* commit 'e3f08f3adf5fef715cd27da637e712a5239c3d04':
2013-04-19 15:12:37 -07:00
Chad Jones
684e583dde
am 104f4c70: am 0f907225: am 788f9db7: am 032eb014: Add vendor/qcom/... projects to msm8x74 pdk
...
* commit '104f4c70669f88ad9e22a42ec796c0c74743439c':
2013-04-19 15:12:37 -07:00
Chad Jones
5d8f5e07f7
am 1bbf90fd: am c0078251: Merge "Add guppy projects"
...
* commit '1bbf90fdbf6eb28a1af7562521f14963457da52a':
2013-04-19 15:12:36 -07:00
Chad Jones
e82df94162
am af9ff86f: am fd054bbb: am 4daef7c3: am 269a60e0: Tweak groups for msm8x74 pdk setup.
...
* commit 'af9ff86fbd80dffb97c05023e0fc62ecd91073fa':
2013-04-19 15:12:35 -07:00
Chad Jones
ad22cb35ce
am 21962b33: am 7d0a1e61: am cb59ec87: am 8d5aac7d: Add hardware/qcom/msm8x74
...
* commit '21962b33f886a8a8b6082e21bcb90b43dc21cb55':
2013-04-19 15:12:34 -07:00
Chad Jones
9502e620d6
am 518289fd: am d1dde32c: Add tools/vendor/ej-tech
...
* commit '518289fd69478247f956188424568367bc6e1dd3':
2013-04-19 15:12:33 -07:00
Ed Heyl
45ed90e66e
am 315897e5: am bd57d230: am 28598667: am e4a0c77f: am 97d305ad: am e61c3e1e: am 821a37c8: am b30b6329: (-s ours) set revision in OneUp and libs/gcm as per smain
...
* commit '315897e54c45220e100048f74896abd5336dd668':
2013-04-19 15:12:32 -07:00
Baligh Uddin
032b6c4c8d
am 8651c88c: am 58d76a1c: am 3aa7d07f: am ffd145cf: am 047e0b38: am d97a7d3c: am 61738ebb: am 51e38fa4: (-s ours) Manifest for jb-mr1.1-docs
...
* commit '8651c88cea1212edca3f22ce76139d6d1319e5e4':
2013-04-19 15:12:31 -07:00
keunyoung
17db5fd7ec
am 61b157b6: am fd2c182d: am 90bbb2f5: am b0d48825: add frameworks/compile/slang to PDK
...
* commit '61b157b6bf385457e8285bee1d83d32823fb5acb':
2013-04-19 15:12:30 -07:00
Chad Jones
6b88483f92
resolved conflicts for merge of 9453c107 to master
2013-04-19 15:11:14 -07:00
Chad Jones
e54b501791
am 672bc573: am 5bcff790: am 6503fff9: Revert "Revert "Add projects for hammerhead""
...
* commit '672bc5733cf7f7483209ed00f04ae82d599512ab':
2013-04-19 15:06:26 -07:00
Ying Wang
8a519d0184
am a5cfca7f: am 49960a33: am 987de1e7: Revert "Add projects for hammerhead"
...
* commit 'a5cfca7f4c8151ad20f383536fd49dbb74c288d1':
2013-04-19 15:06:25 -07:00
Geoff Mendal
e6d734228e
am d3efc7dd: am 78e96614: am f4518b6e: Add projects for hammerhead
...
* commit 'd3efc7dd1bd6e16bd4966bcb4cbe832364631568':
2013-04-19 15:06:24 -07:00
Torne (Richard Coles)
5e5c97bf77
am 6a89d3e7: Merge "Add external/chromium_org and subprojects."
...
* commit '6a89d3e78cfe2ba653064e8c9003a4d794fedd55':
Add external/chromium_org and subprojects.
2013-04-19 15:06:23 -07:00
Chad Jones
15341102ca
am ffca543e: am db072feb: (-s ours) am b71a4aa5: am ff341d54: (-s ours) am 889d55f8: Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
...
* commit 'ffca543e985c713a3eb729be88cf0e6c2b233857':
2013-04-19 15:06:22 -07:00
Chad Jones
372037f0f9
am 7b9fe70d: am 806bfbab: am 677a75db: Separate msm8x74 device group from qcom_msm8x74 hardware group
...
* commit '7b9fe70d5616a07d4288a73147904748267b2668':
2013-04-19 15:06:21 -07:00
Chad Jones
0df544a3ea
am 803e6cda: am e1e12c3b: am f1f6d3a3: Setup rest of project groups for anchovy
...
* commit '803e6cda7528d09e419de82cd8c2e8e1376e8313':
2013-04-19 15:06:20 -07:00
Chad Jones
52cd114f77
am ed86adbe: am 976d85c2: am ff59c429: fix typo on device/qcom/msm8x74
...
* commit 'ed86adbeca3230b6d600ecb211a5a6ba85c5eb06':
2013-04-19 15:06:19 -07:00
Chad Jones
1dcce20c9f
am 38053cbf: Add hardware/qcom/msm8x27
...
* commit '38053cbf565d1a823fd371395990f78971e49c37':
Add hardware/qcom/msm8x27
2013-04-19 15:06:18 -07:00
Chad Jones
e3f08f3adf
am 63be96d7: am d67d0308: am 2721fbe7: Add projects for anchovy
...
* commit '63be96d70aece73ba0cdf04c610723af2c017b94':
2013-04-19 15:06:17 -07:00
Chad Jones
104f4c7066
am 0f907225: am 788f9db7: am 032eb014: Add vendor/qcom/... projects to msm8x74 pdk
...
* commit '0f90722595fcfbe520d37b57e9027cf0a3765778':
2013-04-19 15:06:16 -07:00
Chad Jones
1bbf90fdbf
am c0078251: Merge "Add guppy projects"
...
* commit 'c0078251852b6f599fb7e5c6760555220febda15':
Add guppy projects
2013-04-19 15:06:15 -07:00
Chad Jones
af9ff86fbd
am fd054bbb: am 4daef7c3: am 269a60e0: Tweak groups for msm8x74 pdk setup.
...
* commit 'fd054bbb13c77aba9a19f90754a70e24b3ca8445':
2013-04-19 15:06:14 -07:00
Chad Jones
21962b33f8
am 7d0a1e61: am cb59ec87: am 8d5aac7d: Add hardware/qcom/msm8x74
...
* commit '7d0a1e61c8758ece7f73d1c6a3737be5d80d3d6d':
2013-04-19 15:06:13 -07:00
Chad Jones
518289fd69
am d1dde32c: Add tools/vendor/ej-tech
...
* commit 'd1dde32c7343c5a127cb9de7bd932604604425f8':
Add tools/vendor/ej-tech
2013-04-19 15:06:12 -07:00
Ed Heyl
315897e54c
am bd57d230: am 28598667: am e4a0c77f: am 97d305ad: am e61c3e1e: am 821a37c8: am b30b6329: (-s ours) set revision in OneUp and libs/gcm as per smain
...
* commit 'bd57d230aedaee987619c901d173a76bc1f474f6':
2013-04-19 15:06:11 -07:00
Baligh Uddin
8651c88cea
am 58d76a1c: am 3aa7d07f: am ffd145cf: am 047e0b38: am d97a7d3c: am 61738ebb: am 51e38fa4: (-s ours) Manifest for jb-mr1.1-docs
...
* commit '58d76a1c3d823285b3f720aca74154e44e50335f':
2013-04-19 15:06:10 -07:00
keunyoung
61b157b6bf
am fd2c182d: am 90bbb2f5: am b0d48825: add frameworks/compile/slang to PDK
...
* commit 'fd2c182da6d92b07ed8112e3fe9843abd8632c34':
2013-04-19 15:06:09 -07:00
Chad Jones
9453c1076e
resolved conflicts for merge of 69e2bc2d to jb-mr2-dev-plus-aosp
2013-04-19 15:03:33 -07:00
Ed Heyl
4965eec511
am 9fc9369e: am c0534432: am 3ebdc4ec: am d20a65a9: am e1b882c6: am 1fb37e4f: am 1cd7dac6: change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
...
* commit '9fc9369e1ec0f8d2584eb1df1dc915b0c8807494':
2013-04-19 14:46:12 -07:00
Chad Jones
af5eb5e22c
am 11f2dd82: am 3628a776: am c9341570: am 23075b03: Add vendor/unbundled_google/packages/PhyziosDream
...
* commit '11f2dd82919ef803e60d6f32d9c77b37c5513813':
2013-04-19 14:46:11 -07:00
Jean-Baptiste Queru
e1c143c88a
am 7dcc5dd1: am 7da34b08: am 7d5e5660: am f4cc1c24: Merge "Remove mesa3d from manifest" into jb-mr2-dev
...
* commit '7dcc5dd1b1269cf4b858751e0f89305553f966a9':
2013-04-19 14:46:10 -07:00
Kevin Jin
fc5d86f69c
am 17e2a7d4: am 8909140e: add external/actionbarsherlock to master manifest
...
* commit '17e2a7d4685fd7d05eba3b2ea2089ca2f25ccbf1':
2013-04-19 14:46:09 -07:00
Tim Kilbourn
1c2032ef08
am 521e3a7e: am 9151b3af: am 25d2b58f: am e7d4a04b: Add vendor/google_factory
...
* commit '521e3a7ea50ae2895746c5c890f5444b4a6598f8':
2013-04-19 14:46:08 -07:00
Baligh Uddin
597c5690d2
am e6f746a9: am 9a4da95e: Merge "Add Terminal app to master manifest."
...
* commit 'e6f746a98842c648da7f99260237115598429303':
2013-04-19 14:46:07 -07:00
Chad Jones
05fd2c45dc
am 2fd2c2b9: am 235d175c: am c23b02e7: am 7ea3d4c0: Add vendor/qcom/gpu to mako and flo
...
* commit '2fd2c2b9f68326cc62876b479f2cba9592e68ab4':
2013-04-19 14:46:06 -07:00
Chad Jones
a3187d9c98
am ad5772b2: am d655fedf: am a5f65c72: am c4304b2a: Add vendor/qcom/proprietary for flo pdk
...
* commit 'ad5772b2dafb15311341fb56ef4c3e3bb43c560f':
2013-04-19 14:46:05 -07:00
Chad Jones
fc1845cbf2
am 81e0a3ec: am 88149ee7: Add external/uidriver
...
* commit '81e0a3ec588b2f16573ed4df33a996132bcb30d8':
2013-04-19 14:46:04 -07:00
keunyoung
3877d9b122
am 7198d886: am 6de72ea7: am 7c3cbead: am be87352d: retire mini-armv7-a without NEON
...
* commit '7198d8863cb1481597fb096c72f20e4a21e84fa5':
2013-04-19 14:46:03 -07:00
Chad Jones
df3ba00349
am 10686554: am 06408558: am 8eaad63e: am 1293b376: Add vendor/fraunhofer/virtualizer
...
* commit '10686554301c6019e8388d9dec64042b4af54359':
2013-04-19 14:46:02 -07:00
Chad Jones
bbcb0a0c38
am d69c13d2: am c78c53c0: am d9492ba6: am 11e54b6c: Add developers/build
...
* commit 'd69c13d2c9fea4ab792320f005a3a34e5d79a30e':
2013-04-19 14:46:01 -07:00
Jean-Baptiste Queru
c3655802bf
am 255d88ac: am 495c9d6e: am ce2ab469: (-s ours) am 23195d0b: am 49f9edfb: am 544baa95: (-s ours) am 98721343: (-s ours) Update manifest - do not merge
...
* commit '255d88ac37329d81874e42e3a602a21e85cf3f56':
2013-04-19 14:46:00 -07:00
Chad Jones
0ce095bb62
am 0052dca1: am a5139217: am 3624a778: am cdb7446c: Merge "Add external/open-vcdiff" into jb-mr2-dev
...
* commit '0052dca1da1e4e096c80dad73fa1b5402faa4882':
2013-04-19 14:45:59 -07:00
Jeff Hamilton
c7350276e9
am 826e13c6: am ddaa3b38: am 6b3345e5: am 4a6b02f1: Switch the GMS core prebuilt client to cheddar
...
* commit '826e13c6936b83a24d4e3fee708c479f89374661':
2013-04-19 14:45:58 -07:00
Chad Jones
aa50ee045a
am 51343775: am e7b6280d: am ab593295: am 6b005809: Add external/noto-fonts
...
* commit '5134377520ab8b6307e2642b896d614628727a25':
2013-04-19 14:45:58 -07:00
RoboErik
ef171c0572
am 0544f6dd: am 9699c54f: am 046a7f66: am 3575047c: am 1b86656f: (-s ours) am 1e0da1ed: Remove GestureService from the jb-mr1-aah build
...
* commit '0544f6dd6140e6addb9785b148f09262f9137e57':
2013-04-19 14:45:57 -07:00
Ed Heyl
8edcfd0c7b
am 782cd74b: am 16f28a32: Merge remote-tracking branch \'goog/jb-mr2-dev-plus-aosp\'
...
* commit '782cd74b4efdd92b0fcccc62cd194636bc7f1e0c':
2013-04-19 14:45:56 -07:00
Ed Heyl
9fc9369e1e
am c0534432: am 3ebdc4ec: am d20a65a9: am e1b882c6: am 1fb37e4f: am 1cd7dac6: change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
...
* commit 'c05344322399e22e8af8330e33f3ce93b3322a5a':
2013-04-19 14:41:58 -07:00
Chad Jones
11f2dd8291
am 3628a776: am c9341570: am 23075b03: Add vendor/unbundled_google/packages/PhyziosDream
...
* commit '3628a776f2ba96cafc19b0693077522244c8adf4':
2013-04-19 14:41:57 -07:00
Jean-Baptiste Queru
7dcc5dd1b1
am 7da34b08: am 7d5e5660: am f4cc1c24: Merge "Remove mesa3d from manifest" into jb-mr2-dev
...
* commit '7da34b08e404aa0db680e6c0d98a73e6ec3d070c':
2013-04-19 14:41:56 -07:00
Kevin Jin
17e2a7d468
am 8909140e: add external/actionbarsherlock to master manifest
...
* commit '8909140eeed327505088c0a4e4c398ee2eadf2f0':
add external/actionbarsherlock to master manifest
2013-04-19 14:41:55 -07:00
Tim Kilbourn
521e3a7ea5
am 9151b3af: am 25d2b58f: am e7d4a04b: Add vendor/google_factory
...
* commit '9151b3af75ddb9cca13f7c92407a0f62480058c6':
2013-04-19 14:41:54 -07:00
Baligh Uddin
e6f746a988
am 9a4da95e: Merge "Add Terminal app to master manifest."
...
* commit '9a4da95ec6628ac556769789497ff82292a3676f':
Add Terminal app to master manifest.
2013-04-19 14:41:53 -07:00
Chad Jones
2fd2c2b9f6
am 235d175c: am c23b02e7: am 7ea3d4c0: Add vendor/qcom/gpu to mako and flo
...
* commit '235d175c3bcd4fc1046292062a982a73a8c70063':
2013-04-19 14:41:52 -07:00
Chad Jones
ad5772b2da
am d655fedf: am a5f65c72: am c4304b2a: Add vendor/qcom/proprietary for flo pdk
...
* commit 'd655fedf800955644798300386921c7c5b40d224':
2013-04-19 14:41:51 -07:00
Chad Jones
81e0a3ec58
am 88149ee7: Add external/uidriver
...
* commit '88149ee760c2c366e0a3b64d9b7197c0da1525f9':
Add external/uidriver
2013-04-19 14:41:50 -07:00
keunyoung
7198d8863c
am 6de72ea7: am 7c3cbead: am be87352d: retire mini-armv7-a without NEON
...
* commit '6de72ea7ba9e885fed079efa63d039869a3654bb':
2013-04-19 14:41:49 -07:00
Chad Jones
1068655430
am 06408558: am 8eaad63e: am 1293b376: Add vendor/fraunhofer/virtualizer
...
* commit '064085589d2fae49ce89129f284157ecd00609f4':
2013-04-19 14:41:48 -07:00
Chad Jones
d69c13d2c9
am c78c53c0: am d9492ba6: am 11e54b6c: Add developers/build
...
* commit 'c78c53c054078f8ddaca700e7ab6fd5d701fd224':
2013-04-19 14:41:47 -07:00
Jean-Baptiste Queru
255d88ac37
am 495c9d6e: am ce2ab469: (-s ours) am 23195d0b: am 49f9edfb: am 544baa95: (-s ours) am 98721343: (-s ours) Update manifest - do not merge
...
* commit '495c9d6e1a4515a6c95174b6c21f2631f02c70a5':
2013-04-19 14:41:47 -07:00
Chad Jones
0052dca1da
am a5139217: am 3624a778: am cdb7446c: Merge "Add external/open-vcdiff" into jb-mr2-dev
...
* commit 'a5139217401e26ad8bf2365073112f46199bb8bc':
2013-04-19 14:41:45 -07:00
Jeff Hamilton
826e13c693
am ddaa3b38: am 6b3345e5: am 4a6b02f1: Switch the GMS core prebuilt client to cheddar
...
* commit 'ddaa3b38afe3e7b2e7be3a1dc999dd700dda4d50':
2013-04-19 14:41:44 -07:00
Chad Jones
5134377520
am e7b6280d: am ab593295: am 6b005809: Add external/noto-fonts
...
* commit 'e7b6280df2ad7b4978fab5f535cbd672d418a9b2':
2013-04-19 14:41:43 -07:00
RoboErik
0544f6dd61
am 9699c54f: am 046a7f66: am 3575047c: am 1b86656f: (-s ours) am 1e0da1ed: Remove GestureService from the jb-mr1-aah build
...
* commit '9699c54f85bb1790c973753f3306f849143b4249':
2013-04-19 14:41:42 -07:00
Ed Heyl
782cd74b4e
am 16f28a32: Merge remote-tracking branch \'goog/jb-mr2-dev-plus-aosp\'
...
* commit '16f28a32fafad8e603cc7b9d3211d24b9abf2cb6':
2013-04-19 14:41:41 -07:00
Chad Jones
076ac48da8
Add frameworks/minikin
2013-04-19 10:30:42 -07:00
Geoff Mendal
7b71eb3201
Add internal repo scallop projects
2013-04-16 21:00:53 +00:00
Chad Jones
b8b7efa559
am 27434efd: am f0ad22f9: Update groups on widevine
...
* commit '27434efd8de305ff04bc631ec2eae26bbd57ec85':
Update groups on widevine
2013-04-16 10:12:01 -07:00
Chad Jones
27434efd8d
am f0ad22f9: Update groups on widevine
...
* commit 'f0ad22f9e91a4b0a2012fcd3243e4252a39830c8':
Update groups on widevine
2013-04-16 10:09:01 -07:00
Chad Jones
f0ad22f9e9
Update groups on widevine
2013-04-16 10:06:06 -07:00
keunyoung
87ef0f47f6
am 25134e8c: am a8d80e55: Merge "add hardware/broadcom/libbt and make it a PDK group" into jb-mr2-dev
...
* commit '25134e8cf39f20ca3786122707b3a301667d9471':
add hardware/broadcom/libbt and make it a PDK group
2013-04-11 15:52:48 -07:00
keunyoung
25134e8cf3
am a8d80e55: Merge "add hardware/broadcom/libbt and make it a PDK group" into jb-mr2-dev
...
* commit 'a8d80e55295f2d742151f022d58fbb1cc956bddd':
add hardware/broadcom/libbt and make it a PDK group
2013-04-11 15:48:59 -07:00
keunyoung
a8d80e5529
Merge "add hardware/broadcom/libbt and make it a PDK group" into jb-mr2-dev
2013-04-11 22:45:59 +00:00
Ed Heyl
4095356c5b
am 766ad2a9: am c002604c: am e0a8b41d: am f259f07e: am b4131456: am bcb2c7e8: remove revision for gcm and gcore
...
* commit '766ad2a97830046a8a421d6af34ef3fc7a15018e':
remove revision for gcm and gcore
2013-04-11 14:58:10 -07:00
Ed Heyl
766ad2a978
am c002604c: am e0a8b41d: am f259f07e: am b4131456: am bcb2c7e8: remove revision for gcm and gcore
...
* commit 'c002604cb07585d09888634967f177958bbd940f':
remove revision for gcm and gcore
2013-04-11 12:54:39 -07:00
Ed Heyl
c002604cb0
am e0a8b41d: am f259f07e: am b4131456: am bcb2c7e8: remove revision for gcm and gcore
...
* commit 'e0a8b41df25db2a5aa298cda6625a25b332ce37a':
remove revision for gcm and gcore
2013-04-11 12:50:41 -07:00
Ed Heyl
e0a8b41df2
am f259f07e: am b4131456: am bcb2c7e8: remove revision for gcm and gcore
...
* commit 'f259f07e6110698840bc3e0ca3d1d973f41dcd42':
remove revision for gcm and gcore
2013-04-11 12:47:04 -07:00
Ed Heyl
f259f07e61
am b4131456: am bcb2c7e8: remove revision for gcm and gcore
...
* commit 'b4131456c55074cf831d974aa5cfd4142a0f923f':
remove revision for gcm and gcore
2013-04-11 12:43:09 -07:00
Ed Heyl
b4131456c5
am bcb2c7e8: remove revision for gcm and gcore
...
* commit 'bcb2c7e84007df0651294e8314c624106ccc2d22':
remove revision for gcm and gcore
2013-04-11 12:41:05 -07:00
Ed Heyl
bcb2c7e840
remove revision for gcm and gcore
2013-04-11 12:37:37 -07:00
keunyoung
ece61f9694
add hardware/broadcom/libbt and make it a PDK group
2013-04-10 18:58:25 -07:00
Guru Nagarajan
3b8f7ca300
am 55519a03: am b5b2bd44: Widevine sync for mako modified: default.xml
...
* commit '55519a03ac381f8f1432bf3ba67c879793d4bd4c':
Widevine sync for mako modified: default.xml
2013-04-09 15:12:26 -07:00
Guru Nagarajan
55519a03ac
am b5b2bd44: Widevine sync for mako modified: default.xml
...
* commit 'b5b2bd44fcacdd3b5b1a08680e94753a729569c2':
Widevine sync for mako modified: default.xml
2013-04-09 15:08:32 -07:00
Guru Nagarajan
b5b2bd44fc
Widevine sync for mako
...
modified: default.xml
2013-04-09 14:57:34 -07:00
Stephen Hines
e6c97a71a5
am 2ba8cd18: am 029e6a5c: Remove linkloader project, as it is now under frameworks/rs.
...
* commit '2ba8cd18db1a5822483c214dc1958ec67fb01b13':
Remove linkloader project, as it is now under frameworks/rs.
2013-04-08 17:05:28 -07:00
Stephen Hines
2ba8cd18db
am 029e6a5c: Remove linkloader project, as it is now under frameworks/rs.
...
* commit '029e6a5c66563454ebdf9f7808b69ce37f20606b':
Remove linkloader project, as it is now under frameworks/rs.
2013-04-08 14:51:46 -07:00
Stephen Hines
029e6a5c66
Remove linkloader project, as it is now under frameworks/rs.
...
Bug: 7342767
Change-Id: I268d89d905eeb6bdeac244bf64739dfd3dd32b2c
2013-04-08 13:57:48 -07:00
Chad Jones
2acf9e615b
am 17b1d70a: am b59cce5d: Add external/bison to pdk group
...
* commit '17b1d70ab92a3317829276a9ba7ab6440acc7cb0':
Add external/bison to pdk group
2013-04-06 12:53:08 -07:00
Chad Jones
17b1d70ab9
am b59cce5d: Add external/bison to pdk group
...
* commit 'b59cce5dec43145d7ef0989b2295eca3926d989e':
Add external/bison to pdk group
2013-04-06 12:49:57 -07:00
Chad Jones
17fc5fab05
am 7afb5edf: am 5353e96c: Add vendor/qcom/{gpu,proprietary} to hammerhead group
...
* commit '7afb5edf02aabab4c4479f1422ac43d7f5f6e686':
Add vendor/qcom/{gpu,proprietary} to hammerhead group
2013-04-06 12:47:38 -07:00
Chad Jones
7afb5edf02
am 5353e96c: Add vendor/qcom/{gpu,proprietary} to hammerhead group
...
* commit '5353e96cb35e7f2810a7a3b28bf0520f8ccd4d9a':
Add vendor/qcom/{gpu,proprietary} to hammerhead group
2013-04-06 12:45:25 -07:00
Chad Jones
b59cce5dec
Add external/bison to pdk group
...
pdk build broken without it
2013-04-06 12:44:38 -07:00
Chad Jones
5353e96cb3
Add vendor/qcom/{gpu,proprietary} to hammerhead group
2013-04-05 15:27:03 -07:00
Geoff Mendal
640a55ed16
Move external/uidriver to external/droiddriver
2013-04-03 11:02:21 -07:00
Geoff Mendal
405d2c99d6
resolved conflicts for merge of 5607bd90 to master
2013-04-02 18:53:50 -07:00
Geoff Mendal
5607bd9038
am b76020f4: Add vendor/unbundled_google/packages/Switchboard project
...
* commit 'b76020f49423eb8a8e66d5ef9275a08f063d9b52':
Add vendor/unbundled_google/packages/Switchboard project
2013-04-02 16:45:19 -07:00
Geoff Mendal
b76020f494
Add vendor/unbundled_google/packages/Switchboard project
2013-04-02 15:11:33 -07:00
Chad Jones
672bc5733c
am 5bcff790: am 6503fff9: Revert "Revert "Add projects for hammerhead""
...
* commit '5bcff790d1d70d58578d57913898d190b69a8757':
Revert "Revert "Add projects for hammerhead""
2013-04-02 12:15:21 -07:00
Ying Wang
a5cfca7f4c
am 49960a33: am 987de1e7: Revert "Add projects for hammerhead"
...
* commit '49960a336387408d5dca08bab6456508b5c252d2':
Revert "Add projects for hammerhead"
2013-04-02 12:15:20 -07:00
Chad Jones
5bcff790d1
am 6503fff9: Revert "Revert "Add projects for hammerhead""
...
* commit '6503fff9cf02be51072402411facd34fbee9849c':
Revert "Revert "Add projects for hammerhead""
2013-04-02 12:09:15 -07:00
Ying Wang
49960a3363
am 987de1e7: Revert "Add projects for hammerhead"
...
* commit '987de1e72bd5ce21a6f41550884b76149793ea55':
Revert "Add projects for hammerhead"
2013-04-02 12:09:11 -07:00
Chad Jones
6503fff9cf
Revert "Revert "Add projects for hammerhead""
...
This reverts commit 987de1e72b
2013-04-02 19:03:20 +00:00
Ying Wang
987de1e72b
Revert "Add projects for hammerhead"
...
This reverts commit f4518b6eb9
2013-04-02 18:58:27 +00:00
Geoff Mendal
d3efc7dd1b
am 78e96614: am f4518b6e: Add projects for hammerhead
...
* commit '78e966144f4115a142b65d74a9c2194263b9e703':
Add projects for hammerhead
2013-04-02 11:34:47 -07:00
Geoff Mendal
78e966144f
am f4518b6e: Add projects for hammerhead
...
* commit 'f4518b6eb9503e0c90335c25b80a88058a98e1d5':
Add projects for hammerhead
2013-04-02 11:32:57 -07:00
Geoff Mendal
f4518b6eb9
Add projects for hammerhead
...
Change-Id: I383fb0c736104118bb4e3eff903d91d89b884fde
2013-04-02 11:28:17 -07:00
Torne (Richard Coles)
6a89d3e78c
Merge "Add external/chromium_org and subprojects."
2013-03-29 11:22:34 +00:00
Chad Jones
ffca543e98
am db072feb: (-s ours) am b71a4aa5: am ff341d54: (-s ours) am 889d55f8: Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
...
* commit 'db072feba1a7e6503553385a4a15930e1b9f81e5':
Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
2013-03-28 14:52:22 -07:00
Chad Jones
db072feba1
am b71a4aa5: am ff341d54: (-s ours) am 889d55f8: Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
...
* commit 'b71a4aa5bc8fda7a28c0ae494a2b1c98a3b6ed90':
Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
2013-03-28 14:50:42 -07:00
Chad Jones
b71a4aa5bc
am ff341d54: (-s ours) am 889d55f8: Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
...
* commit 'ff341d544f38b6efa337c04840f3e440ba8f7e17':
Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
2013-03-28 14:48:04 -07:00
Chad Jones
ff341d544f
am 889d55f8: Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
...
* commit '889d55f888739c4c3827a4c02755f222f1ebea89':
Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
2013-03-28 14:46:16 -07:00
Chad Jones
889d55f888
Rollback packages/Videos to froyo-ub-videos-highlander DO NOT MERGE
...
Change-Id: I4960b3d7a07f817729fe09e1899bca4d950fa154
2013-03-28 14:33:39 -07:00
Torne (Richard Coles)
01c8e4edcd
Add external/chromium_org and subprojects.
...
Add the native code from upstream Chromium used to build the new
WebView. This code will be built by full build targets but not yet
included in any ROMs.
Change-Id: I677204018a1a74c4907f2bd8e54ebabd0a673497
2013-03-28 15:54:48 +00:00
Chad Jones
7b9fe70d56
am 806bfbab: am 677a75db: Separate msm8x74 device group from qcom_msm8x74 hardware group
...
* commit '806bfbabe45987935aa539ab3328dfdb5c88eb11':
Separate msm8x74 device group from qcom_msm8x74 hardware group
2013-03-26 13:23:03 -07:00
Chad Jones
806bfbabe4
am 677a75db: Separate msm8x74 device group from qcom_msm8x74 hardware group
...
* commit '677a75dbd6b0075779e05f4410eee61cd559567f':
Separate msm8x74 device group from qcom_msm8x74 hardware group
2013-03-26 13:17:19 -07:00
Chad Jones
677a75dbd6
Separate msm8x74 device group from qcom_msm8x74 hardware group
2013-03-26 12:26:11 -07:00
Chad Jones
803e6cda75
am e1e12c3b: am f1f6d3a3: Setup rest of project groups for anchovy
...
* commit 'e1e12c3bd4d2cc465de5afbbdf2706945f6c9fab':
Setup rest of project groups for anchovy
2013-03-26 00:12:41 +00:00
Chad Jones
e1e12c3bd4
am f1f6d3a3: Setup rest of project groups for anchovy
...
* commit 'f1f6d3a38fa3a1eb96589d79707cda18b7314e9e':
Setup rest of project groups for anchovy
2013-03-26 00:10:00 +00:00
Chad Jones
f1f6d3a38f
Setup rest of project groups for anchovy
...
Change-Id: Ieaf5e14b9de099c967bf4d7fb421db0ff2b3c4b0
2013-03-25 17:05:06 -07:00
Chad Jones
ed86adbeca
am 976d85c2: am ff59c429: fix typo on device/qcom/msm8x74
...
* commit '976d85c25efa77cf05b517313994afc1c9cbe880':
fix typo on device/qcom/msm8x74
2013-03-22 21:39:45 +00:00
Chad Jones
976d85c25e
am ff59c429: fix typo on device/qcom/msm8x74
...
* commit 'ff59c4293e659f794a15afba5db8443401e85bad':
fix typo on device/qcom/msm8x74
2013-03-22 21:37:29 +00:00
Chad Jones
ff59c4293e
fix typo on device/qcom/msm8x74
2013-03-22 14:32:43 -07:00
Chad Jones
38053cbf56
Add hardware/qcom/msm8x27
2013-03-21 17:54:10 -07:00
Chad Jones
63be96d70a
am d67d0308: am 2721fbe7: Add projects for anchovy
...
* commit 'd67d030891e7909d3a4813d4d1d57f1814be3f20':
Add projects for anchovy
2013-03-22 00:43:58 +00:00
Chad Jones
d67d030891
am 2721fbe7: Add projects for anchovy
...
* commit '2721fbe7a52de77db32219afcd5a98b842ab0c8c':
Add projects for anchovy
2013-03-22 00:41:13 +00:00
Chad Jones
2721fbe7a5
Add projects for anchovy
...
Change-Id: I3e16902283c6b2285798e9b9148c4a1be3cb6425
2013-03-21 17:31:31 -07:00
Chad Jones
0f90722595
am 788f9db7: am 032eb014: Add vendor/qcom/... projects to msm8x74 pdk
...
* commit '788f9db7f764266e8a6e16f1ffe1ab0346e0ab8f':
Add vendor/qcom/... projects to msm8x74 pdk
2013-03-22 00:02:21 +00:00
Chad Jones
788f9db7f7
am 032eb014: Add vendor/qcom/... projects to msm8x74 pdk
...
* commit '032eb01416db115e9f4e9aa9d9d2767daf6a52e9':
Add vendor/qcom/... projects to msm8x74 pdk
2013-03-21 23:59:32 +00:00
Chad Jones
032eb01416
Add vendor/qcom/... projects to msm8x74 pdk
2013-03-21 16:19:45 -07:00
Chad Jones
c007825185
Merge "Add guppy projects"
2013-03-21 21:49:32 +00:00
Chad Jones
4c2664cdb3
Add guppy projects
2013-03-21 13:59:51 -07:00
Chad Jones
fd054bbb13
am 4daef7c3: am 269a60e0: Tweak groups for msm8x74 pdk setup.
...
* commit '4daef7c3d01b56add087e720a49f950a7b6764b6':
Tweak groups for msm8x74 pdk setup.
2013-03-21 20:58:16 +00:00
Chad Jones
4daef7c3d0
am 269a60e0: Tweak groups for msm8x74 pdk setup.
...
* commit '269a60e0a439dee7fd0234c3efe7a211628c0765':
Tweak groups for msm8x74 pdk setup.
2013-03-21 20:56:07 +00:00
Chad Jones
269a60e0a4
Tweak groups for msm8x74 pdk setup.
2013-03-21 13:38:33 -07:00
Chad Jones
7d0a1e61c8
am cb59ec87: am 8d5aac7d: Add hardware/qcom/msm8x74
...
* commit 'cb59ec878165287563f87f5e17e78fd454ed898a':
Add hardware/qcom/msm8x74
2013-03-21 01:57:28 +00:00
Chad Jones
cb59ec8781
am 8d5aac7d: Add hardware/qcom/msm8x74
...
* commit '8d5aac7df4be15f00835c82afa2886228dbe341f':
Add hardware/qcom/msm8x74
2013-03-21 01:55:25 +00:00
Chad Jones
8d5aac7df4
Add hardware/qcom/msm8x74
2013-03-20 16:09:19 -07:00
Chad Jones
d1dde32c73
Add tools/vendor/ej-tech
2013-03-15 11:38:53 -07:00
Ed Heyl
bd57d230ae
am 28598667: am e4a0c77f: am 97d305ad: am e61c3e1e: am 821a37c8: am b30b6329: (-s ours) set revision in OneUp and libs/gcm as per smain
...
* commit '28598667d299a18e884d703825e760a6e069d59d':
set revision in OneUp and libs/gcm as per smain
2013-03-15 04:51:28 +00:00
Baligh Uddin
58d76a1c3d
am 3aa7d07f: am ffd145cf: am 047e0b38: am d97a7d3c: am 61738ebb: am 51e38fa4: (-s ours) Manifest for jb-mr1.1-docs
...
* commit '3aa7d07f27cd0e2eae681acfb1b36bbc4365760e':
Manifest for jb-mr1.1-docs
2013-03-15 04:51:27 +00:00
Ed Heyl
28598667d2
am e4a0c77f: am 97d305ad: am e61c3e1e: am 821a37c8: am b30b6329: (-s ours) set revision in OneUp and libs/gcm as per smain
...
* commit 'e4a0c77fae1670aa88c5f33c0d67aef7f763161e':
set revision in OneUp and libs/gcm as per smain
2013-03-15 04:49:06 +00:00
Baligh Uddin
3aa7d07f27
am ffd145cf: am 047e0b38: am d97a7d3c: am 61738ebb: am 51e38fa4: (-s ours) Manifest for jb-mr1.1-docs
...
* commit 'ffd145cf653359928e17ce7fa607a09bc956fc59':
Manifest for jb-mr1.1-docs
2013-03-15 04:49:04 +00:00
Ed Heyl
e4a0c77fae
am 97d305ad: am e61c3e1e: am 821a37c8: am b30b6329: (-s ours) set revision in OneUp and libs/gcm as per smain
...
* commit '97d305ad01aa05e62aa3a7dc3be3bc331bb82f77':
set revision in OneUp and libs/gcm as per smain
2013-03-14 21:46:57 -07:00
Baligh Uddin
ffd145cf65
am 047e0b38: am d97a7d3c: am 61738ebb: am 51e38fa4: (-s ours) Manifest for jb-mr1.1-docs
...
* commit '047e0b38b93caff4b93a792f106f511402ddc4cc':
Manifest for jb-mr1.1-docs
2013-03-14 21:46:56 -07:00
Ed Heyl
97d305ad01
am e61c3e1e: am 821a37c8: am b30b6329: (-s ours) set revision in OneUp and libs/gcm as per smain
...
* commit 'e61c3e1e784d655aff5cb8305998df1579b31587':
set revision in OneUp and libs/gcm as per smain
2013-03-14 21:45:17 -07:00
Baligh Uddin
047e0b38b9
am d97a7d3c: am 61738ebb: am 51e38fa4: (-s ours) Manifest for jb-mr1.1-docs
...
* commit 'd97a7d3c95546ae660f3c206c959f5576bb4d443':
Manifest for jb-mr1.1-docs
2013-03-14 21:45:16 -07:00
Ed Heyl
e61c3e1e78
am 821a37c8: am b30b6329: (-s ours) set revision in OneUp and libs/gcm as per smain
...
* commit '821a37c8e37dc861c64d924ba67b532e44ea5426':
set revision in OneUp and libs/gcm as per smain
2013-03-14 21:42:46 -07:00
Baligh Uddin
d97a7d3c95
am 61738ebb: am 51e38fa4: (-s ours) Manifest for jb-mr1.1-docs
...
* commit '61738ebb4c0d3031cb3edf0024fcebaf031af8ea':
Manifest for jb-mr1.1-docs
2013-03-14 21:42:45 -07:00
Ed Heyl
821a37c8e3
am b30b6329: (-s ours) set revision in OneUp and libs/gcm as per smain
...
* commit 'b30b6329610a06c21014c90269e7ca240e13baaf':
set revision in OneUp and libs/gcm as per smain
2013-03-14 21:40:29 -07:00
Baligh Uddin
61738ebb4c
am 51e38fa4: (-s ours) Manifest for jb-mr1.1-docs
...
* commit '51e38fa47dd6dfe6853674d83d61679855d305af':
Manifest for jb-mr1.1-docs
2013-03-14 21:40:29 -07:00
Ed Heyl
b30b632961
set revision in OneUp and libs/gcm as per smain
2013-03-14 15:42:59 -07:00
keunyoung
fd2c182da6
am 90bbb2f5: am b0d48825: add frameworks/compile/slang to PDK
...
* commit '90bbb2f5d05f416c6c1778fffb31de1eddbcded1':
add frameworks/compile/slang to PDK
2013-03-14 02:34:46 +00:00
keunyoung
90bbb2f5d0
am b0d48825: add frameworks/compile/slang to PDK
...
* commit 'b0d48825554d11a196a97a6964f1e8cc1609912b':
add frameworks/compile/slang to PDK
2013-03-14 00:22:22 +00:00
keunyoung
b0d4882555
add frameworks/compile/slang to PDK
...
bug: 8380792
2013-03-13 15:24:29 -07:00
Chad Jones
69e2bc2dca
Add BigTop and SyncAPI
2013-03-13 12:30:20 -07:00
Ed Heyl
c053443223
am 3ebdc4ec: am d20a65a9: am e1b882c6: am 1fb37e4f: am 1cd7dac6: change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
...
* commit '3ebdc4ec07e40c31e1f82ccb32159d1e2bdb5bc8':
change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
2013-03-12 07:40:39 +00:00
Ed Heyl
3ebdc4ec07
am d20a65a9: am e1b882c6: am 1fb37e4f: am 1cd7dac6: change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
...
* commit 'd20a65a97188aad5c8762344da3adb4e87bf2fe1':
change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
2013-03-12 07:38:19 +00:00
Ed Heyl
d20a65a971
am e1b882c6: am 1fb37e4f: am 1cd7dac6: change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
...
* commit 'e1b882c634eb3c4e19e7d8c102839be10aed963b':
change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
2013-03-12 00:36:18 -07:00
Ed Heyl
e1b882c634
am 1fb37e4f: am 1cd7dac6: change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
...
* commit '1fb37e4fe3ef6ca84ed9e53291922722c47d993a':
change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
2013-03-12 00:32:28 -07:00
Ed Heyl
1fb37e4fe3
am 1cd7dac6: change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
...
* commit '1cd7dac681501229af5ba1222c21b8919937a5f8':
change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
2013-03-12 00:30:54 -07:00
Ed Heyl
1cd7dac681
change PrebuiltGmsCore to froyo-ub-gcore-cheddar as per b/8360336 - Update apps in jb-mr1.1 JDQ39
2013-03-11 23:51:20 -07:00
Chad Jones
3628a776f2
am c9341570: am 23075b03: Add vendor/unbundled_google/packages/PhyziosDream
...
* commit 'c9341570e7b2776024aacdfe401ade25388608b5':
Add vendor/unbundled_google/packages/PhyziosDream
2013-03-08 18:28:34 +00:00
Chad Jones
c9341570e7
am 23075b03: Add vendor/unbundled_google/packages/PhyziosDream
...
* commit '23075b03bf590e26948b633130c0bce9107ffa6f':
Add vendor/unbundled_google/packages/PhyziosDream
2013-03-08 18:12:06 +00:00
Chad Jones
23075b03bf
Add vendor/unbundled_google/packages/PhyziosDream
2013-03-08 10:07:13 -08:00
Jean-Baptiste Queru
7da34b08e4
am 7d5e5660: am f4cc1c24: Merge "Remove mesa3d from manifest" into jb-mr2-dev
...
* commit '7d5e56606ade641828cfde07c76c80f5050aad50':
Remove mesa3d from manifest
2013-03-08 15:22:53 +00:00
Jean-Baptiste Queru
7d5e56606a
am f4cc1c24: Merge "Remove mesa3d from manifest" into jb-mr2-dev
...
* commit 'f4cc1c24f801394191f857c4468b0670226aa498':
Remove mesa3d from manifest
2013-03-08 15:21:12 +00:00
Jean-Baptiste Queru
f4cc1c24f8
Merge "Remove mesa3d from manifest" into jb-mr2-dev
2013-03-08 15:18:41 +00:00
Kevin Jin
8909140eee
add external/actionbarsherlock to master manifest
2013-03-07 17:51:09 -08:00
Tim Kilbourn
9151b3af75
am 25d2b58f: am e7d4a04b: Add vendor/google_factory
...
* commit '25d2b58fb12b382c7e67c71299a7413c0cfe7720':
Add vendor/google_factory
2013-03-08 01:26:48 +00:00
Tim Kilbourn
25d2b58fb1
am e7d4a04b: Add vendor/google_factory
...
* commit 'e7d4a04b4ff03c0dba11b8ca73b7890736df4cd5':
Add vendor/google_factory
2013-03-08 01:25:10 +00:00
Tim Kilbourn
e7d4a04b4f
Add vendor/google_factory
...
Change-Id: Ibc12008fccc56360cb6f745efcbf71d8f3d1a522
2013-03-07 17:17:27 -08:00
Jean-Baptiste Queru
6e9221c269
Remove mesa3d from manifest
...
Change-Id: I94ccfa8390bb777fb6d479c40c0cddff60eac0c2
2013-03-07 07:54:32 -08:00
Baligh Uddin
9a4da95ec6
Merge "Add Terminal app to master manifest."
2013-03-06 20:17:30 +00:00
Chad Jones
235d175c3b
am c23b02e7: am 7ea3d4c0: Add vendor/qcom/gpu to mako and flo
...
* commit 'c23b02e79a697d7a380c8573ff5208c71965a8df':
Add vendor/qcom/gpu to mako and flo
2013-03-06 20:14:35 +00:00
Chad Jones
c23b02e79a
am 7ea3d4c0: Add vendor/qcom/gpu to mako and flo
...
* commit '7ea3d4c0845df29f336a6bde983c636630c22665':
Add vendor/qcom/gpu to mako and flo
2013-03-06 20:12:26 +00:00
Baligh Uddin
b1427fb93c
Add Terminal app to master manifest.
2013-03-06 12:06:24 -08:00
Chad Jones
d655fedf80
am a5f65c72: am c4304b2a: Add vendor/qcom/proprietary for flo pdk
...
* commit 'a5f65c7226ced4e0a78715381af7ea9084887516':
Add vendor/qcom/proprietary for flo pdk
2013-03-06 20:02:47 +00:00
Chad Jones
7ea3d4c084
Add vendor/qcom/gpu to mako and flo
2013-03-06 12:02:18 -08:00
Chad Jones
a5f65c7226
am c4304b2a: Add vendor/qcom/proprietary for flo pdk
...
* commit 'c4304b2a515c776a1aeac002b32fd5d1d355ac6d':
Add vendor/qcom/proprietary for flo pdk
2013-03-06 20:01:23 +00:00
Chad Jones
c4304b2a51
Add vendor/qcom/proprietary for flo pdk
2013-03-06 11:39:48 -08:00
Chad Jones
88149ee760
Add external/uidriver
2013-03-05 17:27:53 -08:00
keunyoung
6de72ea7ba
am 7c3cbead: am be87352d: retire mini-armv7-a without NEON
...
* commit '7c3cbead0a7109d7262f50c7f13243352e6149e0':
retire mini-armv7-a without NEON
2013-03-05 23:22:44 +00:00
keunyoung
7c3cbead0a
am be87352d: retire mini-armv7-a without NEON
...
* commit 'be87352d375e577a57e9096db067c2a7e31f656e':
retire mini-armv7-a without NEON
2013-03-05 23:20:27 +00:00
keunyoung
be87352d37
retire mini-armv7-a without NEON
...
- no longer supported in PDK
bug: 8138963
2013-03-05 14:57:30 -08:00
Chad Jones
064085589d
am 8eaad63e: am 1293b376: Add vendor/fraunhofer/virtualizer
...
* commit '8eaad63ef562d39c64bbf91f3af02b8beaa9a9b2':
Add vendor/fraunhofer/virtualizer
2013-03-05 21:08:03 +00:00
Chad Jones
8eaad63ef5
am 1293b376: Add vendor/fraunhofer/virtualizer
...
* commit '1293b376cdaed186695b2859bfeac205c8edc045':
Add vendor/fraunhofer/virtualizer
2013-03-05 21:05:01 +00:00
Chad Jones
1293b376cd
Add vendor/fraunhofer/virtualizer
2013-03-05 10:22:53 -08:00
Chad Jones
c78c53c054
am d9492ba6: am 11e54b6c: Add developers/build
...
* commit 'd9492ba6fdd78f18695d135616ce600ffb7e2237':
Add developers/build
2013-03-02 02:17:08 +00:00
Chad Jones
d9492ba6fd
am 11e54b6c: Add developers/build
...
* commit '11e54b6c1a0e8783bbebf0b5d4a4cb7406a7e03e':
Add developers/build
2013-03-02 02:15:41 +00:00
Chad Jones
11e54b6c1a
Add developers/build
2013-03-01 13:42:14 -08:00
Jean-Baptiste Queru
495c9d6e1a
am ce2ab469: (-s ours) am 23195d0b: am 49f9edfb: am 544baa95: (-s ours) am 98721343: (-s ours) Update manifest - do not merge
...
* commit 'ce2ab46981c8839f4e3dae97e1fabb7901a30849':
Update manifest - do not merge
2013-03-01 19:28:27 +00:00
The Android Open Source Project
a7f38b7d52
Merge from master
...
Change-Id: I8b5010bff1cf2054f2737c46840342134c793862
2013-03-01 11:27:46 -08:00
Jean-Baptiste Queru
ce2ab46981
am 23195d0b: am 49f9edfb: am 544baa95: (-s ours) am 98721343: (-s ours) Update manifest - do not merge
...
* commit '23195d0bdf6ff39c3c933bb571627e6c3f23cbb4':
Update manifest - do not merge
2013-03-01 19:25:40 +00:00
Jean-Baptiste Queru
23195d0bdf
am 49f9edfb: am 544baa95: (-s ours) am 98721343: (-s ours) Update manifest - do not merge
...
* commit '49f9edfbf9d2bd92059fda4117cedbcd02808bcf':
Update manifest - do not merge
2013-03-01 19:21:43 +00:00
Jean-Baptiste Queru
49f9edfbf9
am 544baa95: (-s ours) am 98721343: (-s ours) Update manifest - do not merge
...
* commit '544baa95fe8da7c5c35415ba36871f4f99e23ac3':
Update manifest - do not merge
2013-03-01 11:19:21 -08:00
Jean-Baptiste Queru
544baa95fe
am 98721343: (-s ours) Update manifest - do not merge
...
* commit '987213438915afd46824f0e74f257a439edb8450':
Update manifest - do not merge
2013-03-01 11:17:29 -08:00
Jean-Baptiste Queru
9872134389
Update manifest - do not merge
...
Change-Id: I5e9853bf226471ceaa0de39d7b2290b8ba4cdc9e
2013-03-01 11:04:37 -08:00
The Android Open Source Project
70c902cf65
Add device/ and hardware/ for 4.2.2
...
Change-Id: Ia55ed4572705cac21f92eb2f766399dd3d95ebd7
2013-03-01 10:45:06 -08:00
The Android Open Source Project
84e45730b4
Add device/ and hardware/ for 4.2.2
...
Change-Id: I28afabeaec97b7a4861e78de18e8aa3621aa4efc
2013-03-01 10:42:55 -08:00
Chad Jones
a513921740
am 3624a778: am cdb7446c: Merge "Add external/open-vcdiff" into jb-mr2-dev
...
* commit '3624a77886168456daef544981d591a64558e3d7':
Add external/open-vcdiff
2013-03-01 01:00:05 +00:00
Chad Jones
3624a77886
am cdb7446c: Merge "Add external/open-vcdiff" into jb-mr2-dev
...
* commit 'cdb7446c6a308894e82046d9a55a11b6840a6d7c':
Add external/open-vcdiff
2013-03-01 00:57:46 +00:00
Chad Jones
cdb7446c6a
Merge "Add external/open-vcdiff" into jb-mr2-dev
2013-03-01 00:55:34 +00:00
Jeff Hamilton
ddaa3b38af
am 6b3345e5: am 4a6b02f1: Switch the GMS core prebuilt client to cheddar
...
* commit '6b3345e515636686353c0d34b42739aa6bf98496':
Switch the GMS core prebuilt client to cheddar
2013-02-28 23:56:47 +00:00
Jeff Hamilton
6b3345e515
am 4a6b02f1: Switch the GMS core prebuilt client to cheddar
...
* commit '4a6b02f1c140f8e3f81726ec8257577cd88efb86':
Switch the GMS core prebuilt client to cheddar
2013-02-28 23:53:57 +00:00
Chad Jones
27f0410ca0
Add external/open-vcdiff
2013-02-28 13:06:18 -08:00
Jeff Hamilton
4a6b02f1c1
Switch the GMS core prebuilt client to cheddar
2013-02-28 11:16:53 -06:00
Chad Jones
e7b6280df2
am ab593295: am 6b005809: Add external/noto-fonts
...
* commit 'ab5932951d45869b9c4f09d6a6f527eff4fe94e9':
Add external/noto-fonts
2013-02-27 23:22:58 +00:00
Chad Jones
ab5932951d
am 6b005809: Add external/noto-fonts
...
* commit '6b005809e0b8e0ecd96e7025f2807f7820db9863':
Add external/noto-fonts
2013-02-27 18:58:46 +00:00
Chad Jones
6b005809e0
Add external/noto-fonts
2013-02-27 10:45:47 -08:00
RoboErik
9699c54f85
am 046a7f66: am 3575047c: am 1b86656f: (-s ours) am 1e0da1ed: Remove GestureService from the jb-mr1-aah build
...
* commit '046a7f6626b42035cbcd283879e4fa3161d01ab0':
Remove GestureService from the jb-mr1-aah build
2013-02-26 22:48:34 +00:00
RoboErik
046a7f6626
am 3575047c: am 1b86656f: (-s ours) am 1e0da1ed: Remove GestureService from the jb-mr1-aah build
...
* commit '3575047c08baaf3dbce3a0a59cd8a64d430f88c3':
Remove GestureService from the jb-mr1-aah build
2013-02-26 22:45:59 +00:00
RoboErik
3575047c08
am 1b86656f: (-s ours) am 1e0da1ed: Remove GestureService from the jb-mr1-aah build
...
* commit '1b86656fc388b9145d0fd63d3af8eef233d6185e':
Remove GestureService from the jb-mr1-aah build
2013-02-26 22:43:15 +00:00
RoboErik
1b86656fc3
am 1e0da1ed: Remove GestureService from the jb-mr1-aah build
...
* commit '1e0da1ed6741a2f7e54e196ba3988752c18bb1a3':
Remove GestureService from the jb-mr1-aah build
2013-02-26 14:16:59 -08:00
RoboErik
1e0da1ed67
Remove GestureService from the jb-mr1-aah build
...
Change-Id: Icac292c8481057345e301b9cee3c3fa68b2e7fef
2013-02-25 15:59:03 -08:00
Ed Heyl
16f28a32fa
Merge remote-tracking branch 'goog/jb-mr2-dev-plus-aosp'
2013-02-24 16:50:01 -08:00
Ed Heyl
b89038b671
jb-mr2-dev-plus-aosp
2013-02-24 16:49:06 -08:00
Ed Heyl
e2caf417bf
jb-mr2-dev
2013-02-24 16:42:29 -08:00
Baligh Uddin
51e38fa47d
Manifest for jb-mr1.1-docs
2013-02-21 14:29:06 -08:00
Jean-Baptiste Queru
2368bc1962
am 1e746941: (-s ours) am f57aec3c: (-s ours) Remove phantasm - do not merge
...
* commit '1e746941051fdf9e0b9374ac55337e4be3302eaa':
Remove phantasm - do not merge
2013-02-21 14:23:43 -08:00
Jean-Baptiste Queru
1e74694105
am f57aec3c: (-s ours) Remove phantasm - do not merge
...
* commit 'f57aec3c367c4c920d65d0d1cf188c3844ad32a6':
Remove phantasm - do not merge
2013-02-21 14:17:06 -08:00
Jean-Baptiste Queru
f57aec3c36
Remove phantasm - do not merge
...
Change-Id: Icc8cfa0399bc176879f8010f253b4e586754b0f6
2013-02-21 13:50:50 -08:00
Baligh Uddin
4160e1913f
Add projects for developer resources
2013-02-20 12:00:32 -08:00
Baligh Uddin
324588c25d
Add device/generic/emulator* to master manifest
...
BugId: 8227388
2013-02-20 10:59:38 -08:00
Jean-Baptiste Queru
c69c0a2312
am b4760872: (-s ours) am 386be5a0: (-s ours) Restore hardware- and device-related projects - do not merge
...
* commit 'b4760872a0fdb394641f87136e5bfb9918980ecb':
Restore hardware- and device-related projects - do not merge
2013-02-19 15:21:39 -08:00
Jean-Baptiste Queru
b4760872a0
am 386be5a0: (-s ours) Restore hardware- and device-related projects - do not merge
...
* commit '386be5a0b7f35d2e39e5f8e798026f2d3d05f5db':
Restore hardware- and device-related projects - do not merge
2013-02-19 15:19:31 -08:00
Jean-Baptiste Queru
386be5a0b7
Restore hardware- and device-related projects - do not merge
...
Change-Id: I7f6898aacc990fe287f1714bcf8dd57491a8cffa
2013-02-19 15:16:40 -08:00
Chad Jones
594d7594ab
Add device/qcom projects
2013-02-16 16:49:41 -08:00
Chad Jones
cb11bb1da1
Add external/tinyxml to PDK
2013-02-15 17:52:46 -08:00
Chad Jones
cf1ed51a7f
Add frameworks/opt/{color,datetime,timezone}picker
2013-02-14 13:00:23 -08:00
Ed Heyl
bf0ff5eba1
Merge "Stop pointing Music2 to G release"
2013-02-14 09:27:56 +00:00
Chad Jones
98f0a570d6
Add external/ceres-solver
2013-02-13 14:08:53 -08:00
Justin Ho
b77df3bdf0
Stop pointing Music2 to G release
2013-02-12 13:27:21 -08:00
Jean-Baptiste Queru
ed1b3622c3
am 63e58f0b: (-s ours) am 438ca7a3: (-s ours) am eb0856f0: (-s ours) Update mirror-aosp-master manifest - do not merge
...
# Via Android Git Automerger (2) and Jean-Baptiste Queru (1)
* commit '63e58f0bcd68ebe861099a4a880c0eb2946fe8ef':
Update mirror-aosp-master manifest - do not merge
2013-02-12 11:03:48 -08:00
Jean-Baptiste Queru
63e58f0bcd
am 438ca7a3: (-s ours) am eb0856f0: (-s ours) Update mirror-aosp-master manifest - do not merge
...
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit '438ca7a38618bbf745986e8c3619e7f8292752ab':
Update mirror-aosp-master manifest - do not merge
2013-02-12 10:56:57 -08:00
Jean-Baptiste Queru
438ca7a386
am eb0856f0: (-s ours) Update mirror-aosp-master manifest - do not merge
...
# Via Jean-Baptiste Queru
* commit 'eb0856f024d9762f512e2d9632e121dde4dcf0ae':
Update mirror-aosp-master manifest - do not merge
2013-02-12 10:54:58 -08:00
The Android Open Source Project
8dfb5e34a7
Merge from master
...
Change-Id: Ibcd022c0645b9b795c76b15705d29db23c7e31b4
2013-02-12 10:54:20 -08:00
Jean-Baptiste Queru
eb0856f024
Update mirror-aosp-master manifest - do not merge
...
Change-Id: Id8bf8840426d28bbcbd0f2efcaac687f5536134b
2013-02-12 10:51:33 -08:00
The Android Open Source Project
d56f7074ff
Update master manifest to match jb-mr1.1-dev
...
Change-Id: I9738fb170cb5c4be9b5a7a691fe2b28615063eda
2013-02-12 10:14:08 -08:00
The Android Open Source Project
7fb2e54f78
Manifest for jb-mr1.1-dev
...
Change-Id: Icef4b850c4dd6bd6e784fca069c71aaacf7848f9
2013-02-12 10:08:29 -08:00
Keun young Park
b1d6abc7c9
add f/opt/telephony to PDK
...
bug: 8116793
2013-02-07 17:51:17 -08:00
Jean-Baptiste Queru
83cd10ef88
Revert "am b52061a2: Merge remote-tracking branch \'origin/jb-mr1-dev-plus-aosp\' into default"
...
This reverts commit fa2713caa4421c145c52
2013-02-07 12:23:47 -08:00
Jean-Baptiste Queru
4206c9de18
am cf201e4f: (-s ours) am 0c13a274: (-s ours) Remove hardware- and device-related projects - do not merge
...
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit 'cf201e4f3afdcdc2ecd068a8419f195cfa4f35b1':
Remove hardware- and device-related projects - do not merge
2013-02-07 11:19:46 -08:00
The Android Automerger
fa2713caa4
am b52061a2: Merge remote-tracking branch \'origin/jb-mr1-dev-plus-aosp\' into default
...
# By Adam Hampson
# Via Android Git Automerger (3) and others
* commit 'b52061a20df2f83f097997205013397eed281232':
Add tinyxml to the pdk
Add libusb_aah and libyuv to the pdk
2013-02-07 11:19:24 -08:00
Jean-Baptiste Queru
421c145c52
am 785694b7: am e63f4bf4: Add libusb_aah
...
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit '785694b788237d6592a89d02ba4c5caa5347c2e2':
Add libusb_aah
2013-02-07 11:19:23 -08:00
Jean-Baptiste Queru
cf201e4f3a
am 0c13a274: (-s ours) Remove hardware- and device-related projects - do not merge
...
# Via Jean-Baptiste Queru
* commit '0c13a274dc557428df5a8532d3bdc5579b625136':
Remove hardware- and device-related projects - do not merge
2013-02-07 09:23:32 -08:00
Jean-Baptiste Queru
0c13a274dc
Remove hardware- and device-related projects - do not merge
...
Change-Id: Id02efcc8bd4921c37a56460a70e28b6fffe59db7
2013-02-06 16:06:37 -08:00
Jean-Baptiste Queru
f006b40677
Remove docs/accessories.android.com
...
Change-Id: Ie933b03a40bab88424b1a7a2a2f86b78fbdcbf87
2013-02-05 10:37:11 -08:00
olly
24cc5239a7
Revert pointing master Videos at the inception branch. This happened due to an auto-merge of the CL below. I think this CL should have been marked as "do not merge":
...
https://googleplex-android-review.googlesource.com/#/c/265729/
2013-02-05 10:20:28 +00:00
The Android Automerger
b52061a20d
Merge remote-tracking branch 'origin/jb-mr1-dev-plus-aosp' into default
2013-02-01 14:54:42 -08:00
Adam Hampson
b66dce0798
am ea90567b: Add tinyxml to the pdk
...
# Via Adam Hampson
* commit 'ea90567bd43d267b07708a2a8ac6ceecbe85bb81':
Add tinyxml to the pdk
2013-02-01 13:35:50 -08:00
Adam Hampson
5a2dc4d11a
am 4a58cc0f: Add libusb_aah and libyuv to the pdk
...
# Via Baligh Uddin
* commit '4a58cc0f9daf4420d2d6b38a0b3a2e06ed26020d':
Add libusb_aah and libyuv to the pdk
2013-02-01 13:35:50 -08:00
Baligh Uddin
2cf4511418
am 01549c95: Merge remote-tracking branch \'origin/jb-mr1-aah-dev\' into jb-mr1-aah-dev
...
# By Chad Jones (32) and others
# Via Android Git Automerger (124) and others
* commit '01549c955a6622433a1b88115f7f5184d945e879': (50 commits)
Add libusb_aah and libyuv to the pdk
Add tools group for prebuilts/tools
Add vendor/unbundled_google/packages/NfcProgrammer
Add frameworks/opt/net/voip
Add external/{mockito,objenesis}
Add platform/external/nist-pkits
Add pdk group to external/libgsm
Add platform/tools/vendor/google
Add tools group on fat32lib
Add tools/vendor/jetbrains
Restore fat32lib in all clients
Replace external/fat32lib with tools/external/fat32lib
Add prebuilts/devtools, tools/adt/eclipse, tools/emulator
Add projects for flo and deb
add vendor/google_devices/lepew
Add tools/adt/idea, tools/base, tools/idea
Remove unordered version of eigen
Adding platform/prebuilts/gcc/darwin-x86/host/headers to the manifest
Remove duplicate eigen
Add p/v/u/packages/LatinIMEDictionaryPack
...
2013-02-01 13:35:50 -08:00
Jean-Baptiste Queru
785694b788
am e63f4bf4: Add libusb_aah
...
# Via Jean-Baptiste Queru
* commit 'e63f4bf4f3197107fa24e2eb4373c6e3c388b932':
Add libusb_aah
2013-02-01 13:22:03 -08:00
Adam Hampson
ea90567bd4
Add tinyxml to the pdk
...
Also move libyuv from its own group to the pdk group
Change-Id: I5d9cdee01302084941a22082830d9328333b487c
Signed-off-by: Adam Hampson <ahampson@google.com >
2013-02-01 11:25:03 -08:00
Jean-Baptiste Queru
e63f4bf4f3
Add libusb_aah
...
Change-Id: Ie42e7628055e225440ee7a51996784e6eca7314d
2013-01-31 18:51:29 -08:00
Adam Hampson
4a58cc0f9d
Add libusb_aah and libyuv to the pdk
...
Change-Id: Ibdea2c22e6796ca6dd2753624bc5c287a199d28f
Signed-off-by: Adam Hampson <ahampson@google.com >
2013-01-31 10:43:25 -08:00
Baligh Uddin
01549c955a
Merge remote-tracking branch 'origin/jb-mr1-aah-dev' into jb-mr1-aah-dev
2013-01-31 10:41:58 -08:00
Adam Hampson
7e8f564255
Add libusb_aah and libyuv to the pdk
...
Change-Id: Ibdea2c22e6796ca6dd2753624bc5c287a199d28f
Signed-off-by: Adam Hampson <ahampson@google.com >
2013-01-30 13:02:06 -08:00
Justin Koh
f493275b39
am 9494e69e: am 33743ef8: Merge "Revert "Updated Google Photos to point to bryce build."" into jb-mr1-aah-dev
...
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit '9494e69ed09433fcc6d0dc97f1fc88ba674ec2be':
Revert "Updated Google Photos to point to bryce build."
2013-01-29 17:09:07 -08:00
Justin Koh
9494e69ed0
am 33743ef8: Merge "Revert "Updated Google Photos to point to bryce build."" into jb-mr1-aah-dev
...
# Via Android (Google) Code Review
* commit '33743ef815e7dc5f5fede8a494b5ef33b6edb1c0':
Revert "Updated Google Photos to point to bryce build."
2013-01-29 17:01:03 -08:00
Justin Koh
33743ef815
Merge "Revert "Updated Google Photos to point to bryce build."" into jb-mr1-aah-dev
2013-01-30 00:23:26 +00:00
Justin Koh
d07c0a29f5
Revert "Updated Google Photos to point to bryce build."
...
This reverts commit 75ce4ab450
2013-01-30 00:22:53 +00:00
Justin Koh
993d4df581
am d18575c9: am 16eb2cbf: Merge "Updated Google Photos to point to bryce build." into jb-mr1-aah-dev
...
# Via Android (Google) Code Review (1) and others
* commit 'd18575c9fa987e3572e152540ef13c7625a27856':
Updated Google Photos to point to bryce build.
2013-01-29 14:01:04 -08:00
Justin Koh
d18575c9fa
am 16eb2cbf: Merge "Updated Google Photos to point to bryce build." into jb-mr1-aah-dev
...
# Via Android (Google) Code Review (1) and Justin Koh (1)
* commit '16eb2cbff1165cabad9011679993c1c72604e4d7':
Updated Google Photos to point to bryce build.
2013-01-29 13:59:13 -08:00
Justin Koh
16eb2cbff1
Merge "Updated Google Photos to point to bryce build." into jb-mr1-aah-dev
2013-01-29 21:56:29 +00:00
Jean-Baptiste Queru
f1c5574bc0
am 551fb71c: am 635fb400: am 89e52721: Add tools group on prebuilts/tools
...
# Via Android Git Automerger (2) and Jean-Baptiste Queru (1)
* commit '551fb71c3568533e2306c5c4b758bc575e51041a':
Add tools group on prebuilts/tools
2013-01-29 13:52:04 -08:00
Jean-Baptiste Queru
551fb71c35
am 635fb400: am 89e52721: Add tools group on prebuilts/tools
...
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit '635fb400f20f74d160d7396531926134a77e165d':
Add tools group on prebuilts/tools
2013-01-29 13:49:54 -08:00
Jean-Baptiste Queru
635fb400f2
am 89e52721: Add tools group on prebuilts/tools
...
# Via Jean-Baptiste Queru
* commit '89e5272138aacbd512ea12e2d191689197546fb7':
Add tools group on prebuilts/tools
2013-01-29 13:47:13 -08:00
Jean-Baptiste Queru
89e5272138
Add tools group on prebuilts/tools
...
Change-Id: I995f84d15985e8f952122e83cd9b7a41c0cda0a8
2013-01-29 13:11:29 -08:00
The Android Open Source Project
db1a500f3c
Merge from master
2013-01-29 13:09:26 -08:00
The Android Open Source Project
c8a40b6b1c
Add tools groups on prebuilts/tools
...
Change-Id: Iad59091a5cd2f30f326b1b33ff3cd5b5c55ed874
2013-01-29 13:03:46 -08:00
Chad Jones
99230853d7
Merge "Add tools group for prebuilts/tools"
2013-01-29 19:04:24 +00:00
Chad Jones
3275db7d67
Merge "Add vendor/unbundled_google/packages/NfcProgrammer"
2013-01-29 18:42:10 +00:00
Chad Jones
edbf587a46
Add tools group for prebuilts/tools
2013-01-29 10:40:07 -08:00
Chad Jones
b0217b087f
am d43b7700: am ca64f4c3: Add platform/external/libusb_aah
...
# Via Android Git Automerger (1) and Chad Jones (1)
* commit 'd43b77003e0c92f8050556bf9eaa782d2c4892a5':
Add platform/external/libusb_aah
2013-01-28 17:58:00 -08:00
Chad Jones
d43b77003e
am ca64f4c3: Add platform/external/libusb_aah
...
# Via Chad Jones
* commit 'ca64f4c31bee43204623946496eed51a5133bbd5':
Add platform/external/libusb_aah
2013-01-28 17:56:15 -08:00
Chad Jones
ca64f4c31b
Add platform/external/libusb_aah
2013-01-28 16:51:15 -08:00
Chad Jones
71f037e233
Add vendor/unbundled_google/packages/NfcProgrammer
2013-01-28 16:47:07 -08:00
Justin Koh
75ce4ab450
Updated Google Photos to point to bryce build.
...
Change-Id: I37edfa5d58149335edc7cef11aa71a4ee9a7dc4b
2013-01-28 15:33:47 -08:00
Wink Saville
50086ebbac
Merge "Add frameworks/opt/net/voip"
2013-01-28 22:19:29 +00:00
Jean-Baptiste Queru
c037b78bcf
am 904d406e: am c68b4c19: am 8cdd5241: Add mockito and objenesis
...
# Via Android Git Automerger (2) and Jean-Baptiste Queru (1)
* commit '904d406e0520b78f6b869278f725621d9bb5f298':
Add mockito and objenesis
2013-01-28 13:00:23 -08:00
Jean-Baptiste Queru
904d406e05
am c68b4c19: am 8cdd5241: Add mockito and objenesis
...
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit 'c68b4c19c94a25f590e14d43e41c30cc3ac4a3e8':
Add mockito and objenesis
2013-01-28 12:58:06 -08:00
Jean-Baptiste Queru
c68b4c19c9
am 8cdd5241: Add mockito and objenesis
...
# Via Jean-Baptiste Queru
* commit '8cdd5241bd66cc0218cf4b490c40d7aa3e89d7f1':
Add mockito and objenesis
2013-01-28 12:55:24 -08:00
Jean-Baptiste Queru
8cdd5241bd
Add mockito and objenesis
...
Change-Id: If736c0ae891f4ea486f6259c95686b08cd7337cd
2013-01-28 12:35:24 -08:00
Chad Jones
00f0b150bb
Add frameworks/opt/net/voip
2013-01-28 11:23:54 -08:00
The Android Open Source Project
eba1eee60f
Merge from master
...
Change-Id: If2ca4db261e8ebd9bd684f09bdbba3df4ebc05a0
2013-01-28 10:58:10 -08:00
The Android Open Source Project
bc65e60b03
Add mockito and objenesis
...
Change-Id: I194bf501225b5d7ae364ed32529f13b27d16dc41
2013-01-28 10:56:54 -08:00
Chad Jones
4e96d6f29c
Add external/{mockito,objenesis}
2013-01-24 19:43:29 -08:00
Justin Koh
dc55509955
resolved conflicts for merge of 4cf4777f to master
...
Change-Id: I516a7d281343df246b98efef0a5c60065331b486
2013-01-24 11:02:19 -08:00
Justin Koh
4cf4777f46
am ab6f3748: Added GestureService to jb-mr1-aah-dev.
...
# Via Justin Koh
* commit 'ab6f37486956748689a27721faafafe8abdcf68e':
Added GestureService to jb-mr1-aah-dev.
2013-01-24 10:30:37 -08:00
Justin Koh
ab6f374869
Added GestureService to jb-mr1-aah-dev.
...
Change-Id: I069c48f2884754dc5693ef7a5b50b8ad8eafe5f8
2013-01-24 10:26:09 -08:00
Adam Hampson
2ac6f9b025
am 030b1f3e: am 741961af: Make Primesense git visible in Wolfie and Phantasm PDKs
...
# Via Adam Hampson (1) and Android Git Automerger (1)
* commit '030b1f3e50325f75b03f91c52663748ee73d5fbb':
Make Primesense git visible in Wolfie and Phantasm PDKs
2013-01-23 14:59:15 -08:00
Adam Hampson
030b1f3e50
am 741961af: Make Primesense git visible in Wolfie and Phantasm PDKs
...
# Via Adam Hampson
* commit '741961aff365b4e7cb547871e684ba6a3a34d75b':
Make Primesense git visible in Wolfie and Phantasm PDKs
2013-01-23 14:56:30 -08:00
Adam Hampson
741961aff3
Make Primesense git visible in Wolfie and Phantasm PDKs
...
Change-Id: I070fc491aff4dc0c13788db79cce1a1c999dd0c7
Signed-off-by: Adam Hampson <ahampson@google.com >
2013-01-23 11:04:40 -08:00
Chad Jones
24b24156af
am 614e790e: am 1aa8c0ae: Merge "Add vendor/primesense/sauron" into jb-mr1-aah-dev
...
* commit '614e790e03967c0371dfda3f72d20c2915531473':
Add vendor/primesense/sauron
2013-01-17 21:42:45 -08:00
Chad Jones
614e790e03
am 1aa8c0ae: Merge "Add vendor/primesense/sauron" into jb-mr1-aah-dev
...
* commit '1aa8c0ae4fd3a4d0b93b5abdd21a4149c29dfbb6':
Add vendor/primesense/sauron
2013-01-17 21:41:01 -08:00
Chad Jones
1aa8c0ae4f
Merge "Add vendor/primesense/sauron" into jb-mr1-aah-dev
2013-01-18 05:39:00 +00:00
Chad Jones
a57b7fcd70
Add vendor/primesense/sauron
2013-01-17 21:32:01 -08:00
Jean-Baptiste Queru
4c236e034d
am 30c15fbe: am 276b9256: am b023d125: Add nist-pkits
...
* commit '30c15fbe073267f5c9560923f638945378b80226':
Add nist-pkits
2013-01-17 11:34:35 -08:00
Jean-Baptiste Queru
30c15fbe07
am 276b9256: am b023d125: Add nist-pkits
...
* commit '276b925667c19c88ffd882e1d22df6d9665f377c':
Add nist-pkits
2013-01-17 10:02:27 -08:00
Jean-Baptiste Queru
276b925667
am b023d125: Add nist-pkits
...
* commit 'b023d125fc1aeedfbca6e5b51dfd37a02b959b28':
Add nist-pkits
2013-01-17 09:59:39 -08:00
Jean-Baptiste Queru
b023d125fc
Add nist-pkits
...
Change-Id: I0886b4b6a2e373ba2ca123055a7ee8f3307cc003
2013-01-17 09:14:05 -08:00
The Android Open Source Project
df40456650
Merge from master
...
Change-Id: If0f6099470a5098ed32efcfecbedd5cd60523db6
2013-01-17 09:03:31 -08:00
The Android Open Source Project
e046a83bf1
Add nist-pkits
...
Change-Id: I79dc00e0bb278a33f5eb09366d8f245b3e00ff87
2013-01-17 09:02:30 -08:00
Chad Jones
34a72ab309
Add platform/external/nist-pkits
2013-01-16 13:07:32 -08:00
Justin Koh
9674c8de97
am ce46914f: am 99b05210: Pointing jb-mr1-aah-dev Videos at the inception branch.
...
* commit 'ce46914fd7b472df70cfd03197968c9f0faa7011':
Pointing jb-mr1-aah-dev Videos at the inception branch.
2013-01-16 10:36:56 -08:00
Justin Koh
ce46914fd7
am 99b05210: Pointing jb-mr1-aah-dev Videos at the inception branch.
...
* commit '99b052103ae5496c210393e6f333ffe4fe924f43':
Pointing jb-mr1-aah-dev Videos at the inception branch.
2013-01-16 10:35:05 -08:00
Justin Koh
99b052103a
Pointing jb-mr1-aah-dev Videos at the inception branch.
...
Pointing jb-mr1-aah-dev Videos at the inception branch.
Change-Id: I5868ffbc39bd3aa780fdf0aaa65360ae6a90bfcc
2013-01-16 10:13:49 -08:00
Chad Jones
41f4cd6f35
Add pdk group to external/libgsm
2013-01-10 13:36:31 -08:00
Chad Jones
f32b8610ac
Add platform/tools/vendor/google
2013-01-10 11:07:11 -08:00
Jean-Baptiste Queru
1c79f4a021
Merge from jb-mr1-dev-plus-aosp
...
Change-Id: I69fec233d7290711d81f46369734a1a501f844d9
2013-01-08 10:37:08 -08:00
Jean-Baptiste Queru
a1fc799143
am 9ef3700e: am d8c8196a: New location for fat32lib
...
* commit '9ef3700e7b1bf39e60f9206132b325863d3847fc':
New location for fat32lib
2013-01-08 10:07:52 -08:00
Jean-Baptiste Queru
9ef3700e7b
am d8c8196a: New location for fat32lib
...
* commit 'd8c8196a23d6f322bab26d99a0fcba3a00ed3a00':
New location for fat32lib
2013-01-08 10:05:00 -08:00
Jean-Baptiste Queru
d8c8196a23
New location for fat32lib
...
Change-Id: I962f6b92d9251591a75545860bddae6e9f2194bc
2013-01-08 09:46:51 -08:00
The Android Open Source Project
8c9a56d57b
Merge from master
...
Change-Id: I985699416e73ec7bb24b60d46b5c52a06ab385ca
2013-01-08 09:40:30 -08:00
The Android Open Source Project
e4b6c17240
New location for fat32lib
...
Change-Id: I4eed1c39f1af8ac82bb87b4e6885e9f78deb1892
2013-01-08 09:35:40 -08:00
Jean-Baptiste Queru
974b5816e1
Merge "Add tools group on fat32lib"
2013-01-08 08:58:00 -08:00
Jean-Baptiste Queru
420d1c8519
Add tools group on fat32lib
...
Change-Id: I648afc6deea939424097c1061de813fe86f215b6
2013-01-08 08:56:58 -08:00
Chad Jones
59ca4983b9
Add tools/vendor/jetbrains
2013-01-07 16:50:22 -08:00
Jean-Baptiste Queru
6e0d2a9acd
Restore fat32lib in all clients
...
Change-Id: Ia311647548b48e20dcb76a196c0e13441868d5ab
2013-01-07 14:38:51 -08:00
Jean-Baptiste Queru
78e2404a35
Merge "Replace external/fat32lib with tools/external/fat32lib"
2013-01-07 11:12:33 -08:00
Jean-Baptiste Queru
85518217a2
am a3aeb66e: am 6c26274a: am 96534ece: Add prebuilts/devtools
...
* commit 'a3aeb66e87034a82910c888b49ba11fc43268642':
Add prebuilts/devtools
2013-01-04 14:35:53 -08:00
Jean-Baptiste Queru
a3aeb66e87
am 6c26274a: am 96534ece: Add prebuilts/devtools
...
* commit '6c26274a7a5263eccac558f9d76bfd79f27cd33c':
Add prebuilts/devtools
2013-01-04 14:33:31 -08:00
Jean-Baptiste Queru
6c26274a7a
am 96534ece: Add prebuilts/devtools
...
* commit '96534ece7244a263e30cafdec539bcf605022dde':
Add prebuilts/devtools
2013-01-04 14:30:11 -08:00
Jean-Baptiste Queru
96534ece72
Add prebuilts/devtools
...
Change-Id: Ic56361d402fe245bf41f3289a7c64a260352d45a
2013-01-04 14:25:12 -08:00
The Android Open Source Project
207fe05ecb
Merge from master
...
Change-Id: I27f20b0f86cc964b6efe0a99e37798bb53737049
2013-01-04 14:14:46 -08:00
The Android Open Source Project
6747c5e51a
Add prebuilts/devtools
...
Change-Id: Ib5066d884e67a365077872eb7f05eeb011f34709
2013-01-04 14:10:01 -08:00
Chad Jones
971a7d1142
Replace external/fat32lib with tools/external/fat32lib
...
Change-Id: I30109ebc53c2329daa168882189904601fc5745b
2013-01-03 13:52:28 -08:00
Jean-Baptiste Queru
eabd36159a
Merge from jb-mr1-dev-plus-aosp
...
Change-Id: I72702054c0667aa24c5ae039601b79cc0fb588c6
2012-12-27 08:21:28 -08:00
The Android Open Source Project
454627192a
Merge from master
...
Change-Id: Ib0e2fa7922857bd60e51ed7701fe640868ad07e6
2012-12-21 11:18:29 -08:00
The Android Open Source Project
70b1a76994
Modernize the manifest groups
...
Change-Id: Id71b2d93c4f86198386078a7bf13dd9ec49283a8
2012-12-21 11:04:43 -08:00
Jean-Baptiste Queru
39ac78b9d5
am fa4d624b: (-s ours) am 32dbab91: (-s ours) Unify AOSP manifest with GOOG one - do not merge
...
* commit 'fa4d624b033796814b0158ed5ee178ff37eb0eea':
Unify AOSP manifest with GOOG one - do not merge
2012-12-21 10:22:24 -08:00
Jean-Baptiste Queru
fa4d624b03
am 32dbab91: (-s ours) Unify AOSP manifest with GOOG one - do not merge
...
* commit '32dbab91ef719a6c6a5df0fbd66ee19b9bb301dc':
Unify AOSP manifest with GOOG one - do not merge
2012-12-21 10:19:48 -08:00
Jean-Baptiste Queru
32dbab91ef
Unify AOSP manifest with GOOG one - do not merge
...
Change-Id: I006132ffe05ac27c660d8bad3170e2f8358270a9
2012-12-21 10:16:07 -08:00
Jean-Baptiste Queru
6d31afb52f
am 81dec576: resolved conflicts for merge of 9eb567fa to stage-aosp-master
...
* commit '81dec5768bd13e9701524a42af3b95a3dee23712':
Add new devtools projects
2012-12-21 09:24:48 -08:00
Jean-Baptiste Queru
81dec5768b
resolved conflicts for merge of 9eb567fa to stage-aosp-master
...
Change-Id: I050a7641bb8cbdd483bfe35f95ea95484d3b12f4
2012-12-21 09:19:16 -08:00
Jean-Baptiste Queru
9eb567fa50
Add new devtools projects
...
Change-Id: Id28352ec724e9720059369d8669e5a086db11da8
2012-12-21 08:43:20 -08:00
Chad Jones
0091276ed3
Add prebuilts/devtools, tools/adt/eclipse, tools/emulator
...
Change-Id: I4fd096da25beb6a67c34e1aec7a6f2871242a665
2012-12-20 15:04:47 -08:00
Chad Jones
5a3f77563f
Merge "Add projects for flo and deb"
2012-12-20 13:52:01 -08:00
Chad Jones
426949f912
Add projects for flo and deb
...
Bug: 7895757
Change-Id: I182008c9a89080fb8c1e064fc30d8b45bb8723e6
2012-12-20 13:50:57 -08:00
Jean-Baptiste Queru
ed36cd0a61
am dcbdb358: (-s ours) am f3939dca: (-s ours) Reconcile GOOG and AOSP groups - do not merge
...
* commit 'dcbdb358dfb861d44479ca1a71a38bb9d6caf656':
Reconcile GOOG and AOSP groups - do not merge
2012-12-20 13:49:40 -08:00
Jean-Baptiste Queru
dcbdb358df
am f3939dca: (-s ours) Reconcile GOOG and AOSP groups - do not merge
...
* commit 'f3939dca0daf383199b680997c11add24743fccb':
Reconcile GOOG and AOSP groups - do not merge
2012-12-20 13:47:15 -08:00
Jean-Baptiste Queru
f3939dca0d
Reconcile GOOG and AOSP groups - do not merge
...
Change-Id: I5e6aca8015c27b4517acae226e91d4bc29059a0a
2012-12-20 12:50:33 -08:00
Jean-Baptiste Queru
6e4d9cce61
resolved conflicts for merge of cc0a6076 to master
...
Change-Id: I6fdd1098762dae20a74684fb18aa2b638a7ab733
2012-12-20 12:26:26 -08:00
Jean-Baptiste Queru
cc0a6076b9
Merge "Add AOSP groups in GOOG manifest" into jb-mr1-dev-plus-aosp
2012-12-20 12:14:42 -08:00
Chad Jones
3d672c9cf6
am dda10bd9: am 50de5e4c: am 68247b28: am 5d0d61bf: Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
...
* commit 'dda10bd9535985066026b0156ee0498268ede122':
Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
2012-12-20 11:51:28 -08:00
Chad Jones
dda10bd953
am 50de5e4c: am 68247b28: am 5d0d61bf: Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
...
* commit '50de5e4c3dadafbdc92b0de71e2c8b43fcc69b62':
Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
2012-12-20 11:36:26 -08:00
Chad Jones
50de5e4c3d
am 68247b28: am 5d0d61bf: Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
...
* commit '68247b2855e863e174d47ec2977a175ee32ebcf4':
Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
2012-12-20 11:34:44 -08:00
Chad Jones
68247b2855
am 5d0d61bf: Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
...
* commit '5d0d61bfd5c40ee02d08330a4410de8bbb80bebb':
Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
2012-12-20 11:32:51 -08:00
Jean-Baptiste Queru
7b437fd37b
Merge ce5e20ca
...
Change-Id: Ic0930528daf4089368a4b6f4cc3524e2c51eba10
2012-12-20 11:29:20 -08:00
Jean-Baptiste Queru
dbd9db106c
Add AOSP groups in GOOG manifest
...
Change-Id: I2cda392c93f6779fdebabc4ba0b8f9074136a55c
2012-12-20 11:23:33 -08:00
Jean-Baptiste Queru
ce5e20ca9c
Add missing spaces, for consistency
...
Change-Id: I75ce7c14768d2e7825b78d7cf086b77129991171
2012-12-20 11:23:33 -08:00
Chad Jones
915d13d3f2
am 21861e2e: am 39f6d8ba: Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
...
* commit '21861e2ece0970a23655dbdca0c535ccaf262583':
Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
2012-12-20 11:21:16 -08:00
Chad Jones
21861e2ece
am 39f6d8ba: Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
...
* commit '39f6d8ba786178b9ff013853c294bbad214fa2de':
Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
2012-12-20 11:19:12 -08:00
Chad Jones
39f6d8ba78
Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
2012-12-20 11:15:57 -08:00
Chad Jones
5d0d61bfd5
Removing vendor/dolby/ds1 from all manifests per marcone and daveburke
2012-12-20 11:14:44 -08:00
Chad Jones
7cf45712f9
am 6745e033: am 611bf1d8: Change group on hardware/ti/omap4-aah
...
* commit '6745e033a0fbb36d9f8e3358eefdf9a526f7f9d9':
Change group on hardware/ti/omap4-aah
2012-12-20 11:03:33 -08:00
Chad Jones
6745e033a0
am 611bf1d8: Change group on hardware/ti/omap4-aah
...
* commit '611bf1d8ea91cf3dc4cf70cb771d1b49171efb20':
Change group on hardware/ti/omap4-aah
2012-12-20 11:01:43 -08:00
The Android Open Source Project
b05bfe82d0
Add new devtools projects
...
Change-Id: Id28352ec724e9720059369d8669e5a086db11da8
2012-12-20 11:01:39 -08:00
Chad Jones
611bf1d8ea
Change group on hardware/ti/omap4-aah
2012-12-20 10:54:29 -08:00
Ed Heyl
71ab72acf7
add vendor/google_devices/lepew
2012-12-19 12:20:39 -08:00
Justin Mattson
bfd1abfb40
am 90db4b81: am f8b00f5e: Point jb-mr1-dev-aah to froyo-ub-music-gorillaz for Music2\'s package
...
* commit '90db4b810c1acf14726d762c2d934b82b1ab998b':
Point jb-mr1-dev-aah to froyo-ub-music-gorillaz for Music2's package
2012-12-18 23:11:32 -08:00
Justin Mattson
90db4b810c
am f8b00f5e: Point jb-mr1-dev-aah to froyo-ub-music-gorillaz for Music2\'s package
...
* commit 'f8b00f5ee5d27a6f3f6a54a30f1d9aca984cabdd':
Point jb-mr1-dev-aah to froyo-ub-music-gorillaz for Music2's package
2012-12-18 23:09:15 -08:00
Jean-Baptiste Queru
c133d24b0b
am 1a76b872: Merge from stage-aosp-master
...
* commit '1a76b8726967c69b1ed8a102c44d2b18e6e7a6cf':
Re-sync from AOSP
2012-12-18 15:52:38 -08:00
Tim Kilbourn
cf95ddd9dd
am 0675ca27: am 73ae0f1e: Use frameworks/volley in jb-mr1-aah-dev.
...
* commit '0675ca272cce60685556243b1efe43e43d2a486d':
Use frameworks/volley in jb-mr1-aah-dev.
2012-12-18 15:52:34 -08:00
Jean-Baptiste Queru
1a76b87269
Merge from stage-aosp-master
...
Change-Id: If40208e7666a79687eefccc83e58eac0be0f2d5e
2012-12-18 15:10:50 -08:00
Justin Mattson
f8b00f5ee5
Point jb-mr1-dev-aah to froyo-ub-music-gorillaz for Music2's package
...
There are currently playback issues using the default Music2, which
I believe is from the Heart branch. Switching to gorillaz until
issues with Heart can be resolved or we can move to INXS.
2012-12-18 14:08:45 -08:00
Tim Kilbourn
0675ca272c
am 73ae0f1e: Use frameworks/volley in jb-mr1-aah-dev.
...
* commit '73ae0f1ea83e6d094ba5529a15363cfcd5c4fa0d':
Use frameworks/volley in jb-mr1-aah-dev.
2012-12-18 13:12:00 -08:00
Tim Kilbourn
73ae0f1ea8
Use frameworks/volley in jb-mr1-aah-dev.
2012-12-18 12:30:21 -08:00
Jean-Baptiste Queru
d9e3bafdb0
am bca783d1: Re-sync from AOSP
...
* commit 'bca783d17c47f329e2a52b3ba0737c89d0316673':
Re-sync from AOSP
2012-12-18 11:26:23 -08:00
Jean-Baptiste Queru
bca783d17c
Re-sync from AOSP
...
Change-Id: Iacbe3aaa2af27d645487013400cfae6c78f74129
2012-12-18 11:24:39 -08:00
Jean-Baptiste Queru
2b1df51ab2
Merge 83922d6f
...
Change-Id: If971308f34fcc89e9b29aff8a13c4f1a4650323c
2012-12-15 15:02:24 -08:00
Jean-Baptiste Queru
83922d6fc0
Merge 4edaf138
...
Change-Id: I5ddbb15c9c43062391cac0cf3865b21c91be314a
2012-12-15 14:55:21 -08:00
Yuan Yuan
8a998594a1
am 396dfba2: am 252e5f96: Add voice package into aah branch.
...
* commit '396dfba2504960dcacbfb970c598ae05e106d2e8':
Add voice package into aah branch.
2012-12-14 16:48:41 -08:00
The Android Open Source Project
4edaf138cf
am c1612e44: Add new devtools projects
...
* commit 'c1612e4437ab8b268ec1454bd25e1018458d0e3c':
Add new devtools projects
2012-12-14 15:23:26 -08:00
Yuan Yuan
396dfba250
am 252e5f96: Add voice package into aah branch.
...
* commit '252e5f96e1c7bf1f00c740bcdf3a1f7234413b97':
Add voice package into aah branch.
2012-12-14 13:08:05 -08:00
The Android Open Source Project
c1612e4437
Add new devtools projects
...
Change-Id: I8fb9b4c6f42de745d3c132d4a8b21f684e480539
2012-12-14 11:33:02 -08:00
The Android Open Source Project
ded671af82
Merge from master
...
Change-Id: I6345a9ea12d631334ae797bfd137552984f965c4
2012-12-14 11:29:50 -08:00
The Android Open Source Project
b1bab4dc66
Add new devtools projects
...
Change-Id: I8fb9b4c6f42de745d3c132d4a8b21f684e480539
2012-12-14 11:13:57 -08:00
Jean-Baptiste Queru
a972c64719
am 165823df: (-s ours) am 00d97500: (-s ours) Merge "Remove qcom projects from mirror - do not merge" into stage-aosp-master
...
* commit '165823df4ca6e2a99086e0917e3868813a551ecb':
Remove qcom projects from mirror - do not merge
2012-12-12 11:11:09 -08:00
Jean-Baptiste Queru
f8f2115af8
am 58654ffe: (-s ours) am 12581000: (-s ours) am ecdf22d9: (-s ours) Merge "Remove qcom projects from mirror - do not merge" into mirror-aosp-master
...
* commit '58654ffe83e3b5243b03ea7b19bc48882269fd79':
Remove qcom projects from mirror - do not merge
2012-12-12 11:11:07 -08:00
Jean-Baptiste Queru
932447c5aa
am a108391e: (-s ours) Merge 39f74f4e
...
* commit 'a108391e976a649ca7a7f01b07c119c5a4ca8d1c':
Add tools/base
2012-12-12 11:11:06 -08:00
Jean-Baptiste Queru
165823df4c
am 00d97500: (-s ours) Merge "Remove qcom projects from mirror - do not merge" into stage-aosp-master
...
* commit '00d975009accac641d0dceef0e1200ec42c0c864':
Remove qcom projects from mirror - do not merge
2012-12-12 11:06:32 -08:00
Jean-Baptiste Queru
58654ffe83
am 12581000: (-s ours) am ecdf22d9: (-s ours) Merge "Remove qcom projects from mirror - do not merge" into mirror-aosp-master
...
* commit '12581000979206281ba13345544d926aea8e2c59':
Remove qcom projects from mirror - do not merge
2012-12-12 11:06:30 -08:00
Jean-Baptiste Queru
a108391e97
Merge 39f74f4e
...
Change-Id: I2f1bbdc5bd533095edbe81e9d2de6062d6457937
2012-12-12 11:01:08 -08:00
Jean-Baptiste Queru
00d975009a
Merge "Remove qcom projects from mirror - do not merge" into stage-aosp-master
2012-12-12 10:57:28 -08:00
Jean-Baptiste Queru
1258100097
am ecdf22d9: (-s ours) Merge "Remove qcom projects from mirror - do not merge" into mirror-aosp-master
...
* commit 'ecdf22d96ab65c801fdc447eebe53c21f5683b3c':
Remove qcom projects from mirror - do not merge
2012-12-12 10:57:11 -08:00
Jean-Baptiste Queru
2768210138
Remove qcom projects from mirror - do not merge
...
Change-Id: Id102d99d58ea33b610016e459444df7d8dbacdb9
2012-12-12 10:56:59 -08:00
Jean-Baptiste Queru
ecdf22d96a
Merge "Remove qcom projects from mirror - do not merge" into mirror-aosp-master
2012-12-12 10:55:17 -08:00
Jean-Baptiste Queru
e616ee3093
Remove qcom projects from mirror - do not merge
...
Change-Id: Id102d99d58ea33b610016e459444df7d8dbacdb9
2012-12-12 10:51:00 -08:00
The Android Open Source Project
39f74f4ec3
am d940a6ec: Add tools/base
...
* commit 'd940a6ec0bc8aa71871f58c6e783e660fce0ac2c':
Add tools/base
2012-12-12 10:27:05 -08:00
The Android Open Source Project
d940a6ec0b
Add tools/base
...
make tools/ notdefault
Change-Id: I2d1801db2b811186ee8cefdfdde6a53274be342c
2012-12-12 09:52:02 -08:00
The Android Open Source Project
a1123ee554
Tune tools groups
...
Change-Id: Id4501e7ca4f4852a6a07f035393bab5034bcc7e9
2012-12-12 09:50:37 -08:00
The Android Open Source Project
cdd2f55717
Merge from master
...
Change-Id: I56afc6c9637ed88b1d35b50e94ad16e4a571b7de
2012-12-12 09:07:57 -08:00
The Android Open Source Project
596d9d9960
Add tools/base
...
make tools/ notdefault
Change-Id: I2d1801db2b811186ee8cefdfdde6a53274be342c
2012-12-12 08:39:37 -08:00
Chad Jones
ec30b096d2
Add tools/adt/idea, tools/base, tools/idea
2012-12-10 15:43:49 -08:00
Yuan Yuan
252e5f96e1
Add voice package into aah branch.
2012-12-07 11:24:57 -08:00
Chad Jones
3548cc8991
am 143a1e31: am b3e4a0e1: Drop wolfie and phantasm labels from vendor/google_devices projects.
...
* commit '143a1e31a9479f0183d995999ecdf80fc6873378':
Drop wolfie and phantasm labels from vendor/google_devices projects.
2012-12-06 23:22:55 -08:00
Justin Ho
8f37add355
am fdb0b0a9: am 9fd8e1b9: am dcf267b0: Add vendor/unbundled_google/packages/PrebuiltGmsCore Bug: 7631982
...
* commit 'fdb0b0a92818d13076ba7b89c40cbc51cd92f0c1':
Add vendor/unbundled_google/packages/PrebuiltGmsCore Bug: 7631982
2012-12-06 23:22:53 -08:00
Chad Jones
143a1e31a9
am b3e4a0e1: Drop wolfie and phantasm labels from vendor/google_devices projects.
...
* commit 'b3e4a0e130a8df182721c1fcc4b576ec60e0de39':
Drop wolfie and phantasm labels from vendor/google_devices projects.
2012-12-06 19:00:43 -08:00
Justin Ho
fdb0b0a928
am 9fd8e1b9: am dcf267b0: Add vendor/unbundled_google/packages/PrebuiltGmsCore Bug: 7631982
...
* commit '9fd8e1b91fb6f231b4d9f3bd0aac0dce1a5f3888':
Add vendor/unbundled_google/packages/PrebuiltGmsCore Bug: 7631982
2012-12-06 18:58:35 -08:00
Chad Jones
b3e4a0e130
Drop wolfie and phantasm labels from vendor/google_devices projects.
...
Bug: 7688666
Change-Id: I257b6c258074d690fe8f1b733dce86a5e8adae0e
2012-12-06 15:05:45 -08:00
Jean-Baptiste Queru
d5dcf57542
am 546005e0: resolved conflicts for merge of d76f09fa to jb-mr1-dev-plus-aosp
...
* commit '546005e0a053e13863a1afc653c134054e77013d':
Add darwin host headers
2012-12-06 11:00:02 -08:00
Jean-Baptiste Queru
546005e0a0
resolved conflicts for merge of d76f09fa to jb-mr1-dev-plus-aosp
...
Change-Id: I678c1e687f400b2906451c08875ce476a576feb8
2012-12-06 10:57:31 -08:00
Jean-Baptiste Queru
d76f09facc
am 8a1c5946: Add darwin host headers
...
* commit '8a1c5946219ec7a46851326f47e0652af2cedb82':
Add darwin host headers
2012-12-05 13:50:33 -08:00
Jean-Baptiste Queru
8a1c594621
Add darwin host headers
...
Change-Id: I8d689fdfa8718adee8baad5871f753819b0171ba
2012-12-05 13:48:37 -08:00
The Android Open Source Project
c75a48da0f
Merge from master
...
Change-Id: I2d7a11eee4a41d12a4927640840c5c45e5421988
2012-12-05 13:46:36 -08:00
The Android Open Source Project
50138b5a7f
Add darwin host headers
...
Change-Id: Ibe1504f23208ca8522b13b9df11b6c0803859e1b
2012-12-05 13:45:28 -08:00
Jean-Baptiste Queru
92deca7922
am 02227aa7: Remove unordered version of eigen
...
* commit '02227aa79ea6e5d278c665c775f190a91e81dae1':
Remove unordered version of eigen
2012-12-05 13:26:05 -08:00
Jean-Baptiste Queru
b067586c74
Remove unordered version of eigen
...
Change-Id: I2b65b69ee7259974fe812e6d8b644538ee42d77f
2012-12-05 13:25:00 -08:00
Jean-Baptiste Queru
02227aa79e
Remove unordered version of eigen
...
Change-Id: I2b65b69ee7259974fe812e6d8b644538ee42d77f
2012-12-05 13:23:01 -08:00
Jean-Baptiste Queru
2e952157b6
am 19871155: am 7135f6cd: am be330019: Add eigen
...
* commit '19871155cd56282b1d3373b68f02e98aa5bbf344':
Add eigen
2012-12-05 13:00:47 -08:00
Justin Ho
9fd8e1b91f
am dcf267b0: Add vendor/unbundled_google/packages/PrebuiltGmsCore Bug: 7631982
...
* commit 'dcf267b09f058e575fd51e397df2f3eb02aa52f7':
Add vendor/unbundled_google/packages/PrebuiltGmsCore Bug: 7631982
2012-12-05 12:38:24 -08:00
Justin Ho
dcf267b09f
Add vendor/unbundled_google/packages/PrebuiltGmsCore
...
Bug: 7631982
2012-12-05 11:32:53 -08:00
Jean-Baptiste Queru
19871155cd
am 7135f6cd: am be330019: Add eigen
...
* commit '7135f6cd6437cb1231e0aad72019c21c5fba411e':
Add eigen
2012-12-05 09:52:11 -08:00
Jean-Baptiste Queru
7135f6cd64
am be330019: Add eigen
...
* commit 'be330019069792790966668405d8f158f0ef52f2':
Add eigen
2012-12-05 09:50:22 -08:00
The Android Open Source Project
64d49f0ab5
Merge from master
...
Change-Id: I002801f6c16424a08d3fd27bc5018397da51311e
2012-12-05 09:49:04 -08:00
Jean-Baptiste Queru
be33001906
Add eigen
...
Change-Id: Ide524042283d35d95e41372e961211b8392fdab1
2012-12-05 09:47:16 -08:00
The Android Open Source Project
0cc40d32e5
Add eigen
...
Change-Id: Id586d1cc51100d526bcf06235282804b59ea1d5a
2012-12-05 09:39:15 -08:00
Baligh Uddin
df2003172a
Adding platform/prebuilts/gcc/darwin-x86/host/headers to the manifest
2012-12-04 13:32:06 -08:00
Jean-Baptiste Queru
21bedee6ea
Remove duplicate eigen
...
Change-Id: I5d5cad6d55ab96fc35fcba8239b13eb19abe974f
2012-12-04 13:24:55 -08:00
Ed Heyl
5a5e51a535
am e52d0e80: am b21788ae: am 4a8637d3: added external/eigen
...
* commit 'e52d0e80f1da2bf33f8fd1adea0243202f861cbe':
added external/eigen
2012-12-04 12:09:45 -08:00
Ed Heyl
e52d0e80f1
am b21788ae: am 4a8637d3: added external/eigen
...
* commit 'b21788aed6a1d17e4171d86e5e46c7f06570dac5':
added external/eigen
2012-12-04 12:07:22 -08:00
Ed Heyl
b21788aed6
am 4a8637d3: added external/eigen
...
* commit '4a8637d30763a66b2e0cebaa61aac6df6d83b464':
added external/eigen
2012-12-04 12:05:31 -08:00
Ed Heyl
4a8637d307
added external/eigen
2012-12-04 11:25:33 -08:00
Chad Jones
acd56b5b31
am ec4f9cd9: am 04b90d4d: Add repo groups for hardware/marvell/{bt,wlan}
...
* commit 'ec4f9cd9edcbb9c2f15b2906478da62a94e0bf2e':
Add repo groups for hardware/marvell/{bt,wlan}
2012-11-30 14:24:41 -08:00
Chad Jones
ec4f9cd9ed
am 04b90d4d: Add repo groups for hardware/marvell/{bt,wlan}
...
* commit '04b90d4da4e958e086818054df7c1a374b0b167e':
Add repo groups for hardware/marvell/{bt,wlan}
2012-11-30 14:22:38 -08:00
Chad Jones
04b90d4da4
Add repo groups for hardware/marvell/{bt,wlan}
2012-11-30 13:50:36 -08:00
Chad Jones
99c31039e9
Add p/v/u/packages/LatinIMEDictionaryPack
2012-11-30 11:06:45 -08:00
Adam Hampson
4e13f0179c
am b298619e: am f52289f1: Create a wolfie group for PDK support
...
* commit 'b298619e5994a04088653dba46908426b7d829b6':
Create a wolfie group for PDK support
2012-11-30 10:41:53 -08:00
Adam Hampson
b298619e59
am f52289f1: Create a wolfie group for PDK support
...
* commit 'f52289f1d5d372f65a46d778ba7a3abf8b9420b5':
Create a wolfie group for PDK support
2012-11-30 10:38:51 -08:00
Adam Hampson
f52289f1d5
Create a wolfie group for PDK support
...
Change-Id: Ic58c8551924f0b784acc2264df26ba3fee18e0f9
Signed-off-by: Adam Hampson <ahampson@google.com >
2012-11-29 11:03:20 -08:00
Keun young Park
0662408f73
am 4efd06c1: am 89f66699: am 5a195c5a: remove unnecessary dummy versions
...
* commit '4efd06c18a22e9c56cb2408c9cf53b77130bd1cb':
remove unnecessary dummy versions
2012-11-28 10:36:56 -08:00
Ed Heyl
9f4b242de2
am f1a9924a: am eb6daf0d: Merge commit \'1429ba06\' into jb-mr1-aah-dev
...
* commit 'f1a9924a62015c6a9a4212a1be2a6d9e37e2d533':
jb-mr1.1-dev
2012-11-28 10:34:28 -08:00
Keun young Park
4efd06c18a
am 89f66699: am 5a195c5a: remove unnecessary dummy versions
...
* commit '89f66699e9657c3db69c16587290caaf89606133':
remove unnecessary dummy versions
2012-11-28 10:34:11 -08:00
Ed Heyl
f1a9924a62
am eb6daf0d: Merge commit \'1429ba06\' into jb-mr1-aah-dev
...
* commit 'eb6daf0d9a4ac5c63aa6589bc8eb088d42205e73':
jb-mr1.1-dev
2012-11-28 10:32:46 -08:00
Keun young Park
89f66699e9
am 5a195c5a: remove unnecessary dummy versions
...
* commit '5a195c5a87499c2959047937cd296a2da6de28bf':
remove unnecessary dummy versions
2012-11-28 10:31:19 -08:00
Ed Heyl
eb6daf0d9a
Merge commit '1429ba06' into jb-mr1-aah-dev
2012-11-28 10:30:00 -08:00
Keun young Park
5a195c5a87
remove unnecessary dummy versions
...
- dummy versions only used for PDK, and there is no need to keep them
as there is no more PDK release in MR1.1
2012-11-27 11:01:46 -08:00
Chad Jones
1d3a3f9567
am 033d8d34: am 32242f1e: Set groups on hardware/ti/omap4-aah for phantasm PDK
...
* commit '033d8d343fb0ed4ed7ce4bc3c7ccf0bf901e3351':
Set groups on hardware/ti/omap4-aah for phantasm PDK
2012-11-20 14:53:32 -08:00
Chad Jones
033d8d343f
am 32242f1e: Set groups on hardware/ti/omap4-aah for phantasm PDK
...
* commit '32242f1ee7e3735ccd887cdbd9da611183fe54e5':
Set groups on hardware/ti/omap4-aah for phantasm PDK
2012-11-20 14:51:18 -08:00
Chad Jones
32242f1ee7
Set groups on hardware/ti/omap4-aah for phantasm PDK
2012-11-20 14:48:56 -08:00
Jean-Baptiste Queru
70e7bd3773
am 2552b7e1: am bc72d534: (-s ours) am b8f04092: Update mirror manifest to match current AOSP
...
* commit '2552b7e12e6859738b558698a216f3394703699a':
Update mirror manifest to match current AOSP
2012-11-16 10:43:04 -08:00
Jean-Baptiste Queru
943ce5dccf
am 5e894dd7: am cc16d2b9: am 17e7f2e1: Update mirror manifest for 4.2
...
* commit '5e894dd7800186c26867867bf38a7ee9a380046e':
Update mirror manifest for 4.2
2012-11-16 10:43:02 -08:00
Chad Jones
1ac4131ee0
resolved conflicts for merge of 6581f77e to master
2012-11-16 10:40:22 -08:00
Jean-Baptiste Queru
2552b7e12e
am bc72d534: (-s ours) am b8f04092: Update mirror manifest to match current AOSP
...
* commit 'bc72d53430469ddadfb6a86cc8746ba8adb7d942':
Update mirror manifest to match current AOSP
2012-11-15 17:17:49 -08:00
Jean-Baptiste Queru
5e894dd780
am cc16d2b9: am 17e7f2e1: Update mirror manifest for 4.2
...
* commit 'cc16d2b9b97e3db4b9bf9234383b603a27527947':
Update mirror manifest for 4.2
2012-11-15 17:12:17 -08:00
Jean-Baptiste Queru
bc72d53430
am b8f04092: Update mirror manifest to match current AOSP
...
* commit 'b8f040926472fe6512659a83a05f7f1a515b78d4':
Update mirror manifest to match current AOSP
2012-11-15 17:08:53 -08:00
Jean-Baptiste Queru
cc16d2b9b9
am 17e7f2e1: Update mirror manifest for 4.2
...
* commit '17e7f2e115b8232afa6bc3339df7229e60a3818b':
Update mirror manifest for 4.2
2012-11-15 17:08:52 -08:00
Jean-Baptiste Queru
b8f0409264
Update mirror manifest to match current AOSP
...
Change-Id: Ib65ce6f48654faae9b5b240910e63d3588936d9c
2012-11-15 17:05:32 -08:00
The Android Open Source Project
aefb1473b1
Extra projects to match release branch
...
Change-Id: I93cecbdc9f1701afbb9d9af9e7e997df10207bf1
2012-11-15 16:57:26 -08:00
The Android Open Source Project
e54ff56da1
Extra projects to match release branch
...
Change-Id: I6572461c3215a6ce1ad6c4c9de5f0a39265da94b
2012-11-15 16:54:06 -08:00
Chad Jones
6581f77e0e
am 165f97ee: Add hardware/marvell/{bt,wlan}
...
* commit '165f97ee505a61fee2bddc878fa81b4022df29ff':
Add hardware/marvell/{bt,wlan}
2012-11-15 14:28:44 -08:00
Chad Jones
165f97ee50
Add hardware/marvell/{bt,wlan}
2012-11-15 10:33:34 -08:00
Torne (Richard Coles)
f0d4141d0a
Revert "Add external/chromium_org to master."
...
This reverts commit 1a0de9e80d
2012-11-15 11:57:20 +00:00
Torne (Richard Coles)
1a0de9e80d
Add external/chromium_org to master.
...
Add the chromium_org projects to the master branch. This change on its
own does not cause them to be built, as currently in the master branch
no other project depends on them. They can be built manually (and are in
a working state).
Change-Id: I602937c49a8b8655a5ce8511082d6b7ec2825ea0
2012-11-14 18:12:05 +00:00
The Android Open Source Project
43545df929
Merge from master
...
Change-Id: I913f2fb5c4974685f2ebf34d3aa5afb9d8f82980
2012-11-13 12:46:48 -08:00
Jean-Baptiste Queru
b1a3780877
am 32f3a325: am 01a64831: (-s ours) Update stage-aosp-master to match AOSP
...
* commit '32f3a32519598bb6a721e7bce8e8eb5eb3d1facd':
Update stage-aosp-master to match AOSP
2012-11-13 11:58:37 -08:00
Jean-Baptiste Queru
32f3a32519
am 01a64831: (-s ours) Update stage-aosp-master to match AOSP
...
* commit '01a64831969e1c8956c118662e07aa911626dcba':
Update stage-aosp-master to match AOSP
2012-11-13 11:56:41 -08:00
Jean-Baptiste Queru
01a6483196
Update stage-aosp-master to match AOSP
...
Change-Id: I7e67b9166b9e325afd7050f4fdb1d288470763cc
2012-11-13 11:51:55 -08:00
Jean-Baptiste Queru
17e7f2e115
Update mirror manifest for 4.2
...
Change-Id: I8a2081f6b3774cf5a50499bed075cc71f4a966d4
2012-11-13 11:23:10 -08:00
The Android Open Source Project
e138a0d7fb
Manifest for jb-mr1-dev
...
Change-Id: I90c596116c5ae781d21d0d45b4245c50df8f055a
2012-11-13 09:41:44 -08:00
The Android Open Source Project
cb5004d370
Manifest for master, updated for 4.2
...
Change-Id: I7bef8262cd30755c7dab1d8b66d256a4a5cf4770
2012-11-13 09:37:49 -08:00
mindyp
25dc0bee68
Remove Gmail code from master; replaced by Gmail2
2012-11-12 10:47:38 -08:00
Justin Koh
d16d57e07f
am d9c72b64: am 20b6a280: Add vendor/google_athome to the manifest.
...
* commit 'd9c72b642b9b510023d17738d595fa2a5a499bec':
Add vendor/google_athome to the manifest.
2012-11-08 15:58:59 -08:00
Justin Koh
d9c72b642b
am 20b6a280: Add vendor/google_athome to the manifest.
...
* commit '20b6a2807f0c4122f0a69b974859c9edb22b7de1':
Add vendor/google_athome to the manifest.
2012-11-08 15:43:08 -08:00
Jean-Baptiste Queru
4c083aecb7
am f4690c76: am 436b4a2b: (-s ours) am 1fec71d4: Add MacOS host toolchain
...
* commit 'f4690c7629a1e759b27c1799afa945497e5dc1fa':
Add MacOS host toolchain
2012-11-08 12:59:57 -08:00
Jean-Baptiste Queru
f4690c7629
am 436b4a2b: (-s ours) am 1fec71d4: Add MacOS host toolchain
...
* commit '436b4a2b84ae913902bd3c256eb57b2971fd41e8':
Add MacOS host toolchain
2012-11-08 12:58:15 -08:00
Jean-Baptiste Queru
436b4a2b84
am 1fec71d4: Add MacOS host toolchain
...
* commit '1fec71d4fb5d806c196d6ee3f28ce63f027f8a0f':
Add MacOS host toolchain
2012-11-08 12:52:39 -08:00
Jean-Baptiste Queru
09925bfeaf
Merge "Replace hw/bcom/nfc with vendor/ equivalent"
2012-11-08 12:50:31 -08:00
Jean-Baptiste Queru
1fec71d4fb
Add MacOS host toolchain
...
Change-Id: Ib65b434ae0f9a0fa2e5266f8e22f72ed78d8e461
2012-11-08 11:34:02 -08:00
The Android Open Source Project
00ee1ab4c9
Merge from master
...
Change-Id: I01b9db3643d3eca22f1c7bd6ef35422ad9872273
2012-11-08 11:31:42 -08:00
The Android Open Source Project
fe20f3cb92
Add MacOS host toolchain
...
Change-Id: I7e75692ef4f850c37cde85f9c8acc911e838321d
2012-11-08 11:30:30 -08:00
Chad Jones
f02fec5f03
am 2c0b94bb: Add prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
...
* commit '2c0b94bbf2ef4f216ae6259b9dd760d7f0e9daa1':
Add prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
2012-11-08 11:10:24 -08:00
Jean-Baptiste Queru
5972255937
Replace hw/bcom/nfc with vendor/ equivalent
...
Change-Id: Ia00756b1b50721777bfcadd45a536d8ac47f8f79
2012-11-08 11:06:49 -08:00
Chad Jones
2c0b94bbf2
Add prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
2012-11-08 11:01:27 -08:00
Chad Jones
ce0beab9fd
Drop unused external/wpa_supplicant_6
...
Bug: 7262855
2012-11-07 12:57:33 -08:00
Jean-Baptiste Queru
f5bc87090d
Merge from jb-mr1-dev-plus-aosp
...
Change-Id: I1101f715fa04d810af2462a31199f5a1bc55283f
2012-11-07 12:49:01 -08:00
Justin Koh
20b6a2807f
Add vendor/google_athome to the manifest.
...
Change-Id: I6a44594dbd3e3f4a82b357fcf98a71955755b7f0
2012-11-07 10:57:37 -08:00
Jean-Baptiste Queru
aed4a02efe
am 46f68e5a: am 66c5fe32: Add platform/volley
...
* commit '46f68e5a07313bc585f049f516279740fd177463':
Add platform/volley
2012-11-07 10:51:47 -08:00
Jean-Baptiste Queru
46f68e5a07
am 66c5fe32: Add platform/volley
...
* commit '66c5fe32bc29fd8110bfc3881ab677d78c71a961':
Add platform/volley
2012-11-07 10:48:22 -08:00
Jean-Baptiste Queru
66c5fe32bc
Add platform/volley
...
Change-Id: I469b16c6a4d93c8964a939db2cc0fe1c0ef5f7bc
2012-11-07 09:00:44 -08:00
The Android Open Source Project
dfefa4af0d
Add frameworks/volley
...
Change-Id: I4b2d34181abbf82ad6280b30113030d1895eb25b
2012-11-07 08:39:39 -08:00
Jean-Baptiste Queru
d0e3084e21
am 7a27bab1: resolved conflicts for merge of 6f237840 to jb-mr1-dev-plus-aosp
...
* commit '7a27bab1576416b33317dc8c2fdb4a150cf23c30':
Add prebuilts for gcc 4.7
2012-11-05 14:16:25 -08:00
Jean-Baptiste Queru
7a27bab157
resolved conflicts for merge of 6f237840 to jb-mr1-dev-plus-aosp
...
Change-Id: I98bd2e0e753ba1b4479324039c03eb251e01af39
2012-11-05 14:13:26 -08:00
Jean-Baptiste Queru
13704157fc
am e3cc51b9: Ignore 4872e7ca from stage-aosp-master
...
* commit 'e3cc51b9171d49c6071e70c9d8874c2860bfc89f':
Use Android 4.2 projects
2012-11-05 14:11:46 -08:00
Jean-Baptiste Queru
e3cc51b917
Ignore 4872e7ca from stage-aosp-master
...
Change-Id: I357246f8f1d179f63553cf8687576d74e9419c13
2012-11-05 14:05:16 -08:00
Jean-Baptiste Queru
6f237840e6
am 4ed7e6ed: Add prebuilts for gcc 4.7
...
* commit '4ed7e6edb692a7df6ccd64f766d61767190211cd':
Add prebuilts for gcc 4.7
2012-11-05 14:00:01 -08:00
Jean-Baptiste Queru
4ed7e6edb6
Add prebuilts for gcc 4.7
...
Change-Id: I668d35bbc86acc459d9db2fb74f2ab1f22ce3591
2012-11-05 13:40:51 -08:00
The Android Open Source Project
f1b2e439a4
Add projects for gcc 4.7 prebuilts
...
Change-Id: Ifc13580c73b635fc3d40be4a261247562e0649f2
2012-11-05 13:33:39 -08:00
Chad Jones
54259ec224
Add gcc 4.7 prebuilts for mips and x86
2012-11-05 11:45:24 -08:00
Conley Owens
4872e7ca27
Use Android 4.2 projects
...
Change-Id: I846e0cf5f51794daa816d81c1af8828647c45eeb
2012-11-05 10:54:49 -08:00
Chad Jones
cd2ed4106c
Add initial gcc prebuilts projects for 4.7
2012-11-05 10:45:58 -08:00
Ed Heyl
1429ba0617
jb-mr1.1-dev
2012-11-05 09:07:22 -08:00
Jean-Baptiste Queru
3b78c61f04
am 9fa2b425: am 8e11527c: am fc09c208: Add harfbuzz_ng
...
* commit '9fa2b4254d22b9ebdd492bc99c75d0bae19b602a':
Add harfbuzz_ng
2012-11-01 11:45:35 -07:00
Jean-Baptiste Queru
9fa2b4254d
am 8e11527c: am fc09c208: Add harfbuzz_ng
...
* commit '8e11527cb54043ba595e228b1c22203b5598b245':
Add harfbuzz_ng
2012-11-01 11:22:25 -07:00
Jean-Baptiste Queru
8e11527cb5
am fc09c208: Add harfbuzz_ng
...
* commit 'fc09c2086679c92b2b7247afbd97a59263cd6fe2':
Add harfbuzz_ng
2012-11-01 11:20:53 -07:00
Jean-Baptiste Queru
fc09c20866
Add harfbuzz_ng
...
Change-Id: I5869594179aa01ffa47d2bfae5966bcdc147736f
2012-11-01 11:07:54 -07:00
The Android Open Source Project
ab295d3c95
Merge from master
...
Change-Id: I0cecc81f9b34cb6d965d2a8528ced3f45d931436
2012-11-01 11:06:19 -07:00
The Android Open Source Project
d1848babe1
Add harfbuzz_ng
...
Change-Id: I435faa2ceabe363f9cd3394d631a0d37c1f9bfb1
2012-11-01 11:05:00 -07:00
The Android Open Source Project
db11c6ad8f
Base manifest for 4.2 GPL components
...
Change-Id: I7aea272a85e6114a5e9b9b69ee1cfb4e2194dd56
2012-10-31 15:40:55 -07:00
Conley Owens
b4c9c2dff7
Merge from master
...
Change-Id: I4bf730aa31e8695ba381c306641d4f98f7506581
2012-10-26 10:02:22 -07:00
Chad Jones
960f2f41a2
am 2e64b938: am 6b8f0b86: am b6e62e25: Add hardware/qcom/power
...
* commit '2e64b938a98394cfa4064a2a29d2fc2f720b447d':
Add hardware/qcom/power
2012-10-17 14:50:32 -07:00
Chad Jones
2e64b938a9
am 6b8f0b86: am b6e62e25: Add hardware/qcom/power
...
* commit '6b8f0b869eb409368e209aaf7851e5f65ee74953':
Add hardware/qcom/power
2012-10-17 14:47:37 -07:00
Chad Jones
6b8f0b869e
am b6e62e25: Add hardware/qcom/power
...
* commit 'b6e62e2563254fd09e32a38f4f7145087a3fb8be':
Add hardware/qcom/power
2012-10-17 14:44:58 -07:00
Chad Jones
b6e62e2563
Add hardware/qcom/power
...
Bug: 7365809
Change-Id: Id93fd0085c6cb5f4b948632d3f8f5c09709229ab
2012-10-17 11:26:16 -07:00
Kenny Root
dbed838f8c
Add SELinux projects to PDK
...
Change-Id: Id5aa38892d68a87dc81a76e63d0f6a27595b3f31
2012-10-16 18:43:33 -07:00
Chad Jones
03765d0a5a
resolved conflicts for merge of 0c596963 to master
...
Change-Id: Ie3a86b495c8364570aed456e39a5c0e4551a3428
2012-10-16 15:26:04 -07:00
Chad Jones
0c596963a3
am 919fdc5b: Move wolfie projects info alphabetical order
...
* commit '919fdc5b6c6265c58b7eb00123be5c80a3e225a0':
Move wolfie projects info alphabetical order
2012-10-16 15:10:48 -07:00
Chad Jones
919fdc5b6c
Move wolfie projects info alphabetical order
2012-10-16 14:57:04 -07:00
Baligh Uddin
e906319945
resolved conflicts for merge of e128c7b2 to master
...
Change-Id: I033af0de84a44e13a1d3e3a968045d5a0cbe4c12
2012-10-16 14:43:52 -07:00
Baligh Uddin
e128c7b246
am 0fc41832: Add new projects to jb-mr1-aah-dev (wolfie)
...
* commit '0fc4183251800efa5d9b7ef93557b034b69132f7':
Add new projects to jb-mr1-aah-dev (wolfie)
2012-10-16 13:57:39 -07:00
Baligh Uddin
0fc4183251
Add new projects to jb-mr1-aah-dev (wolfie)
...
Change-Id: Ic8af6372f8ba881c2ea75fbeb1159db0672c898d
2012-10-16 11:51:55 -07:00
Mike Chen
60ce7aef0f
am 115b4f3c: am 0abc4de9: Merge "Add hardware/ti/omap4-aah" into jb-mr1-aah-dev
...
* commit '115b4f3c3cec77a1dfb137821ffcd75304da25e0':
Add hardware/ti/omap4-aah
2012-10-15 20:25:12 -07:00
Mike Chen
115b4f3c3c
am 0abc4de9: Merge "Add hardware/ti/omap4-aah" into jb-mr1-aah-dev
...
* commit '0abc4de95601d09975eb8d466535193af9272fa1':
Add hardware/ti/omap4-aah
2012-10-15 20:18:06 -07:00
Mike Chen
0abc4de956
Merge "Add hardware/ti/omap4-aah" into jb-mr1-aah-dev
2012-10-15 16:38:23 -07:00
Chad Jones
c07566c679
am 5a09b206: am 4aba0457: am 3427c328: Remove unused vendor/fraunhofer/virtualizer
...
* commit '5a09b206afd1a957c1491c78f96654cbfe0ed66f':
Remove unused vendor/fraunhofer/virtualizer
2012-10-15 16:00:11 -07:00
Chad Jones
5a09b206af
am 4aba0457: am 3427c328: Remove unused vendor/fraunhofer/virtualizer
...
* commit '4aba0457e95fe6b67c2edd7e20019b6b3fa57b92':
Remove unused vendor/fraunhofer/virtualizer
2012-10-15 15:57:35 -07:00
Chad Jones
4aba0457e9
am 3427c328: Remove unused vendor/fraunhofer/virtualizer
...
* commit '3427c328b8b697e46d11a304c1b18793cdacb32d':
Remove unused vendor/fraunhofer/virtualizer
2012-10-15 15:54:53 -07:00
Chad Jones
3427c328b8
Remove unused vendor/fraunhofer/virtualizer
2012-10-15 15:29:33 -07:00
Chad Jones
9341a59190
Add hardware/ti/omap4-aah
2012-10-11 17:58:31 -07:00
Jean-Baptiste Queru
28a9fe284f
am 7bbe9c50: am c1753c33: am aad2bb6b: am 5bbe18ef: am 8866e5c7: am c22f5c96: (-s ours) Update mirror-aosp-jb-dev
...
* commit '7bbe9c50354b13f885263ff1e62c6ffa71a9c933':
Update mirror-aosp-jb-dev
Update mirror-aosp-jb-dev manifest
Manifest for mirror-aosp-jb-dev
Remove repo groups to better match future AOSP manifest
Remove external/aac from factoryrom staging branch
Staging manifest for AOSP nakasi-factoryrom-release
Branch jb-dev-without-vendor
2012-10-10 09:33:17 -07:00
Jean-Baptiste Queru
7bbe9c5035
am c1753c33: am aad2bb6b: am 5bbe18ef: am 8866e5c7: am c22f5c96: (-s ours) Update mirror-aosp-jb-dev
...
* commit 'c1753c3396ca47d9d4ba9c7e9ee1a4ce00892305':
Update mirror-aosp-jb-dev
Update mirror-aosp-jb-dev manifest
Manifest for mirror-aosp-jb-dev
Remove repo groups to better match future AOSP manifest
Remove external/aac from factoryrom staging branch
Staging manifest for AOSP nakasi-factoryrom-release
Branch jb-dev-without-vendor
2012-10-10 09:31:36 -07:00
Jean-Baptiste Queru
c1753c3396
am aad2bb6b: am 5bbe18ef: am 8866e5c7: am c22f5c96: (-s ours) Update mirror-aosp-jb-dev
...
* commit 'aad2bb6b23234f325741e1f701fea9cceefee1d6':
Update mirror-aosp-jb-dev
Update mirror-aosp-jb-dev manifest
Manifest for mirror-aosp-jb-dev
Remove repo groups to better match future AOSP manifest
Remove external/aac from factoryrom staging branch
Staging manifest for AOSP nakasi-factoryrom-release
Branch jb-dev-without-vendor
2012-10-10 09:29:11 -07:00
Jean-Baptiste Queru
aad2bb6b23
am 5bbe18ef: am 8866e5c7: am c22f5c96: (-s ours) Update mirror-aosp-jb-dev
...
* commit '5bbe18efe639eaf964b42579dde25f299234f072':
Update mirror-aosp-jb-dev
Update mirror-aosp-jb-dev manifest
Manifest for mirror-aosp-jb-dev
Remove repo groups to better match future AOSP manifest
Remove external/aac from factoryrom staging branch
Staging manifest for AOSP nakasi-factoryrom-release
Branch jb-dev-without-vendor
2012-10-10 09:28:13 -07:00
Jean-Baptiste Queru
5bbe18efe6
am 8866e5c7: am c22f5c96: (-s ours) Update mirror-aosp-jb-dev
...
* commit '8866e5c7af3b74e0e4cafbf778fc325592e4c28c':
Update mirror-aosp-jb-dev
Update mirror-aosp-jb-dev manifest
Manifest for mirror-aosp-jb-dev
Remove repo groups to better match future AOSP manifest
Remove external/aac from factoryrom staging branch
Staging manifest for AOSP nakasi-factoryrom-release
Branch jb-dev-without-vendor
2012-10-10 09:26:33 -07:00
Jean-Baptiste Queru
8866e5c7af
am c22f5c96: (-s ours) Update mirror-aosp-jb-dev
...
* commit 'c22f5c96331e11398533cc5720182faf80aae4b7':
Update mirror-aosp-jb-dev
Update mirror-aosp-jb-dev manifest
Manifest for mirror-aosp-jb-dev
Remove repo groups to better match future AOSP manifest
Remove external/aac from factoryrom staging branch
Staging manifest for AOSP nakasi-factoryrom-release
Branch jb-dev-without-vendor
2012-10-10 09:23:35 -07:00
Chad Jones
25e7dc4cdc
am 9aacd6d3: am 3116d1c1: am 0b8b2154: Drop vendor/unbundled_google/packages/GoogleConnectionManager Add vendor/unbundled_google/packages/GoogleProvisioningService
...
* commit '9aacd6d3b7a7159e7ad8506041778947055a9afc':
Drop vendor/unbundled_google/packages/GoogleConnectionManager Add vendor/unbundled_google/packages/GoogleProvisioningService
2012-10-09 15:30:43 -07:00
Chad Jones
9aacd6d3b7
am 3116d1c1: am 0b8b2154: Drop vendor/unbundled_google/packages/GoogleConnectionManager Add vendor/unbundled_google/packages/GoogleProvisioningService
...
* commit '3116d1c11aa2f03f57a023767a858980f0c1a5eb':
Drop vendor/unbundled_google/packages/GoogleConnectionManager Add vendor/unbundled_google/packages/GoogleProvisioningService
2012-10-09 15:27:59 -07:00
Chad Jones
3116d1c11a
am 0b8b2154: Drop vendor/unbundled_google/packages/GoogleConnectionManager Add vendor/unbundled_google/packages/GoogleProvisioningService
...
* commit '0b8b2154c8412f6b2df9e39cc5ef18e54136cf47':
Drop vendor/unbundled_google/packages/GoogleConnectionManager Add vendor/unbundled_google/packages/GoogleProvisioningService
2012-10-09 15:25:44 -07:00
Chad Jones
0b8b2154c8
Drop vendor/unbundled_google/packages/GoogleConnectionManager
...
Add vendor/unbundled_google/packages/GoogleProvisioningService
2012-10-09 14:58:46 -07:00
Ed Heyl
f2b323d548
am f59b532d: am 58c5d518: am a9b52324: added GoogleConnectionManager
...
* commit 'f59b532d6695e680cd1b0ac8a0e7cd6b2ea6bc6c':
added GoogleConnectionManager
2012-10-09 10:33:09 -07:00
Ed Heyl
f59b532d66
am 58c5d518: am a9b52324: added GoogleConnectionManager
...
* commit '58c5d5185a9c4a0b123746ccb580d76a42d1bb81':
added GoogleConnectionManager
2012-10-09 10:30:46 -07:00
Ed Heyl
58c5d5185a
am a9b52324: added GoogleConnectionManager
...
* commit 'a9b52324ba6ed8ca0f2919d5a25269e839cbfcc7':
added GoogleConnectionManager
2012-10-09 10:29:20 -07:00
Jean-Baptiste Queru
c22f5c9633
Update mirror-aosp-jb-dev
...
Change-Id: I57b35bd4e9a13a0ac982dc782d6504ef59a7916d
2012-10-09 10:08:00 -07:00
Jean-Baptiste Queru
52fefab920
am 2ab582f6: am bf69f809: am fffc969d: Update mirror-aosp-master manifest
...
* commit '2ab582f619ed4acd76959d50051360de536c30a8':
Update mirror-aosp-master manifest
2012-10-09 09:58:19 -07:00
Jean-Baptiste Queru
2ab582f619
am bf69f809: am fffc969d: Update mirror-aosp-master manifest
...
* commit 'bf69f809f1f7a5a50fe8aaa90a6f7ee34493d79c':
Update mirror-aosp-master manifest
2012-10-09 09:55:57 -07:00
Jean-Baptiste Queru
bf69f809f1
am fffc969d: Update mirror-aosp-master manifest
...
* commit 'fffc969d926ec8a05736d5448e63dc24a7a7c705':
Update mirror-aosp-master manifest
2012-10-09 09:53:40 -07:00
Jean-Baptiste Queru
fffc969d92
Update mirror-aosp-master manifest
...
Change-Id: I2d673180b091f7d4392ce4684a2d7a4f31194b33
2012-10-09 09:49:01 -07:00
Ed Heyl
a9b52324ba
added GoogleConnectionManager
2012-10-09 09:21:27 -07:00
The Android Open Source Project
f46b8df32e
Replace torospr with toroplus
...
Change-Id: I38ed1ef16ffd31ee9027af2598e2a894a001bda4
2012-10-09 09:05:40 -07:00
Jean-Baptiste Queru
dfea8a2079
am 1b4ac499: am d31cea59: (-s ours) Make optional eclipse prebuilts notdefault
...
* commit '1b4ac499931e01bbd0418716f0cf7a1aef9f0753':
Make optional eclipse prebuilts notdefault
2012-10-09 06:22:13 -07:00
Jean-Baptiste Queru
1b4ac49993
am d31cea59: (-s ours) Make optional eclipse prebuilts notdefault
...
* commit 'd31cea599aa69e2a05509a255eb41703f7dc3cac':
Make optional eclipse prebuilts notdefault
2012-10-09 06:20:36 -07:00
Jean-Baptiste Queru
d31cea599a
Make optional eclipse prebuilts notdefault
...
Change-Id: I37a59f2806433381de3d0bbf92bf2669030dd3df
2012-10-09 06:17:15 -07:00
Chad Jones
b2e2160c6c
am 4f660a36: am 62881384: am 27d29593: Add platform/frameworks/opt/photoviewer
...
* commit '4f660a3688461c0d08d29ff7c771ffbe20636ac4':
Add platform/frameworks/opt/photoviewer
2012-10-07 23:25:52 -07:00
Chad Jones
4f660a3688
am 62881384: am 27d29593: Add platform/frameworks/opt/photoviewer
...
* commit '62881384855f6f28283d0bd0bf8099693a7c683a':
Add platform/frameworks/opt/photoviewer
2012-10-07 23:22:57 -07:00
Chad Jones
6288138485
am 27d29593: Add platform/frameworks/opt/photoviewer
...
* commit '27d29593ebf64c6a912ebc4c50e45dd14edbfbef':
Add platform/frameworks/opt/photoviewer
2012-10-07 23:20:24 -07:00
Chad Jones
27d29593eb
Add platform/frameworks/opt/photoviewer
2012-10-07 15:34:07 -07:00
Jeff Hamilton
b18c92b4c2
am 6a8f48a3: am 144e4f63: am 484849c0: Merge "Add external/xmp_toolkit" into jb-mr1-dev
...
* commit '6a8f48a3335fea4e56de149fdd70041b0b8aaa15':
Add external/xmp_toolkit
2012-10-04 15:05:25 -07:00
Jeff Hamilton
6a8f48a333
am 144e4f63: am 484849c0: Merge "Add external/xmp_toolkit" into jb-mr1-dev
...
* commit '144e4f638499e45a4ca7b974b85d01e128e67e91':
Add external/xmp_toolkit
2012-10-04 15:03:17 -07:00
Jeff Hamilton
144e4f6384
am 484849c0: Merge "Add external/xmp_toolkit" into jb-mr1-dev
...
* commit '484849c02d130f83105de429a720a9d72f8def3f':
Add external/xmp_toolkit
2012-10-04 15:01:45 -07:00
Jeff Hamilton
484849c02d
Merge "Add external/xmp_toolkit" into jb-mr1-dev
2012-10-04 14:59:09 -07:00
Chad Jones
6c749a10bb
am 4544e491: am c2e43342: Add device/google/cujo
...
* commit '4544e49191ffafa14102fe84b9764f9ac1dc1270':
Add device/google/cujo
2012-10-04 14:25:32 -07:00
Chad Jones
f7411b7db8
am a68395f6: Add device/samsung_slsi/arndale and vendor/samsung_slsi/arndale
...
* commit 'a68395f6d65f01e6d00bbcef9078b6e2bab480fa':
Add device/samsung_slsi/arndale and vendor/samsung_slsi/arndale
2012-10-04 14:24:03 -07:00
Chad Jones
4544e49191
am c2e43342: Add device/google/cujo
...
* commit 'c2e43342590da06b4744fa7d6bd3acf3594dd491':
Add device/google/cujo
2012-10-04 14:23:27 -07:00
Chad Jones
a68395f6d6
Add device/samsung_slsi/arndale and vendor/samsung_slsi/arndale
2012-10-04 11:52:02 -07:00
Chad Jones
c2e4334259
Add device/google/cujo
2012-10-04 11:49:30 -07:00
Chad Jones
708f03dc36
am 6bb3f9e5: am 1fd140af: am 49d923f5: Add vendor/dolby/ds1
...
* commit '6bb3f9e5d128a0de3b724fc39a2c70412439dcbe':
Add vendor/dolby/ds1
2012-10-02 16:57:19 -07:00
Chad Jones
6bb3f9e5d1
am 1fd140af: am 49d923f5: Add vendor/dolby/ds1
...
* commit '1fd140af4eaa051f349b5741e4c5e64911c41ddc':
Add vendor/dolby/ds1
2012-10-02 16:56:28 -07:00
Chad Jones
1fd140af4e
am 49d923f5: Add vendor/dolby/ds1
...
* commit '49d923f574c90f710c978bda84593c1d417722ba':
Add vendor/dolby/ds1
2012-10-02 16:55:01 -07:00
Chad Jones
49d923f574
Add vendor/dolby/ds1
...
Bug: 7273439
2012-10-02 16:28:06 -07:00
Torne (Richard Coles)
dca98f88a9
Remove external/chromium_org.
...
The chromium_org repository needs to be deleted and recreated with
entirely new contents; remove it from the manifest so it won't be
fetched in the meantime.
Change-Id: Ie47d69e1d179fb94d7034b841995717bd58c4ec8
2012-10-02 13:44:53 +01:00
Jean-Baptiste Queru
d0a788a424
am 9fc2b979: am 116b1ad1: Re-sync with jb-mr1-dev
...
* commit '9fc2b979423408c92aaa4027c0164b112d69f4b1':
Re-sync with jb-mr1-dev
2012-10-01 18:25:05 -07:00
Jean-Baptiste Queru
9fc2b97942
am 116b1ad1: Re-sync with jb-mr1-dev
...
* commit '116b1ad19fa331a930bec4a0ffc57e22f1609433':
Re-sync with jb-mr1-dev
2012-10-01 18:23:43 -07:00
Jean-Baptiste Queru
333e640332
am ccd2d3c0: Reconcile manifests across jb-mr1-aah-dev
...
* commit 'ccd2d3c0b8b5d3024c590dd68d8e9921f0d7dc17':
Add hardware/qcom/keymaster for Mako
jb-mr1-aah-dev
2012-10-01 17:51:28 -07:00
Jean-Baptiste Queru
116b1ad19f
Re-sync with jb-mr1-dev
...
Change-Id: I856fdf6402489df8cf823dba992b68c2d0890638
2012-10-01 17:50:30 -07:00
Jean-Baptiste Queru
ccd2d3c0b8
Reconcile manifests across jb-mr1-aah-dev
...
Change-Id: If701a25f31d9839fdccbb4792113e79dda4eef31
2012-10-01 17:47:11 -07:00
Chad Jones
9e529da098
am b621a29d: Add hardware/qcom/keymaster for Mako
...
* commit 'b621a29d9bae25c3bbaa561c0b9ec4d2df2fa6f3':
Add hardware/qcom/keymaster for Mako
2012-10-01 07:39:36 -07:00
Chad Jones
9343399607
Add external/xmp_toolkit
2012-10-01 00:11:44 -07:00
Chad Jones
b621a29d9b
Add hardware/qcom/keymaster for Mako
2012-09-30 23:51:26 -07:00
Chad Jones
edede07373
Add external/robolectric
2012-09-30 23:18:42 -07:00
Jean-Baptiste Queru
3e56060217
am 2b76b3cb: resolved conflicts for merge of da7717e2 to jb-mr1-dev-plus-aosp
...
* commit '2b76b3cb76dd0e933c7dcb13f0a0ca9c4b3907b2':
Add hardware/akm
2012-09-26 14:09:01 -07:00
Jean-Baptiste Queru
2b76b3cb76
resolved conflicts for merge of da7717e2 to jb-mr1-dev-plus-aosp
...
Change-Id: Ib8b188523764fdc1f260b5ee678318472d76658c
2012-09-26 14:05:17 -07:00
Jean-Baptiste Queru
da7717e2d6
am f0ba70df: Add hardware/akm
...
* commit 'f0ba70df055736cd2e1b18efed182d602de7a7e5':
Add hardware/akm
2012-09-26 14:01:19 -07:00
Jean-Baptiste Queru
f0ba70df05
Add hardware/akm
...
Change-Id: Ib9e150f2562ba77e06b4ad62e5dc419b6a6b9876
2012-09-26 13:49:33 -07:00
The Android Open Source Project
a89ea088f4
Add hardware/akm
...
Change-Id: I73fb0e585fb953920c64a4805f9a33db42766f3a
2012-09-26 13:43:55 -07:00
Wink Saville
b29e050c54
am 98ff0616: am d90b3ba6: Merge "Move libbt-vendor from vendor/broadcom/libbt-vendor" into jb-mr1-dev
...
* commit '98ff0616f37fbade3cabdeada9bbfa110d9bf13b':
Move libbt-vendor from vendor/broadcom/libbt-vendor
2012-09-25 15:33:43 -07:00
Wink Saville
6bb073ae21
am d90b3ba6: Merge "Move libbt-vendor from vendor/broadcom/libbt-vendor" into jb-mr1-dev
...
* commit 'd90b3ba659a72cae9573104aec4e4c97b3c1cdbe':
Move libbt-vendor from vendor/broadcom/libbt-vendor
2012-09-25 13:29:57 -07:00
Wink Saville
98ff0616f3
am d90b3ba6: Merge "Move libbt-vendor from vendor/broadcom/libbt-vendor" into jb-mr1-dev
...
* commit 'd90b3ba659a72cae9573104aec4e4c97b3c1cdbe':
Move libbt-vendor from vendor/broadcom/libbt-vendor
2012-09-25 13:29:37 -07:00
Wink Saville
d90b3ba659
Merge "Move libbt-vendor from vendor/broadcom/libbt-vendor" into jb-mr1-dev
2012-09-25 13:28:11 -07:00
Chad Jones
0a8f5c56f3
am 44303832: Merge "Drop unused vendor/unbundled_google/packages/VoiceSearch" into jb-mr1-dev
...
* commit '443038323d9dea8c2a1477abfc9c9dd7afd0c6fb':
Drop unused vendor/unbundled_google/packages/VoiceSearch
2012-09-25 12:49:12 -07:00
Chad Jones
06bc7d9c6f
am f51543be: am 44303832: Merge "Drop unused vendor/unbundled_google/packages/VoiceSearch" into jb-mr1-dev
...
* commit 'f51543bef8e76f99c630c79e8cbde1f40375f8e1':
Drop unused vendor/unbundled_google/packages/VoiceSearch
2012-09-25 12:35:16 -07:00
Chad Jones
f51543bef8
am 44303832: Merge "Drop unused vendor/unbundled_google/packages/VoiceSearch" into jb-mr1-dev
...
* commit '443038323d9dea8c2a1477abfc9c9dd7afd0c6fb':
Drop unused vendor/unbundled_google/packages/VoiceSearch
2012-09-25 12:31:04 -07:00
Chad Jones
443038323d
Merge "Drop unused vendor/unbundled_google/packages/VoiceSearch" into jb-mr1-dev
2012-09-25 10:38:58 -07:00
Wink Saville
846f432bd8
Move libbt-vendor from vendor/broadcom/libbt-vendor
...
Removes vendor/broadcom/libbt-vendor from the manifest.
Bug: 6837125
Change-Id: Id250271061e94156dc503da82908174952bbf728
2012-09-24 15:24:56 -07:00
Chad Jones
da3ec49c2f
am 592a54b4: Revert "Drop platform/system/bluetooth"
...
* commit '592a54b43c80e4b223f71b7f8ee8be46aa6e4017':
Revert "Drop platform/system/bluetooth"
2012-09-24 14:00:03 -07:00
Chad Jones
574e34b3a1
am d7a98f1e: am 592a54b4: Revert "Drop platform/system/bluetooth"
...
* commit 'd7a98f1e600a6503422a89c08710295a86452110':
Revert "Drop platform/system/bluetooth"
2012-09-24 13:19:23 -07:00
Chad Jones
d7a98f1e60
am 592a54b4: Revert "Drop platform/system/bluetooth"
...
* commit '592a54b43c80e4b223f71b7f8ee8be46aa6e4017':
Revert "Drop platform/system/bluetooth"
2012-09-24 13:17:57 -07:00
Chad Jones
592a54b43c
Revert "Drop platform/system/bluetooth"
...
This reverts commit 318f179422
2012-09-24 13:07:40 -07:00
Chad Jones
055f569741
am 373216a6: am 318f1794: Drop platform/system/bluetooth
...
* commit '373216a656a934af4e9820dc3ec9e892e5855b57':
Drop platform/system/bluetooth
2012-09-24 12:56:56 -07:00
Chad Jones
373216a656
am 318f1794: Drop platform/system/bluetooth
...
* commit '318f179422b1cbf728e0fc492d58ffa4d71b7d30':
Drop platform/system/bluetooth
2012-09-24 12:54:35 -07:00
Chad Jones
f1c30d3996
am 318f1794: Drop platform/system/bluetooth
...
* commit '318f179422b1cbf728e0fc492d58ffa4d71b7d30':
Drop platform/system/bluetooth
2012-09-24 12:53:42 -07:00
Chad Jones
de5648a2fd
Drop unused vendor/unbundled_google/packages/VoiceSearch
2012-09-24 11:49:22 -07:00
Chad Jones
318f179422
Drop platform/system/bluetooth
...
Bug: 6849488
2012-09-24 11:16:00 -07:00
Keun young Park
030246001a
am d1bba8b2: am e05c2512: add nci_nfc and bluedroid to pdk
...
* commit 'd1bba8b2f07be0bf4d8067a3940c54578c76b4d7':
add nci_nfc and bluedroid to pdk
2012-09-24 00:49:23 -07:00
Keun young Park
27ecb13a99
am e05c2512: add nci_nfc and bluedroid to pdk
...
* commit 'e05c25125df5ce5e46c82b2172320349a7eef216':
add nci_nfc and bluedroid to pdk
2012-09-21 17:48:06 -07:00
Keun young Park
d1bba8b2f0
am e05c2512: add nci_nfc and bluedroid to pdk
...
* commit 'e05c25125df5ce5e46c82b2172320349a7eef216':
add nci_nfc and bluedroid to pdk
2012-09-21 14:54:05 -07:00
Keun young Park
e05c25125d
add nci_nfc and bluedroid to pdk
...
Change-Id: I553f49a75041a33fd9cf56468ed4a61992e349ae
2012-09-21 13:36:44 -07:00
Ed Heyl
b33c0bd38a
am 2ab9c1d8: remove gb-ub-photos-arches revisions
...
* commit '2ab9c1d8638a7f6e662892c32c3989a5a9b3d655':
remove gb-ub-photos-arches revisions
2012-09-21 13:35:53 -07:00
Chad Jones
711ac83999
am d4cd93cc: Add external/mp4parser
...
* commit 'd4cd93cc73dd91c387844fe2f883d6e9825b3a6c':
Add external/mp4parser
2012-09-21 13:32:53 -07:00
Ed Heyl
ae25167719
am c1ef37af: am 2ab9c1d8: remove gb-ub-photos-arches revisions
...
* commit 'c1ef37af10a614dd8bfc15c005dc4303bc23d58f':
remove gb-ub-photos-arches revisions
2012-09-20 21:48:14 -07:00
Ed Heyl
c1ef37af10
am 2ab9c1d8: remove gb-ub-photos-arches revisions
...
* commit '2ab9c1d8638a7f6e662892c32c3989a5a9b3d655':
remove gb-ub-photos-arches revisions
2012-09-20 21:45:51 -07:00
Ed Heyl
2ab9c1d863
remove gb-ub-photos-arches revisions
2012-09-20 21:36:01 -07:00
Chad Jones
5b02e79c49
am 1958d822: am d4cd93cc: Add external/mp4parser
...
* commit '1958d82258c267d6fa95e0180a92282af71ca39c':
Add external/mp4parser
2012-09-20 15:46:24 -07:00
Chad Jones
1958d82258
am d4cd93cc: Add external/mp4parser
...
* commit 'd4cd93cc73dd91c387844fe2f883d6e9825b3a6c':
Add external/mp4parser
2012-09-20 14:46:40 -07:00
Chad Jones
d4cd93cc73
Add external/mp4parser
2012-09-20 14:39:41 -07:00
Chad Jones
9169703cb0
Add docs/accessories.android.com
2012-09-20 10:30:48 -07:00
Baligh Uddin
1a9780f0cd
am c0a707a1: Merge "Add lib/gcm to jb-mr1-dev manifest" into jb-mr1-dev
...
* commit 'c0a707a13e4feaf9577b08247bd8ce92ed9a2dce':
Add lib/gcm to jb-mr1-dev manifest
2012-09-20 06:21:39 -07:00
Chad Jones
6fc8dc3f25
am 9d3bddf9: Add hardware/qcom/msm8960
...
* commit '9d3bddf99fe5a7fff31cc494082233db1a80ab1c':
Add hardware/qcom/msm8960
2012-09-20 06:20:40 -07:00
Baligh Uddin
18ee9513ec
am 79a45466: am c0a707a1: Merge "Add lib/gcm to jb-mr1-dev manifest" into jb-mr1-dev
...
* commit '79a454667869a56e0edd1433e5acc93b692a90d7':
Add lib/gcm to jb-mr1-dev manifest
2012-09-20 06:18:23 -07:00
Baligh Uddin
79a4546678
am c0a707a1: Merge "Add lib/gcm to jb-mr1-dev manifest" into jb-mr1-dev
...
* commit 'c0a707a13e4feaf9577b08247bd8ce92ed9a2dce':
Add lib/gcm to jb-mr1-dev manifest
2012-09-20 06:07:50 -07:00
Chad Jones
d6003a576f
am e593e93f: am 9d3bddf9: Add hardware/qcom/msm8960
...
* commit 'e593e93fa74a68e98c64ea02534c82483089f5dd':
Add hardware/qcom/msm8960
2012-09-19 15:21:43 -07:00
Ed Heyl
b61bf8eaea
am 8a325001: am 9a6b4961: remove revision for OneUp
...
* commit '8a3250016917ac3c3128d7ad24293ff4298232da':
remove revision for OneUp
2012-09-19 15:19:43 -07:00
Baligh Uddin
c0a707a13e
Merge "Add lib/gcm to jb-mr1-dev manifest" into jb-mr1-dev
2012-09-19 15:16:41 -07:00
Chad Jones
e593e93fa7
am 9d3bddf9: Add hardware/qcom/msm8960
...
* commit '9d3bddf99fe5a7fff31cc494082233db1a80ab1c':
Add hardware/qcom/msm8960
2012-09-19 14:32:01 -07:00
Chad Jones
9d3bddf99f
Add hardware/qcom/msm8960
2012-09-19 10:26:34 -07:00
Baligh Uddin
d6d9fd89fd
Add lib/gcm to jb-mr1-dev manifest
...
Bug: 7140178
2012-09-19 08:36:43 -07:00
Ed Heyl
06b9f898ea
am 9a6b4961: remove revision for OneUp
...
* commit '9a6b49617ecc17ff3333b45da596aaa2e1928eca':
remove revision for OneUp
2012-09-19 06:18:14 -07:00
Ed Heyl
8a32500169
am 9a6b4961: remove revision for OneUp
...
* commit '9a6b49617ecc17ff3333b45da596aaa2e1928eca':
remove revision for OneUp
2012-09-19 06:15:31 -07:00
Ed Heyl
9a6b49617e
remove revision for OneUp
2012-09-19 06:11:25 -07:00
Jean-Baptiste Queru
a0b70044eb
am 92724d37: (-s ours) am 053fb8ff: am b4d43934: (-s ours) Restore LT26 in MR0 timeframe - do not merge
...
* commit '92724d371f9c4decc463ad04582f9ba41e9eb948':
Restore LT26 in MR0 timeframe - do not merge
2012-09-18 17:16:13 -07:00
Jean-Baptiste Queru
478ab8e2cd
am b33b120e: (-s ours) am a3be1311: am cca5d604: (-s ours) Clean up old torospr projects - do not merge
...
* commit 'b33b120eda65ce42be86f9a9ac8e4bdd123af192':
Clean up old torospr projects - do not merge
2012-09-18 17:16:11 -07:00
Jean-Baptiste Queru
92724d371f
am 053fb8ff: am b4d43934: (-s ours) Restore LT26 in MR0 timeframe - do not merge
...
* commit '053fb8ffb63831cf5e2483687078c5531dca2749':
Restore LT26 in MR0 timeframe - do not merge
2012-09-18 16:54:35 -07:00
Jean-Baptiste Queru
b33b120eda
am a3be1311: am cca5d604: (-s ours) Clean up old torospr projects - do not merge
...
* commit 'a3be1311e6632b3058b85776ecafc419e30285c3':
Clean up old torospr projects - do not merge
2012-09-18 16:54:34 -07:00
Jean-Baptiste Queru
b367cc71c4
am 053fb8ff: (-s ours) am b4d43934: (-s ours) Restore LT26 in MR0 timeframe - do not merge
...
* commit '053fb8ffb63831cf5e2483687078c5531dca2749':
Restore LT26 in MR0 timeframe - do not merge
2012-09-18 15:58:16 -07:00
Jean-Baptiste Queru
bd4cbfc701
am a3be1311: (-s ours) am cca5d604: (-s ours) Clean up old torospr projects - do not merge
...
* commit 'a3be1311e6632b3058b85776ecafc419e30285c3':
Clean up old torospr projects - do not merge
2012-09-18 15:58:14 -07:00
Jean-Baptiste Queru
12025e6bfa
am c8f156e2: (-s ours) am 5fa8cf5c: (-s ours) am eee049c2: (-s ours) Use toroplus instead of torospr - do not merge
...
* commit 'c8f156e25d954838b07c778e2597d01d0fed1807':
Use toroplus instead of torospr - do not merge
2012-09-18 15:54:44 -07:00
Jean-Baptiste Queru
053fb8ffb6
am b4d43934: (-s ours) Restore LT26 in MR0 timeframe - do not merge
...
* commit 'b4d439343e95e82257dd17a80a40804d1bf50cd4':
Restore LT26 in MR0 timeframe - do not merge
2012-09-18 15:54:14 -07:00
Jean-Baptiste Queru
a3be1311e6
am cca5d604: (-s ours) Clean up old torospr projects - do not merge
...
* commit 'cca5d6046a649120d1a77c194ded0ae584a383bb':
Clean up old torospr projects - do not merge
2012-09-18 15:54:11 -07:00
Jean-Baptiste Queru
b4d439343e
Restore LT26 in MR0 timeframe - do not merge
...
Change-Id: I8ab5bf4c473cb5c8540604b9cb1896b349e1392c
2012-09-18 15:46:48 -07:00
Jean-Baptiste Queru
3fed7ddd8c
am 7b430d68: (-s ours) am c8f156e2: am 5fa8cf5c: (-s ours) am eee049c2: (-s ours) Use toroplus instead of torospr - do not merge
...
* commit '7b430d681f82bd2bff352e98164dbdf02b0f9d95':
Use toroplus instead of torospr - do not merge
2012-09-18 15:46:13 -07:00
Jean-Baptiste Queru
7b430d681f
am c8f156e2: am 5fa8cf5c: (-s ours) am eee049c2: (-s ours) Use toroplus instead of torospr - do not merge
...
* commit 'c8f156e25d954838b07c778e2597d01d0fed1807':
Use toroplus instead of torospr - do not merge
2012-09-18 15:43:25 -07:00
Jean-Baptiste Queru
cca5d6046a
Clean up old torospr projects - do not merge
...
Change-Id: Id1543d8f8e4564d42bd03c53b54928b682ad39ef
2012-09-18 15:39:45 -07:00
Jean-Baptiste Queru
c8f156e25d
am 5fa8cf5c: (-s ours) am eee049c2: (-s ours) Use toroplus instead of torospr - do not merge
...
* commit '5fa8cf5c7d835e482112e724aba248e1d2ace8fb':
Use toroplus instead of torospr - do not merge
2012-09-18 15:36:17 -07:00
Jean-Baptiste Queru
c394e753cb
am ab102d7d: (-s ours) am 7a01de9f: am e80c7f29: (-s ours) am 9ca65dbb: (-s ours) Merge "Restore a few projects - do not merge" into stage-aosp-master
...
* commit 'ab102d7d39128c4189a023ca123e75d98d3f27c2':
Restore a few projects - do not merge
2012-09-18 15:33:29 -07:00
Jean-Baptiste Queru
196d85054e
am b62bbeb0: (-s ours) am 7fffcacf: am 35cfb1d1: (-s ours) am 83c986b3: (-s ours) am 60fa6290: (-s ours) Restore a few projects - do not merge
...
* commit 'b62bbeb066a2ea1abec8e7f2f44fcee8a3e27300':
Restore a few projects - do not merge
2012-09-18 15:33:27 -07:00
Jean-Baptiste Queru
5fa8cf5c7d
am eee049c2: (-s ours) Use toroplus instead of torospr - do not merge
...
* commit 'eee049c26334d28c0ef4d3f2f58bb56def911fb9':
Use toroplus instead of torospr - do not merge
2012-09-18 15:32:39 -07:00
Jean-Baptiste Queru
eee049c263
Use toroplus instead of torospr - do not merge
...
Change-Id: I63b794f609476b45c9dd83dcaf1d7850d063e605
2012-09-18 15:30:06 -07:00
Jean-Baptiste Queru
03c0400014
am 7a01de9f: (-s ours) am e80c7f29: (-s ours) am 9ca65dbb: (-s ours) Merge "Restore a few projects - do not merge" into stage-aosp-master
...
* commit '7a01de9fe5b0a8c217f4bdceb4787321e2a5268a':
Restore a few projects - do not merge
2012-09-18 15:14:39 -07:00
Jean-Baptiste Queru
ab102d7d39
am 7a01de9f: am e80c7f29: (-s ours) am 9ca65dbb: (-s ours) Merge "Restore a few projects - do not merge" into stage-aosp-master
...
* commit '7a01de9fe5b0a8c217f4bdceb4787321e2a5268a':
Restore a few projects - do not merge
2012-09-18 15:14:30 -07:00
Jean-Baptiste Queru
b62bbeb066
am 7fffcacf: am 35cfb1d1: (-s ours) am 83c986b3: (-s ours) am 60fa6290: (-s ours) Restore a few projects - do not merge
...
* commit '7fffcacf96acc0403918b5d0345816fe8d5f739d':
Restore a few projects - do not merge
2012-09-18 15:14:28 -07:00
Jean-Baptiste Queru
864ebb3b1d
am 7fffcacf: (-s ours) am 35cfb1d1: (-s ours) am 83c986b3: (-s ours) am 60fa6290: (-s ours) Restore a few projects - do not merge
...
* commit '7fffcacf96acc0403918b5d0345816fe8d5f739d':
Restore a few projects - do not merge
2012-09-18 15:00:37 -07:00
Jean-Baptiste Queru
7a01de9fe5
am e80c7f29: (-s ours) am 9ca65dbb: (-s ours) Merge "Restore a few projects - do not merge" into stage-aosp-master
...
* commit 'e80c7f29c5d390b141fc4c660119a69eaa81a71e':
Restore a few projects - do not merge
2012-09-18 14:59:07 -07:00
Jean-Baptiste Queru
7fffcacf96
am 35cfb1d1: (-s ours) am 83c986b3: (-s ours) am 60fa6290: (-s ours) Restore a few projects - do not merge
...
* commit '35cfb1d15735cc3129eda6eafca1a2b3be47a657':
Restore a few projects - do not merge
2012-09-18 14:57:34 -07:00
Jean-Baptiste Queru
e80c7f29c5
am 9ca65dbb: (-s ours) Merge "Restore a few projects - do not merge" into stage-aosp-master
...
* commit '9ca65dbba004de5a2435ef7a6c3c7d9e47a4bdd2':
Restore a few projects - do not merge
2012-09-18 14:55:29 -07:00
Jean-Baptiste Queru
35cfb1d157
am 83c986b3: (-s ours) am 60fa6290: (-s ours) Restore a few projects - do not merge
...
* commit '83c986b350c25408e6370e56d9fe8eab1463d076':
Restore a few projects - do not merge
2012-09-18 14:52:03 -07:00
Jean-Baptiste Queru
9ca65dbba0
Merge "Restore a few projects - do not merge" into stage-aosp-master
2012-09-18 14:51:29 -07:00
Jean-Baptiste Queru
83c986b350
am 60fa6290: (-s ours) Restore a few projects - do not merge
...
* commit '60fa629082d089a852c73e02cb2f5dcca9c7d7fa':
Restore a few projects - do not merge
2012-09-18 14:48:51 -07:00
Jean-Baptiste Queru
a5be75accc
Restore a few projects - do not merge
...
Change-Id: I4c10112c4624c030818135bdbce9c18141fa1b38
2012-09-18 14:47:25 -07:00
Jean-Baptiste Queru
60fa629082
Restore a few projects - do not merge
...
Change-Id: I4c10112c4624c030818135bdbce9c18141fa1b38
2012-09-18 14:46:14 -07:00
Jean-Baptiste Queru
4f72bb1737
am 413bf6f7: am f789ed95: Remove stingray and crespo
...
* commit '413bf6f722e50da86fdedb382f579bd5dea36bcb':
Remove stingray and crespo
2012-09-18 12:16:34 -07:00
Jean-Baptiste Queru
413bf6f722
am f789ed95: Remove stingray and crespo
...
* commit 'f789ed9525bb8e030395f84de9b0990a470165be':
Remove stingray and crespo
2012-09-18 12:13:51 -07:00
Jean-Baptiste Queru
b1f50515b6
am f789ed95: Remove stingray and crespo
...
* commit 'f789ed9525bb8e030395f84de9b0990a470165be':
Remove stingray and crespo
2012-09-18 10:50:52 -07:00
Jean-Baptiste Queru
048d099ffe
am d07f06af: (-s ours) Remove empty projects - do not merge
...
* commit 'd07f06afc1d2ae0ad4966d0422dcae31d38fa657':
Remove empty projects - do not merge
2012-09-18 10:44:00 -07:00
Jean-Baptiste Queru
ac618bfb28
am 0cd182cf: Remove torospr, replaced by toroplus
...
* commit '0cd182cf25226057bcec4ccd5025ea9549515766':
Remove torospr, replaced by toroplus
2012-09-18 10:43:58 -07:00
Jean-Baptiste Queru
eba3ba3650
am 0af79520: (-s ours) am d07f06af: Remove empty projects - do not merge
...
* commit '0af79520f98219696886a08dae2836e008324cc1':
Remove empty projects - do not merge
2012-09-18 10:28:15 -07:00
Jean-Baptiste Queru
5aedd1cf83
am d3126561: am 0cd182cf: Remove torospr, replaced by toroplus
...
* commit 'd31265613b93e6699dacb48938db2aa174e3e263':
Remove torospr, replaced by toroplus
2012-09-18 10:28:14 -07:00
Jean-Baptiste Queru
0af79520f9
am d07f06af: Remove empty projects - do not merge
...
* commit 'd07f06afc1d2ae0ad4966d0422dcae31d38fa657':
Remove empty projects - do not merge
2012-09-18 10:10:32 -07:00
Jean-Baptiste Queru
d31265613b
am 0cd182cf: Remove torospr, replaced by toroplus
...
* commit '0cd182cf25226057bcec4ccd5025ea9549515766':
Remove torospr, replaced by toroplus
2012-09-18 10:10:30 -07:00
Jean-Baptiste Queru
f789ed9525
Remove stingray and crespo
...
They're not supported in MR1 and more.
Keeping them around adds unnecessary weight, including
around Open Source processes.
Change-Id: I8ce069fa245c7d5578b06e0edca43bdb140434d5
2012-09-18 08:43:53 -07:00
Jean-Baptiste Queru
d07f06afc1
Remove empty projects - do not merge
...
Those projects are empty in the MR1 timeframe.
Keeping them around makes the Open Source process
more complex than it needs to be.
Change-Id: Id53cbf2750c404f38fe96a801c3d2ba0db9ad965
2012-09-18 08:43:53 -07:00
Jean-Baptiste Queru
0cd182cf25
Remove torospr, replaced by toroplus
...
Change-Id: I07c96d1824a327992ae6d600d863a81d83705620
2012-09-18 08:43:52 -07:00
Chad Jones
2ebd92333d
am 67a1dfcc: am 4894df3c: Add notdefault back to group list for eclipse-build-deps and eclipse-build-deps-sources
...
* commit '67a1dfcc03a5b3262ba763eb9367ad88317840fb':
Add notdefault back to group list for eclipse-build-deps and eclipse-build-deps-sources
2012-09-17 11:09:13 -07:00
Jean-Baptiste Queru
5124cacd12
am 517d92f6: am eb292293: am 7ec62ecd: am 3c1f5b2e: (-s ours) am 558a5644: Remove motorola projects
...
* commit '517d92f669d971c8a7c3017708a84273948c2bfe':
Remove motorola projects
2012-09-17 10:27:55 -07:00
Jean-Baptiste Queru
99e6e6068c
am 854f7d4b: am 92e5ec36: am b080654f: Restore panda support
...
* commit '854f7d4bc94889b6cbb298d097e780548ac5f145':
2012-09-17 10:27:53 -07:00
Jean-Baptiste Queru
6ba95577b3
am 402078ad: am d0f71dcf: Restore panda support
...
* commit '402078ada296ae13a6b18e3db286c22fde14b929':
Restore panda support
2012-09-17 10:27:52 -07:00
Chad Jones
386c28a994
am 4894df3c: Add notdefault back to group list for eclipse-build-deps and eclipse-build-deps-sources
...
* commit '4894df3c29ab0d8a833b9ae789b5c02ea3ea0103':
Add notdefault back to group list for eclipse-build-deps and eclipse-build-deps-sources
2012-09-14 11:39:36 -07:00
Chad Jones
67a1dfcc03
am 4894df3c: Add notdefault back to group list for eclipse-build-deps and eclipse-build-deps-sources
...
* commit '4894df3c29ab0d8a833b9ae789b5c02ea3ea0103':
Add notdefault back to group list for eclipse-build-deps and eclipse-build-deps-sources
2012-09-14 11:39:30 -07:00
Chad Jones
4894df3c29
Add notdefault back to group list for eclipse-build-deps and eclipse-build-deps-sources
2012-09-14 10:47:51 -07:00
Jean-Baptiste Queru
2c65de74d4
am eb292293: am 7ec62ecd: am 3c1f5b2e: (-s ours) am 558a5644: Remove motorola projects
...
* commit 'eb2922932c1c2bcc7ad5ce60c379cb9a801ecca1':
Remove motorola projects
2012-09-14 08:14:06 -07:00
Jean-Baptiste Queru
517d92f669
am eb292293: am 7ec62ecd: am 3c1f5b2e: (-s ours) am 558a5644: Remove motorola projects
...
* commit 'eb2922932c1c2bcc7ad5ce60c379cb9a801ecca1':
Remove motorola projects
2012-09-14 08:13:55 -07:00
Jean-Baptiste Queru
eb2922932c
am 7ec62ecd: am 3c1f5b2e: (-s ours) am 558a5644: Remove motorola projects
...
* commit '7ec62ecdc280b485526cb007091b65a96cf69046':
Remove motorola projects
2012-09-14 08:12:00 -07:00
Jean-Baptiste Queru
8717ff5cdf
am 92e5ec36: am b080654f: Restore panda support
...
* commit '92e5ec36299e3b26b23f9c8bd47eef75f39e058d':
2012-09-14 08:11:38 -07:00
Jean-Baptiste Queru
854f7d4bc9
am 92e5ec36: am b080654f: Restore panda support
...
* commit '92e5ec36299e3b26b23f9c8bd47eef75f39e058d':
2012-09-14 08:11:27 -07:00
Jean-Baptiste Queru
7ec62ecdc2
am 3c1f5b2e: (-s ours) am 558a5644: Remove motorola projects
...
* commit '3c1f5b2ecfd0770722d40e60132d8c1b58a07675':
Remove motorola projects
2012-09-14 08:10:45 -07:00
Jean-Baptiste Queru
92e5ec3629
am b080654f: Restore panda support
...
* commit 'b080654fd8310cfc535469354fdf040fd569cb45':
2012-09-14 08:09:24 -07:00
Jean-Baptiste Queru
b080654fd8
Restore panda support
...
Change-Id: I6c1812c1ecd0e6d8a98b44fa8d8d5219ee305a26
2012-09-14 08:07:03 -07:00
Jean-Baptiste Queru
bb01b60fa6
am d0f71dcf: Restore panda support
...
* commit 'd0f71dcf358f8f1aade1725219e7e9d8d6d0c7d8':
Restore panda support
2012-09-14 08:06:06 -07:00
Jean-Baptiste Queru
402078ada2
am d0f71dcf: Restore panda support
...
* commit 'd0f71dcf358f8f1aade1725219e7e9d8d6d0c7d8':
Restore panda support
2012-09-14 08:05:54 -07:00
Jean-Baptiste Queru
d0f71dcf35
Restore panda support
...
Change-Id: Id47d15c6c8d7966e4066f3d8a868a2ceba25b9b4
2012-09-14 08:02:04 -07:00
Jean-Baptiste Queru
3c1f5b2ecf
am 558a5644: Remove motorola projects
...
* commit '558a5644029dbb7c2f1c2e5ebdbec4a0d61cbaa9':
Remove motorola projects
2012-09-14 08:00:27 -07:00
Jean-Baptiste Queru
a2aff70ced
am 09fd2bc6: Restore panda support
...
* commit '09fd2bc669c217731e134dfe7956e7ab01601a71':
Restore panda support
2012-09-14 07:59:03 -07:00
Jean-Baptiste Queru
558a564402
Remove motorola projects
...
Change-Id: I5e644155df39be9626534199b94ebd1c0bf8ab39
2012-09-14 07:58:07 -07:00
Jean-Baptiste Queru
09fd2bc669
Restore panda support
...
Change-Id: I63956b973268416a8a9e97375490ea8e13284f09
2012-09-14 07:56:48 -07:00
Chad Jones
058f5986ff
am 865e8e15: am 05272258: Add hardware/qcom/sensors
...
* commit '865e8e156b9ae016659b836c04a1945f9083775c':
Add hardware/qcom/sensors
2012-09-13 14:12:25 -07:00
Chad Jones
e901ade634
Add external/marisa-trie
2012-09-13 11:22:20 -07:00
Chad Jones
eb8df218c9
am 05272258: Add hardware/qcom/sensors
...
* commit '05272258bc5329a8a5c73433928bad13c25db00a':
Add hardware/qcom/sensors
2012-09-13 10:49:42 -07:00
Chad Jones
865e8e156b
am 05272258: Add hardware/qcom/sensors
...
* commit '05272258bc5329a8a5c73433928bad13c25db00a':
Add hardware/qcom/sensors
2012-09-13 10:49:20 -07:00
Chad Jones
05272258bc
Add hardware/qcom/sensors
...
Bug: 7153473
Change-Id: I4e0465f8375eb9794532665baad56c95424b2595
2012-09-13 10:28:04 -07:00
Chad Jones
19d4a5adc2
am 29cb584a: am 63b13ed8: Drop notdefault from prebuilts/eclipse-build* due to repo bug resulting in buildbot failures
...
* commit '29cb584ab9d29c0af3b893b6a4c4980f12ab1c67':
Drop notdefault from prebuilts/eclipse-build* due to repo bug resulting in buildbot failures
2012-09-12 15:36:21 -07:00
Jean-Baptiste Queru
831fec5dda
am 2632ea4d: (-s ours) am aa22e7fd: am 9d937eb4: (-s ours) am 02345f9c: (-s ours) am ec887723: (-s ours) Remove notdefault from mirror - do not merge
...
* commit '2632ea4d34035de1bea0e92dd8b2fa37e788e7bc':
Remove notdefault from mirror - do not merge
2012-09-12 15:34:02 -07:00
Jean-Baptiste Queru
805021a414
am b84ed038: (-s ours) am f8756627: am 3e2c43b4: (-s ours) am e8f30ff1: (-s ours) Remove notdefault from mirror - do not merge
...
* commit 'b84ed0383e7be2435298ea02fbc76c1baaf60059':
Remove notdefault from mirror - do not merge
2012-09-12 15:34:00 -07:00
Jean-Baptiste Queru
4f113ee564
resolved conflicts for merge of 09df276a to master
...
Change-Id: I81c0276c6b20ba2138795ff9e4160b9db22fb5e4
2012-09-12 15:31:44 -07:00
Chad Jones
6734545329
Drop notdefault from prebuilts/eclipse-build* due to repo bug resulting in buildbot failures
2012-09-11 22:48:09 -07:00
Chad Jones
9ab5595356
am 63b13ed8: Drop notdefault from prebuilts/eclipse-build* due to repo bug resulting in buildbot failures
...
* commit '63b13ed84b5a91d67a8846aa49c23ebe701644a1':
Drop notdefault from prebuilts/eclipse-build* due to repo bug resulting in buildbot failures
2012-09-11 22:46:10 -07:00
Chad Jones
29cb584ab9
am 63b13ed8: Drop notdefault from prebuilts/eclipse-build* due to repo bug resulting in buildbot failures
...
* commit '63b13ed84b5a91d67a8846aa49c23ebe701644a1':
Drop notdefault from prebuilts/eclipse-build* due to repo bug resulting in buildbot failures
2012-09-11 22:45:39 -07:00
Chad Jones
63b13ed84b
Drop notdefault from prebuilts/eclipse-build* due to repo bug resulting in buildbot failures
2012-09-11 22:43:09 -07:00
Jean-Baptiste Queru
9ec13c76ea
am aa22e7fd: (-s ours) am 9d937eb4: (-s ours) am 02345f9c: (-s ours) am ec887723: (-s ours) Remove notdefault from mirror - do not merge
...
* commit 'aa22e7fd227aeea8920c1dad14cf53e5b2156bcf':
Remove notdefault from mirror - do not merge
2012-09-11 15:10:14 -07:00
Jean-Baptiste Queru
b86ca7a7b5
am f8756627: (-s ours) am 3e2c43b4: (-s ours) am e8f30ff1: (-s ours) Remove notdefault from mirror - do not merge
...
* commit 'f8756627f552d27d33d69855903e3dec1cc1273c':
Remove notdefault from mirror - do not merge
2012-09-11 15:10:12 -07:00
Jean-Baptiste Queru
2632ea4d34
am aa22e7fd: am 9d937eb4: (-s ours) am 02345f9c: (-s ours) am ec887723: (-s ours) Remove notdefault from mirror - do not merge
...
* commit 'aa22e7fd227aeea8920c1dad14cf53e5b2156bcf':
Remove notdefault from mirror - do not merge
2012-09-11 15:09:55 -07:00
Jean-Baptiste Queru
b84ed0383e
am f8756627: am 3e2c43b4: (-s ours) am e8f30ff1: (-s ours) Remove notdefault from mirror - do not merge
...
* commit 'f8756627f552d27d33d69855903e3dec1cc1273c':
Remove notdefault from mirror - do not merge
2012-09-11 15:09:53 -07:00
Jean-Baptiste Queru
09df276a79
am bc992ba1: resolved conflicts for merge of e620d44b to jb-mr1-dev
...
* commit 'bc992ba119545470c418882f0c893712bd6063ec':
Add eclipse build deps
2012-09-11 15:08:27 -07:00
Jean-Baptiste Queru
aa22e7fd22
am 9d937eb4: (-s ours) am 02345f9c: (-s ours) am ec887723: (-s ours) Remove notdefault from mirror - do not merge
...
* commit '9d937eb4479fe1793dafd25b464e8a10f063f256':
Remove notdefault from mirror - do not merge
2012-09-11 15:07:43 -07:00
Jean-Baptiste Queru
f8756627f5
am 3e2c43b4: (-s ours) am e8f30ff1: (-s ours) Remove notdefault from mirror - do not merge
...
* commit '3e2c43b446b7e030392f249c9f1c9964bf17b23e':
Remove notdefault from mirror - do not merge
2012-09-11 15:07:41 -07:00
Jean-Baptiste Queru
8c3ce684eb
am bc992ba1: resolved conflicts for merge of e620d44b to jb-mr1-dev
...
* commit 'bc992ba119545470c418882f0c893712bd6063ec':
Add eclipse build deps
2012-09-11 15:07:37 -07:00
Jean-Baptiste Queru
bc992ba119
resolved conflicts for merge of e620d44b to jb-mr1-dev
...
Change-Id: I1b2fb6b47ea36787d19a2739585b971c56dc0a48
2012-09-11 15:06:10 -07:00
Jean-Baptiste Queru
9d937eb447
am 02345f9c: (-s ours) am ec887723: (-s ours) Remove notdefault from mirror - do not merge
...
* commit '02345f9c229a9da80515fba1b36e16e3fb47baa5':
Remove notdefault from mirror - do not merge
2012-09-11 15:00:17 -07:00
Jean-Baptiste Queru
3e2c43b446
am e8f30ff1: (-s ours) Remove notdefault from mirror - do not merge
...
* commit 'e8f30ff1a0fb5997ed8b105ee4f193e297c3de00':
Remove notdefault from mirror - do not merge
2012-09-11 15:00:15 -07:00
Jean-Baptiste Queru
02345f9c22
am ec887723: (-s ours) Remove notdefault from mirror - do not merge
...
* commit 'ec887723d2e6832f4da59785dc216367ea4c5554':
Remove notdefault from mirror - do not merge
2012-09-11 14:58:17 -07:00
Jean-Baptiste Queru
e620d44b8d
resolved conflicts for merge of 7113dfd3 to jb-dev-plus-aosp
...
Change-Id: I5baf4114eed5ee2c9e97f082643ab88d1112b27e
2012-09-11 14:58:09 -07:00
Jean-Baptiste Queru
e8f30ff1a0
Remove notdefault from mirror - do not merge
...
Change-Id: I4530497a49a8dd810d42d2164c77b2e9ae19d9be
2012-09-11 14:56:31 -07:00
Jean-Baptiste Queru
ec887723d2
Remove notdefault from mirror - do not merge
...
Change-Id: I4530497a49a8dd810d42d2164c77b2e9ae19d9be
2012-09-11 14:55:52 -07:00
Jean-Baptiste Queru
7113dfd313
am c1784cd7: Add eclipse build deps
...
* commit 'c1784cd7214f6c952eb805708bf63a40dbe0a4bd':
Add eclipse build deps
2012-09-11 14:49:49 -07:00
Jean-Baptiste Queru
c1784cd721
Add eclipse build deps
...
Change-Id: Id9a0243e631c125c72ef7233cd26c08bfd6e7bd4
2012-09-11 14:47:41 -07:00
The Android Open Source Project
08dca174fb
Add optional eclipse-related prebuilts
...
Change-Id: Ie50c3ce88b6729460ed22da25a6a21bd68ee4b88
2012-09-11 14:37:07 -07:00
Chad Jones
289715d8a6
Add prebuilts/eclipse-build-deps and eclipse-build-deps-sources in 'notdefault' group
2012-09-11 11:02:35 -07:00
Chad Jones
7460a24e2f
am 0815ed47: am e527b482: Add vendor/fraunhofer/virtualizer
...
* commit '0815ed47c64242a25fdac9c66c6708a063ed7d60':
Add vendor/fraunhofer/virtualizer
2012-09-10 17:07:41 -07:00
Chad Jones
30becc8965
am e527b482: Add vendor/fraunhofer/virtualizer
...
* commit 'e527b4823cd0d4174593c1596978cf7cdfe68f77':
Add vendor/fraunhofer/virtualizer
2012-09-07 16:43:42 -07:00
Chad Jones
0815ed47c6
am e527b482: Add vendor/fraunhofer/virtualizer
...
* commit 'e527b4823cd0d4174593c1596978cf7cdfe68f77':
Add vendor/fraunhofer/virtualizer
2012-09-07 15:12:37 -07:00
Chad Jones
e527b4823c
Add vendor/fraunhofer/virtualizer
2012-09-07 14:48:40 -07:00
Jean-Baptiste Queru
9172e14fc8
am 264ae87c: am b44e98af: am 0ad0016f: resolved conflicts for merge of 4213b553 to jb-dev-plus-aosp
...
* commit '264ae87ce43d80fa8c93da5c89c55864c87990f2':
Remove panda support from AOSP
2012-09-07 13:48:21 -07:00
Jean-Baptiste Queru
e2a9943939
am b44e98af: am 0ad0016f: resolved conflicts for merge of 4213b553 to jb-dev-plus-aosp
...
* commit 'b44e98afc2f976b5e2b9112f5609dfc8f29bf096':
Remove panda support from AOSP
2012-09-07 13:47:07 -07:00
Jean-Baptiste Queru
e894f2d011
am bd7c38aa: (-s ours) am 5aa80903: (-s ours) am d8b715bd: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit 'bd7c38aae1a1f5f6593b451b8401e20059836ef0':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-07 13:41:29 -07:00
Jean-Baptiste Queru
55333358e9
am 9c9e7d8f: (-s ours) am d2e271c7: (-s ours) am d62a5322: (-s ours) am 88f6f5a0: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit '9c9e7d8f4eec1eae2850b5a9ec11aabaf232ac36':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-07 13:41:28 -07:00
Jean-Baptiste Queru
ba9386ae12
am c9af20f5: am 5f86d43d: resolved conflicts for merge of df523806 to jb-dev-plus-aosp
...
* commit 'c9af20f52d67cbd6d086c86c39ea2fdc88dd4ffe':
Remove LT26
2012-09-07 13:38:48 -07:00
Chad Jones
5316ec9b3a
am c4c1ec48: Add platform/external/libcap-ng
...
* commit 'c4c1ec48f5d30069b73939b78afe24e9395259bf':
Add platform/external/libcap-ng
2012-09-07 13:38:38 -07:00
Jean-Baptiste Queru
264ae87ce4
am b44e98af: am 0ad0016f: resolved conflicts for merge of 4213b553 to jb-dev-plus-aosp
...
* commit 'b44e98afc2f976b5e2b9112f5609dfc8f29bf096':
Remove panda support from AOSP
2012-09-07 08:26:12 -07:00
Jean-Baptiste Queru
b44e98afc2
am 0ad0016f: resolved conflicts for merge of 4213b553 to jb-dev-plus-aosp
...
* commit '0ad0016f9bfcc314b6d84a5fd357258ebd711303':
Remove panda support from AOSP
2012-09-07 08:23:58 -07:00
Jean-Baptiste Queru
0ad0016f9b
resolved conflicts for merge of 4213b553 to jb-dev-plus-aosp
...
Change-Id: I44651a4b305dcf3627da474ac04de3b3a42a733c
2012-09-07 08:21:17 -07:00
Jean-Baptiste Queru
4213b5534a
am 6feef77d: Remove panda support from AOSP
...
* commit '6feef77d673e5903b3f45249828f59defb316f59':
Remove panda support from AOSP
2012-09-07 08:18:46 -07:00
Jean-Baptiste Queru
6feef77d67
Remove panda support from AOSP
...
Change-Id: I6d5fbac95579ac8aa19a5e813ac8d76c307de0e0
2012-09-07 08:16:39 -07:00
Jean-Baptiste Queru
8be7815721
am d8359455: (-s ours) am bd7c38aa: am 5aa80903: (-s ours) am d8b715bd: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit 'd8359455583f526913b678c5c049276990543ac3':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:43:55 -07:00
Jean-Baptiste Queru
aaa0dca09a
am 03a24185: (-s ours) am 9c9e7d8f: am d2e271c7: (-s ours) am d62a5322: (-s ours) am 88f6f5a0: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit '03a24185398025c6661eaf474e53f067f05db569':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:43:52 -07:00
Jean-Baptiste Queru
d835945558
am bd7c38aa: am 5aa80903: (-s ours) am d8b715bd: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit 'bd7c38aae1a1f5f6593b451b8401e20059836ef0':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:42:01 -07:00
Jean-Baptiste Queru
03a2418539
am 9c9e7d8f: am d2e271c7: (-s ours) am d62a5322: (-s ours) am 88f6f5a0: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit '9c9e7d8f4eec1eae2850b5a9ec11aabaf232ac36':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:42:00 -07:00
Jean-Baptiste Queru
bd7c38aae1
am 5aa80903: (-s ours) am d8b715bd: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit '5aa80903d0318b600b5cec62bb56eaeeb409230a':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:41:11 -07:00
Jean-Baptiste Queru
5aa80903d0
am d8b715bd: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit 'd8b715bdc69c8ff96ae3372fcb1dca70ad87b8b6':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:39:47 -07:00
Jean-Baptiste Queru
9c9e7d8f4e
am d2e271c7: (-s ours) am d62a5322: (-s ours) am 88f6f5a0: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit 'd2e271c757994a2a8a1de6663f9e4f8e344bc6ea':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:39:45 -07:00
Jean-Baptiste Queru
d2e271c757
am d62a5322: (-s ours) am 88f6f5a0: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit 'd62a53221c2f8b2709b70d9eb0a07b8b3ae496e1':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:38:21 -07:00
Jean-Baptiste Queru
d8b715bdc6
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
They've been forked off internally, so we can neither
release them as Open Source nor accept contributions.
Change-Id: I4d6fa6bdd25189b55312927c14f23adbfbc785e2
2012-09-06 09:37:35 -07:00
Jean-Baptiste Queru
d62a53221c
am 88f6f5a0: (-s ours) Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
* commit '88f6f5a0eca102b626aa214ec44c6b4626fbba72':
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
2012-09-06 09:36:20 -07:00
Jean-Baptiste Queru
88f6f5a0ec
Remove Camera and Gallery2 from AOSP - DO NOT MERGE
...
They've been forked off internally, so we can neither
release them as Open Source nor accept contributions.
Change-Id: I4d6fa6bdd25189b55312927c14f23adbfbc785e2
2012-09-06 09:30:52 -07:00
Jean-Baptiste Queru
4de49bd06a
am 325adc92: am c9af20f5: am 5f86d43d: resolved conflicts for merge of df523806 to jb-dev-plus-aosp
...
* commit '325adc92e4da6b71cc191a743295c1f2ebf0077d':
Remove LT26
2012-09-05 16:30:16 -07:00
Chad Jones
55267c8d2f
am 1d0736af: am c4c1ec48: Add platform/external/libcap-ng
...
* commit '1d0736af9fc9da06434b2a1e10e9f68bce85ca8b':
Add platform/external/libcap-ng
2012-09-05 16:30:05 -07:00
Jean-Baptiste Queru
325adc92e4
am c9af20f5: am 5f86d43d: resolved conflicts for merge of df523806 to jb-dev-plus-aosp
...
* commit 'c9af20f52d67cbd6d086c86c39ea2fdc88dd4ffe':
Remove LT26
2012-09-05 15:53:55 -07:00
Jean-Baptiste Queru
c9af20f52d
am 5f86d43d: resolved conflicts for merge of df523806 to jb-dev-plus-aosp
...
* commit '5f86d43d09179c89a183ec9f47674b83dfc327e0':
Remove LT26
2012-09-05 15:51:51 -07:00
Jean-Baptiste Queru
5f86d43d09
resolved conflicts for merge of df523806 to jb-dev-plus-aosp
...
Change-Id: If82df80c1480eb2b1e95d435cb6a53280f672824
2012-09-05 15:49:05 -07:00
Jean-Baptiste Queru
df52380697
am 66bcac1a: Remove LT26
...
* commit '66bcac1a5d153d6f808537f719d91bc35f712893':
Remove LT26
2012-09-05 15:44:46 -07:00
Jean-Baptiste Queru
66bcac1a5d
Remove LT26
...
Change-Id: I2ed60c33c8d70b154dc8245c7c33274a2591d9da
2012-09-05 15:42:31 -07:00
Chad Jones
1d0736af9f
am c4c1ec48: Add platform/external/libcap-ng
...
* commit 'c4c1ec48f5d30069b73939b78afe24e9395259bf':
Add platform/external/libcap-ng
2012-09-05 15:06:48 -07:00
Chad Jones
c4c1ec48f5
Add platform/external/libcap-ng
2012-09-05 14:50:31 -07:00
Ed Heyl
871757ef43
jb-mr1-aah-dev
2012-09-05 12:27:09 -07:00
Jean-Baptiste Queru
68f27073b9
am 6be07ff6: am cc1bc42b: Add libogg and libvorbis
...
* commit '6be07ff6faabf25cb8d3a09cbd034a46dc970392':
Add libogg and libvorbis
2012-09-04 09:28:15 -07:00
Jean-Baptiste Queru
6be07ff6fa
am cc1bc42b: Add libogg and libvorbis
...
* commit 'cc1bc42bc4a052ea7428b99c394da96168ee5ccc':
Add libogg and libvorbis
2012-09-04 09:26:55 -07:00
Jean-Baptiste Queru
cc1bc42bc4
Add libogg and libvorbis
...
Change-Id: Ie2819171df10c1a07b34a772d3792fec2d1417ab
2012-09-04 09:07:26 -07:00
Jean-Baptiste Queru
e25efc6e68
am fcc0b9d4: am d2acc524: am a445315d: resolved conflicts for merge of c64d3640 to jb-dev-plus-aosp
...
* commit 'fcc0b9d4a61a3ae37b7ff292ea9a48eec5ea9c32':
Unmap MIPS 4.4 toolchains
2012-08-29 07:55:40 -07:00
Jean-Baptiste Queru
fcc0b9d4a6
am d2acc524: am a445315d: resolved conflicts for merge of c64d3640 to jb-dev-plus-aosp
...
* commit 'd2acc524d46ead11dfff0fa44ab9ee9fb2ff569f':
Unmap MIPS 4.4 toolchains
2012-08-29 07:54:21 -07:00
Jean-Baptiste Queru
d2acc524d4
am a445315d: resolved conflicts for merge of c64d3640 to jb-dev-plus-aosp
...
* commit 'a445315d1390c64a9415dde31e9be35963c26537':
Unmap MIPS 4.4 toolchains
2012-08-29 07:51:46 -07:00
Jean-Baptiste Queru
a445315d13
resolved conflicts for merge of c64d3640 to jb-dev-plus-aosp
...
Change-Id: Ia091f70674ecebd348064b16c88d43be80d46970
2012-08-29 07:48:51 -07:00
Jean-Baptiste Queru
c64d36401b
am e2f86cff: Unmap MIPS 4.4 toolchains
...
* commit 'e2f86cffd29a41f62b10f547768387b4a22bdacf':
Unmap MIPS 4.4 toolchains
2012-08-29 07:39:26 -07:00
Jean-Baptiste Queru
e2f86cffd2
Unmap MIPS 4.4 toolchains
...
Change-Id: I7c8c5b70bde15ea07447c26d4841177c5e6010b5
2012-08-29 07:36:48 -07:00
The Android Open Source Project
a07bad6077
Unmap MIPS 4.4 toolchains
...
Change-Id: Ia41327bef849a89665c10659c13372044971baa5
2012-08-29 06:41:58 -07:00
Chad Jones
9ef061a5fc
am 45385fd7: am 74ed4376: Add groups=pdk to external/tinyxml2
...
* commit '45385fd75550d364cb7ad4062946beec8da60789':
Add groups=pdk to external/tinyxml2
2012-08-28 14:25:16 -07:00
Chad Jones
45385fd755
am 74ed4376: Add groups=pdk to external/tinyxml2
...
* commit '74ed4376f9b0eb0aa1002435e1051d0ab5d85983':
Add groups=pdk to external/tinyxml2
2012-08-28 14:23:41 -07:00
Chad Jones
74ed4376f9
Add groups=pdk to external/tinyxml2
2012-08-28 14:18:14 -07:00
Nick Sanders
4f94d23411
am ee3dd49a: am acce444b: Merge "Add phantasm group for PDK support (Nexus Q)" into jb-mr1-dev
...
* commit 'ee3dd49aa9e8e8bb0635ea1f4dd12d2605fef8b7':
Add phantasm group for PDK support (Nexus Q)
2012-08-27 15:31:20 -07:00
Nick Sanders
ee3dd49aa9
am acce444b: Merge "Add phantasm group for PDK support (Nexus Q)" into jb-mr1-dev
...
* commit 'acce444bec888320dbd2cf2cd516c9dee6967d40':
Add phantasm group for PDK support (Nexus Q)
2012-08-27 15:29:43 -07:00
Nick Sanders
acce444bec
Merge "Add phantasm group for PDK support (Nexus Q)" into jb-mr1-dev
2012-08-27 15:27:38 -07:00
Jean-Baptiste Queru
67cbf62276
am e84dfc64: am 0c25092d: am 1a764039: am ab61d8e6: am 48acde97: Add fat32lib
...
* commit 'e84dfc64b226a8c9a7cc64a01d71384021a01b92':
Add fat32lib
2012-08-27 15:24:57 -07:00
Jean-Baptiste Queru
e84dfc64b2
am 0c25092d: am 1a764039: am ab61d8e6: am 48acde97: Add fat32lib
...
* commit '0c25092d2635436204aec92bb6b729d3eaee3933':
Add fat32lib
2012-08-27 15:23:00 -07:00
Jean-Baptiste Queru
0c25092d26
am 1a764039: am ab61d8e6: am 48acde97: Add fat32lib
...
* commit '1a764039675c2c625a28d406f2c953ba7d7991ba':
Add fat32lib
2012-08-27 15:19:15 -07:00
Chad Jones
80d3af4b94
am 1f77ff8e: am 4a7b4770: Add vendor/unbundled_google/libs/aah to handle once want to merge AAH projects from gb-ub-aah-dev back into jb-mr1-dev
...
* commit '1f77ff8ebd276452846a5e1243b80b39ea7851cb':
Add vendor/unbundled_google/libs/aah to handle once want to merge AAH projects from gb-ub-aah-dev back into jb-mr1-dev
2012-08-27 15:17:12 -07:00
Jean-Baptiste Queru
1a76403967
am ab61d8e6: am 48acde97: Add fat32lib
...
* commit 'ab61d8e60a58a8736c279f288d1cc5a59cac1764':
Add fat32lib
2012-08-27 15:15:32 -07:00
Chad Jones
1f77ff8ebd
am 4a7b4770: Add vendor/unbundled_google/libs/aah to handle once want to merge AAH projects from gb-ub-aah-dev back into jb-mr1-dev
...
* commit '4a7b4770c3b1f63cc2b46a0cbdc570bc0b3dbf1b':
Add vendor/unbundled_google/libs/aah to handle once want to merge AAH projects from gb-ub-aah-dev back into jb-mr1-dev
2012-08-27 15:13:29 -07:00
Jean-Baptiste Queru
ab61d8e60a
am 48acde97: Add fat32lib
...
* commit '48acde97df4988946cddd62ceedbea41e8c138d3':
Add fat32lib
2012-08-27 15:12:44 -07:00
Chad Jones
4a7b4770c3
Add vendor/unbundled_google/libs/aah to handle once want to merge AAH projects from gb-ub-aah-dev back into jb-mr1-dev
2012-08-27 13:55:59 -07:00
Jean-Baptiste Queru
48acde97df
Add fat32lib
...
Change-Id: I31122ca80d02f5919e78070e8a3e46b5f85d378f
2012-08-27 13:54:13 -07:00
The Android Open Source Project
4cf09a2953
Add fat32lib
...
Change-Id: I467e2045f9e06f5871a30fb7a09c5ff4e68b7cfd
2012-08-27 13:51:51 -07:00
Chad Jones
c0bfaa1f3c
Add platform/packages/apps/OneTimeInitialize
2012-08-24 23:16:03 -07:00
Chad Jones
b0369739a4
am c394000f: am 792cc345: Add external/tinyxml2
...
* commit 'c394000f5d05d83fd70dde71508bf67b8e7020da':
Add external/tinyxml2
2012-08-23 22:19:55 -07:00
Chad Jones
c394000f5d
am 792cc345: Add external/tinyxml2
...
* commit '792cc3457174d30c25c5650940f9054e35e7d521':
Add external/tinyxml2
2012-08-23 22:18:00 -07:00
Chad Jones
792cc34571
Add external/tinyxml2
2012-08-23 21:41:13 -07:00
Keun young Park
04884c86a3
remove dummy apps from master build
...
- They are not necessary in master and can cause unnecessary build break.
If those apps are necessary later, they will be added back.
2012-08-23 11:50:58 -07:00
Keun young Park
92650a6b8b
am 61024428: am f50dabe3: add dummy_framework/policy
...
* commit '610244282d8cc1b4c049e1154bd034b1e5487a8a':
add dummy_framework/policy
2012-08-22 11:39:21 -07:00
Keun young Park
610244282d
am f50dabe3: add dummy_framework/policy
...
* commit 'f50dabe357b8cc0a3feda9f5e33a9f884bf9bead':
add dummy_framework/policy
2012-08-22 11:37:54 -07:00
Keun young Park
f50dabe357
add dummy_framework/policy
2012-08-22 11:14:18 -07:00
Chad Jones
87fe8e6ee8
am c75cda1d: am fd458121: Add vendor/pdk/dummy_app/Settings
...
* commit 'c75cda1d314261c96bbd94f3bee5d6f0278d5ee4':
Add vendor/pdk/dummy_app/Settings
2012-08-20 12:40:50 -07:00
Chad Jones
c75cda1d31
am fd458121: Add vendor/pdk/dummy_app/Settings
...
* commit 'fd4581210db811948079caa21907ffc18a8fc8c6':
Add vendor/pdk/dummy_app/Settings
2012-08-20 12:39:23 -07:00
Chad Jones
fd4581210d
Add vendor/pdk/dummy_app/Settings
2012-08-20 12:33:04 -07:00
Iliyan Malchev
31de3b6f5c
am 52822461: am caf9f83a: remove wpa_supplicant_tracking from the manifest
...
* commit '528224610da8cfebad5000760fdc890bc246b8c9':
remove wpa_supplicant_tracking from the manifest
2012-08-20 08:08:24 -07:00
Iliyan Malchev
528224610d
am caf9f83a: remove wpa_supplicant_tracking from the manifest
...
* commit 'caf9f83a1be9e49460f7ea1151ffbad46ed1cd42':
remove wpa_supplicant_tracking from the manifest
2012-08-20 08:06:22 -07:00
Iliyan Malchev
caf9f83a1b
remove wpa_supplicant_tracking from the manifest
...
Change-Id: Ia7d091932b8bb46965109d45a20a3906fb613cfe
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-08-19 16:35:41 -07:00
Nick Sanders
6434f285a2
Add phantasm group for PDK support (Nexus Q)
...
Change-Id: I0007eba246b1a3f8a36d953d927550575eea86f4
2012-08-17 15:43:20 -07:00
Chad Jones
e456ee8fa2
am 5a1419fb: am 1be6eb97: Add vendor/pdk/dummy_app/SystemUI
...
* commit '5a1419fb1e36e2f0045afde594f65fb6686ecb5f':
Add vendor/pdk/dummy_app/SystemUI
2012-08-17 13:56:39 -07:00
Chad Jones
5a1419fb1e
am 1be6eb97: Add vendor/pdk/dummy_app/SystemUI
...
* commit '1be6eb979108a90a5941633f05ec73dffa7d7da2':
Add vendor/pdk/dummy_app/SystemUI
2012-08-17 13:55:35 -07:00
Chad Jones
1be6eb9791
Add vendor/pdk/dummy_app/SystemUI
2012-08-17 13:40:16 -07:00
Chad Jones
a1a30430cb
am d2b3681d: am 9e62fdde: Add device/generic/common
...
* commit 'd2b3681d4e337669b7ab8c643a10a878ca127ad0':
Add device/generic/common
2012-08-16 16:03:29 -07:00
Chad Jones
d2b3681d4e
am 9e62fdde: Add device/generic/common
...
* commit '9e62fdde24e20d9eecdbc09a71a054ab7112916f':
Add device/generic/common
2012-08-16 16:02:09 -07:00
Chad Jones
9e62fdde24
Add device/generic/common
2012-08-16 15:44:48 -07:00
Daniel Sandler
6a42dfc2fb
am 85f9c4c4: am d9252215: Add screensaver projects to manifest
...
* commit '85f9c4c4c40ba342f73334ca024169039da17a35':
Add screensaver projects to manifest
2012-08-15 19:57:38 -07:00
Daniel Sandler
85f9c4c4c4
am d9252215: Add screensaver projects to manifest
...
* commit 'd92522153d90079caf128310964d31c826028ec9':
Add screensaver projects to manifest
2012-08-15 19:55:52 -07:00
Daniel Sandler
d92522153d
Add screensaver projects to manifest
...
Change-Id: I9ac5374c7d73262811420f81ce435820c7160a5d
2012-08-15 16:18:44 -04:00
Chad Jones
4f62b3fe12
Add packages/apps/{ContactsCommon,Dialer}
2012-08-14 15:15:37 -07:00
Jean-Baptiste Queru
51a93006ab
am 0c4ab2b9: am 8d264993: am 8fdd6113: resolved conflicts for merge of bf8697a5 to jb-dev-plus-aosp
...
* commit '0c4ab2b9c8a6ae66bd18516d092f19786f9fa272':
Add device/sony/lt26
2012-08-14 13:52:13 -07:00
Jean-Baptiste Queru
0c4ab2b9c8
am 8d264993: am 8fdd6113: resolved conflicts for merge of bf8697a5 to jb-dev-plus-aosp
...
* commit '8d264993bf355d9afc828f0dde36426104ab4284':
Add device/sony/lt26
2012-08-14 13:50:06 -07:00
Jean-Baptiste Queru
8d264993bf
am 8fdd6113: resolved conflicts for merge of bf8697a5 to jb-dev-plus-aosp
...
* commit '8fdd6113eb2313740712cf10c84d974d280dd0f4':
Add device/sony/lt26
2012-08-14 13:48:36 -07:00
Jean-Baptiste Queru
8fdd6113eb
resolved conflicts for merge of bf8697a5 to jb-dev-plus-aosp
...
Change-Id: I46a1b0b86ebce629f1e60eccecbc2048d551af81
2012-08-14 13:46:33 -07:00
Jean-Baptiste Queru
bf8697a506
am 62640257: Add device/sony/lt26
...
* commit '62640257bc2e78217d40201890df1a5384890bf6':
Add device/sony/lt26
2012-08-14 13:40:51 -07:00
Jean-Baptiste Queru
62640257bc
Add device/sony/lt26
...
Change-Id: Ic47482e4b57580df872fdcbdacc19b697bc237c5
2012-08-14 13:38:33 -07:00
The Android Open Source Project
7d0d8f01e2
Add device/sony/lt26
...
Change-Id: Ic2df575e230c31e8288f3580daa1872c83ad4482
2012-08-14 11:22:36 -07:00
Chad Jones
76ce3af1fd
Add device/sony/lt26
2012-08-14 10:35:48 -07:00
Chad Jones
5ac5e2e414
am 56b55c29: am 8f067e62: Mark external/bluetooth/bluedroid and vendor/broadcom/libbt-vendor as group broadcom_bt
...
* commit '56b55c29f3eb29285d0260831f580f4a98366f80':
Mark external/bluetooth/bluedroid and vendor/broadcom/libbt-vendor as group broadcom_bt
2012-08-13 11:05:16 -07:00
Chad Jones
56b55c29f3
am 8f067e62: Mark external/bluetooth/bluedroid and vendor/broadcom/libbt-vendor as group broadcom_bt
...
* commit '8f067e6250d00dbf21a5853bd89f24d2e94f474b':
Mark external/bluetooth/bluedroid and vendor/broadcom/libbt-vendor as group broadcom_bt
2012-08-13 11:04:15 -07:00
Chad Jones
8f067e6250
Mark external/bluetooth/bluedroid and vendor/broadcom/libbt-vendor as group broadcom_bt
...
Bug: 6977303
2012-08-13 10:07:26 -07:00
Jean-Baptiste Queru
9bd2efb7eb
Merge "Add external/chromium_org and frameworks/webview to master manifest"
2012-08-13 09:30:35 -07:00
Iliyan Malchev
1703c26090
Merge "Remove dead qualcomm-specific code."
2012-08-11 14:54:08 -07:00
Elliott Hughes
a29e4f8e8d
Remove dead qualcomm-specific code.
2012-08-10 15:57:08 -07:00
Chad Jones
b6440bb27d
am b1047b08: am 15d79db9: Switch OneUp to directly use froyo-ub-gcore-asiago until automerger can be setup
...
* commit 'b1047b08f5af7f189dacc616b6aaef71a72b46a6':
Switch OneUp to directly use froyo-ub-gcore-asiago until automerger can be setup
2012-08-09 15:01:19 -07:00
Chad Jones
b1047b08f5
am 15d79db9: Switch OneUp to directly use froyo-ub-gcore-asiago until automerger can be setup
...
* commit '15d79db948ef2ac63e2e19acea80496e0d9503f1':
Switch OneUp to directly use froyo-ub-gcore-asiago until automerger can be setup
2012-08-09 14:59:08 -07:00
Chad Jones
15d79db948
Switch OneUp to directly use froyo-ub-gcore-asiago until automerger can be setup
...
Change-Id: I3e79408016a8a23a9840e3dcbafe18e1df92e988
2012-08-09 11:25:28 -07:00
Steve Block
377668c5c7
Add external/chromium_org and frameworks/webview to master manifest
...
Bug: 6817922
2012-08-09 16:12:44 +01:00
Chad Jones
1a340563cf
Merge "Revert "Revert "Drop external/astl"" (Reapply)"
2012-08-08 16:56:42 -07:00
Chad Jones
f32530dfaf
Revert "Revert "Drop external/astl"" (Reapply)
...
This reverts commit 4028403ecb
2012-08-08 16:56:22 -07:00
Keun young Park
2a70dafbe1
am df5c835c: am 934f8720: add device/generic/x86, mips to PDK
...
* commit 'df5c835c53f9942bfbbd60903019a32b0f852fb8':
add device/generic/x86, mips to PDK
2012-08-08 15:26:25 -07:00
Keun young Park
df5c835c53
am 934f8720: add device/generic/x86, mips to PDK
...
* commit '934f8720e4fab43647653561b52c3f79bd5a3407':
add device/generic/x86, mips to PDK
2012-08-08 15:24:43 -07:00
Chad Jones
4028403ecb
Revert "Drop external/astl"
...
This reverts commit 4bef1789e6
2012-08-08 13:31:49 -07:00
Keun young Park
934f8720e4
add device/generic/x86, mips to PDK
...
- for x86 / mips support
Bug: 6729274,6728644
2012-08-08 13:02:21 -07:00
Chad Jones
4bef1789e6
Drop external/astl
2012-08-08 12:03:21 -07:00
John Grossman
78df3fcf40
am 0756c444: am c1f6e817: Merge "Add device/google/phantasm (Nexus Q) to the jb-mr1-dev manifest" into jb-mr1-dev
...
* commit '0756c4440920225e75bc079b82fc3520bf60feff':
Add device/google/phantasm (Nexus Q) to the jb-mr1-dev manifest
2012-08-07 15:22:34 -07:00
John Grossman
0756c44409
am c1f6e817: Merge "Add device/google/phantasm (Nexus Q) to the jb-mr1-dev manifest" into jb-mr1-dev
...
* commit 'c1f6e817af71b07623357a8ca6cf42fdca39a9f8':
Add device/google/phantasm (Nexus Q) to the jb-mr1-dev manifest
2012-08-07 14:41:08 -07:00
John Grossman
c1f6e817af
Merge "Add device/google/phantasm (Nexus Q) to the jb-mr1-dev manifest" into jb-mr1-dev
2012-08-07 14:39:16 -07:00
Jason Simmons
5ff512195b
Add device/google/phantasm (Nexus Q) to the jb-mr1-dev manifest
...
Change-Id: Ib08c06d16a2330cab639cd57a94f224131289dab
2012-08-07 14:34:53 -07:00
Chad Jones
bf3225cc7d
am d1ad6db7: am fd1fe237: resolved conflicts for merge of 426a38b3 to jb-mr1-dev
...
* commit 'd1ad6db7d676adc772d5965c331692071b4cc37f':
Change PDK group for tilapia to include in grouper PDK push
2012-08-07 10:55:42 -07:00
Chad Jones
d1ad6db7d6
am fd1fe237: resolved conflicts for merge of 426a38b3 to jb-mr1-dev
...
* commit 'fd1fe2375283f8e4f236dbdeeee3186c2f359adf':
Change PDK group for tilapia to include in grouper PDK push
2012-08-07 10:54:06 -07:00
Chad Jones
fd1fe23752
resolved conflicts for merge of 426a38b3 to jb-mr1-dev
2012-08-07 10:52:15 -07:00
Chad Jones
426a38b398
am 376cf7c0: Change PDK group for tilapia to include in grouper PDK push
...
* commit '376cf7c051fc66a84931c5608fdea98663503f9e':
Change PDK group for tilapia to include in grouper PDK push
2012-08-07 10:47:54 -07:00
Chad Jones
376cf7c051
Change PDK group for tilapia to include in grouper PDK push
2012-08-07 10:19:23 -07:00
Keun young Park
4acd2abcdd
am 8c27e9e8: am cfde76f5: Merge "add external/e2fsprogs to PDK" into jb-mr1-dev
...
* commit '8c27e9e821af214d265695c2cb02146e28be1335':
add external/e2fsprogs to PDK
2012-08-07 09:46:17 -07:00
Keun young Park
8c27e9e821
am cfde76f5: Merge "add external/e2fsprogs to PDK" into jb-mr1-dev
...
* commit 'cfde76f55c28a948ea7d1816b0bce3447149ab0f':
add external/e2fsprogs to PDK
2012-08-07 09:45:00 -07:00
Keun young Park
cfde76f55c
Merge "add external/e2fsprogs to PDK" into jb-mr1-dev
2012-08-07 09:43:18 -07:00
Jean-Baptiste Queru
425b0bdbc0
am 30f629e0: am 92b964a3: Add new projects from AOSP
...
* commit '30f629e0592412b6e767d814d3d21070eb8cfa28':
Add new projects from AOSP
2012-08-07 08:00:26 -07:00
Jean-Baptiste Queru
30f629e059
am 92b964a3: Add new projects from AOSP
...
* commit '92b964a394298b2a3f97807e401a08a033a65880':
Add new projects from AOSP
2012-08-07 07:59:22 -07:00
Keun young Park
3bdc55b835
add external/e2fsprogs to PDK
...
- maguro PDK needs this to make sdcard work
2012-08-06 18:01:34 -07:00
Jean-Baptiste Queru
92b964a394
Add new projects from AOSP
...
Change-Id: If1807721263cf6799c3d3f428e9501fcd66db98d
2012-08-06 15:42:20 -07:00
Chad Jones
84eaed1789
am 4f44546b: am 751f6898: resolved conflicts for merge of 19efcf43 to jb-mr1-dev
...
* commit '4f44546b095a1f54e49f3d3bcbde374bbe0130a2':
Add asus/tilapia, drop asus/grouper3g
2012-08-06 14:47:47 -07:00
Chad Jones
4f44546b09
am 751f6898: resolved conflicts for merge of 19efcf43 to jb-mr1-dev
...
* commit '751f689801a748726b09d255e53d8178ef2008f0':
Add asus/tilapia, drop asus/grouper3g
2012-08-06 14:46:20 -07:00
Chad Jones
751f689801
resolved conflicts for merge of 19efcf43 to jb-mr1-dev
...
Change-Id: I65a6125e89f3d8a4bb4a0b13907542c4cf0ea92b
2012-08-06 14:43:21 -07:00
Chad Jones
19efcf438d
am e6b6ed5c: Add asus/tilapia, drop asus/grouper3g
...
* commit 'e6b6ed5c3f5ac6233f10614f78a7da43bae6f972':
Add asus/tilapia, drop asus/grouper3g
2012-08-06 14:29:54 -07:00
Chad Jones
e6b6ed5c3f
Add asus/tilapia, drop asus/grouper3g
2012-08-06 12:18:51 -07:00
Jean-Baptiste Queru
465d026104
am 449a0062: (-s ours) am 3abca0b3: am bc841093: (-s ours) Add new projects to match AOSP - do not merge
...
* commit '449a006281bfd911e7a562044ba6810acfee5d8f':
Add new projects to match AOSP - do not merge
2012-08-06 08:49:28 -07:00
Jean-Baptiste Queru
449a006281
am 3abca0b3: am bc841093: (-s ours) Add new projects to match AOSP - do not merge
...
* commit '3abca0b39374934370b82eb384c4de20331c43dc':
Add new projects to match AOSP - do not merge
2012-08-06 08:48:00 -07:00
Jean-Baptiste Queru
3abca0b393
am bc841093: (-s ours) Add new projects to match AOSP - do not merge
...
* commit 'bc841093aeb9a01ce633109bc3da0f6148dbafce':
Add new projects to match AOSP - do not merge
2012-08-06 08:45:54 -07:00
Jean-Baptiste Queru
bc841093ae
Add new projects to match AOSP - do not merge
...
Change-Id: I1e2a550f91fad2bab333ad61ecfd213f20c45134
2012-08-03 17:12:56 -07:00
Chad Jones
4e7e380199
am 9c78ac54: am e7db6ee9: Merge "Add platform/prebuilts/clang/{darwin,linux}-x86/{3.1,3.2}" into jb-mr1-dev
...
* commit '9c78ac54662833b6a7b08d4bad0dae292a2d541c':
Add platform/prebuilts/clang/{darwin,linux}-x86/{3.1,3.2}
2012-08-03 15:06:17 -07:00
Chad Jones
9c78ac5466
am e7db6ee9: Merge "Add platform/prebuilts/clang/{darwin,linux}-x86/{3.1,3.2}" into jb-mr1-dev
...
* commit 'e7db6ee9d3526402c467480289d40125492136f0':
Add platform/prebuilts/clang/{darwin,linux}-x86/{3.1,3.2}
2012-08-03 14:58:01 -07:00
Chad Jones
e7db6ee9d3
Merge "Add platform/prebuilts/clang/{darwin,linux}-x86/{3.1,3.2}" into jb-mr1-dev
2012-08-03 14:55:31 -07:00
Chad Jones
1330ac9ddc
am 0dccdaca: am f57a0f3b: am 55576fc4: am 6557478c: Add device/samsung/toroplus and platform/vendor/samsung/toroplus
...
* commit '0dccdaca162602eb7adf5ef43d8bbdd4dd4d056f':
Add device/samsung/toroplus and platform/vendor/samsung/toroplus
2012-08-03 14:45:18 -07:00
Chad Jones
0dccdaca16
am f57a0f3b: am 55576fc4: am 6557478c: Add device/samsung/toroplus and platform/vendor/samsung/toroplus
...
* commit 'f57a0f3b3f0ff5d8ed34046ea211093dc81b17d8':
Add device/samsung/toroplus and platform/vendor/samsung/toroplus
2012-08-03 14:42:25 -07:00
Chad Jones
f57a0f3b3f
am 55576fc4: am 6557478c: Add device/samsung/toroplus and platform/vendor/samsung/toroplus
...
* commit '55576fc4c3493ec2ecaeeea093151f6821e4877e':
Add device/samsung/toroplus and platform/vendor/samsung/toroplus
2012-08-03 14:40:05 -07:00
Chad Jones
55576fc4c3
am 6557478c: Add device/samsung/toroplus and platform/vendor/samsung/toroplus
...
* commit '6557478cf4a595c6aa7ef5fd2cad5770f0f885d7':
Add device/samsung/toroplus and platform/vendor/samsung/toroplus
2012-08-03 14:37:59 -07:00
Chad Jones
d88d796265
Add platform/prebuilts/clang/{darwin,linux}-x86/{3.1,3.2}
2012-08-03 14:36:58 -07:00
Chad Jones
6557478cf4
Add device/samsung/toroplus and platform/vendor/samsung/toroplus
...
Change-Id: I337a7224072906060b3dd7c478f9deb83b1b8a17
2012-08-03 14:13:02 -07:00
Jean-Baptiste Queru
bb70cda76d
am 5b0c1fc7: (-s ours) am ae8ac482: am df4fc972: (-s ours) am b686b401: (-s ours) Sync manifest with AOSP master - do not merge
...
* commit '5b0c1fc7fd1f9b14a0814f9ad157d80f2f92fc8b':
Sync manifest with AOSP master - do not merge
2012-08-03 14:05:33 -07:00
Jean-Baptiste Queru
5b0c1fc7fd
am ae8ac482: am df4fc972: (-s ours) am b686b401: (-s ours) Sync manifest with AOSP master - do not merge
...
* commit 'ae8ac482651c43eb7b939c4e9206d78561dfc3f2':
Sync manifest with AOSP master - do not merge
2012-08-03 14:03:44 -07:00
Jean-Baptiste Queru
ae8ac48265
am df4fc972: (-s ours) am b686b401: (-s ours) Sync manifest with AOSP master - do not merge
...
* commit 'df4fc97205d547385fa42bd84b767a74db510a81':
Sync manifest with AOSP master - do not merge
2012-08-03 14:02:18 -07:00
Jean-Baptiste Queru
df4fc97205
am b686b401: (-s ours) Sync manifest with AOSP master - do not merge
...
* commit 'b686b401e62c349544bc9583d7d17086384d34a9':
Sync manifest with AOSP master - do not merge
2012-08-03 13:59:46 -07:00
Jean-Baptiste Queru
b686b401e6
Sync manifest with AOSP master - do not merge
...
Change-Id: Ib9b58b71ee3c3c758ee2f6fa08dc03a1aff72f48
2012-08-03 13:52:34 -07:00
Chad Jones
620ea6e2fe
am e32ae2b9: Empty commit to prompt build
...
* commit 'e32ae2b9d88197e442ef11c1c8d80bd20f844d10':
Empty commit to prompt build
2012-08-03 13:35:30 -07:00
The Android Automerger
5fefca6e7f
am 8e782a3e: (-s ours) am b21c7e0a: am 68169fc3: no-op merge
...
* commit '8e782a3ec850898e19125c25c4c5ac5d9c404a71':
Sync manifest with AOSP master - do not merge
Change review URL to https://googleplex-android-review.googlesource.com/
Change review URL to https://googleplex-android.googlesource.com/
2012-08-03 10:59:21 -07:00
Chad Jones
729abb65a7
am ff41933f: am ff4b4434: Empty commit to prompt build
...
* commit 'ff41933f7724c64439f362e8b44965491b14feb5':
Empty commit to prompt build
2012-08-03 10:59:19 -07:00
The Android Automerger
8e782a3ec8
am b21c7e0a: am 68169fc3: no-op merge
...
* commit 'b21c7e0a4f8e4e18f6e422fadde38d37b401d088':
Sync manifest with AOSP master - do not merge
Change review URL to https://googleplex-android-review.googlesource.com/
Change review URL to https://googleplex-android.googlesource.com/
2012-08-03 10:56:49 -07:00
The Android Automerger
b21c7e0a4f
am 68169fc3: no-op merge
...
* commit '68169fc39e90ba269787e70fea9e0c23c724d34e':
Sync manifest with AOSP master - do not merge
Change review URL to https://googleplex-android-review.googlesource.com/
Change review URL to https://googleplex-android.googlesource.com/
2012-08-03 10:54:26 -07:00
The Android Automerger
68169fc39e
no-op merge
2012-08-03 10:51:16 -07:00
Jean-Baptiste Queru
28d56cfb2c
am 9b06122b: (-s ours) Sync manifest with AOSP master - do not merge
...
* commit '9b06122b9cc2826d5c887b53a7288998564c1b89':
Sync manifest with AOSP master - do not merge
2012-08-03 10:28:57 -07:00
The Android Open Source Project
87ea75948d
Merge from master
...
Change-Id: I0958c123291c4825727ec1945f7a0feead3c535d
2012-08-03 09:51:39 -07:00
Chad Jones
e32ae2b9d8
Empty commit to prompt build
2012-08-03 09:48:44 -07:00
Jean-Baptiste Queru
9b06122b9c
Sync manifest with AOSP master - do not merge
...
Change-Id: Ib9b58b71ee3c3c758ee2f6fa08dc03a1aff72f48
2012-08-02 18:41:38 -07:00
The Android Open Source Project
73ce405ee0
give tools/build its own group
...
Change-Id: I5151c4feafd25689d94342b0a3d7ca269ecb34ec
2012-08-02 18:31:28 -07:00
Jean-Baptiste Queru
a673be7f56
Merge "add external/okhttp"
2012-08-02 16:56:21 -07:00
Chad Jones
035d8ec232
am 0bf9877f: am 53010b8a: Empty commit to trigger build
...
* commit '0bf9877f5e6733ab1152137cf913a3eabcadacbe':
Empty commit to trigger build
2012-08-02 15:08:30 -07:00
The Android Open Source Project
d479f201d0
Update projects
...
Change-Id: I3aa353289da4c4089a922c93101bfbf6d97fffbb
2012-08-02 14:09:40 -07:00
Ed Heyl
c7a79cc0ea
add external/okhttp
2012-08-02 13:04:06 -07:00
Chad Jones
ff41933f77
am ff4b4434: Empty commit to prompt build
...
* commit 'ff4b4434f2078d3f70f24b52e2a23150adaf159a':
Empty commit to prompt build
2012-08-02 01:21:30 -07:00
Chad Jones
ff4b4434f2
Empty commit to prompt build
2012-08-02 01:08:58 -07:00
Chad Jones
0bf9877f5e
am 53010b8a: Empty commit to trigger build
...
* commit '53010b8a74c1bdab7dc5fdc5ef4397479dd59db5':
Empty commit to trigger build
2012-08-02 00:03:10 -07:00
Chad Jones
53010b8a74
Empty commit to trigger build
2012-08-02 00:00:46 -07:00
The Android Open Source Project
25a5770cea
Add manifest groups.
...
This makes it possible to download fewer of the projects.
Groups currently supported:
-device: projects that are specific to flagship devices.
-darwin: tools are that only used on darwin hosts.
-linux: tools that are only used on linux hosts.
-arm: tools that are only used for ARM targets.
-mips: tools that are only used for MIPS targets.
-x86: tools that are only used for IA targets.
Change-Id: I8ed1229a7306bd465a4cb7cb992819e720c88769
2012-08-01 10:04:53 -07:00
Ed Heyl
3c02ffe5ac
am 01b0abb1: am 2d6f5165: am 4f600dba: Merge remote-tracking branch \'goog/jb-dev\' into jb-dev-plus-aosp
...
* commit '01b0abb158e74b2d87f99cad14c8c5249eccfe21':
Add asus/grouper3g projects
Change review URL to https://googleplex-android.googlesource.com/
Change review URL to https://googleplex-android.googlesource.com/
2012-08-01 08:23:08 -07:00
Ed Heyl
01b0abb158
am 2d6f5165: am 4f600dba: Merge remote-tracking branch \'goog/jb-dev\' into jb-dev-plus-aosp
...
* commit '2d6f51655e78742e00dac0b2cb5e1db3b9be45cf':
Add asus/grouper3g projects
Change review URL to https://googleplex-android.googlesource.com/
Change review URL to https://googleplex-android.googlesource.com/
2012-08-01 08:18:22 -07:00
Ed Heyl
2d6f51655e
am 4f600dba: Merge remote-tracking branch \'goog/jb-dev\' into jb-dev-plus-aosp
...
* commit '4f600dba2e1d1d90786b8aaf55315369f1619fe1':
Add asus/grouper3g projects
Change review URL to https://googleplex-android.googlesource.com/
Change review URL to https://googleplex-android.googlesource.com/
2012-08-01 08:16:25 -07:00
Ed Heyl
4f600dba2e
Merge remote-tracking branch 'goog/jb-dev' into jb-dev-plus-aosp
...
Conflicts:
default.xml
2012-08-01 08:12:44 -07:00
Ed Heyl
7c513c6cd5
empty merge conflict
2012-08-01 08:02:04 -07:00
Mike J. Chen
569c81cabe
Use ics-aah revision for device/google/phantasm and external/arduino
...
Change-Id: I053c03c237c5b197cc1d0d4e98f8953ba965c5f0
Signed-off-by: Mike J. Chen <mjchen@google.com >
2012-07-31 17:15:58 -07:00
Chad Jones
3ccaeecd6a
am 3d3902ad: am 59fbc067: Add device/generic/mips and device/generic/x86
...
* commit '3d3902ad15b57f82ea07a289234f824922e1bf05':
Add device/generic/mips and device/generic/x86
2012-07-31 16:42:23 -07:00
Chad Jones
3d3902ad15
am 59fbc067: Add device/generic/mips and device/generic/x86
...
* commit '59fbc067cf64ad49691221f6569088fd748545f3':
Add device/generic/mips and device/generic/x86
2012-07-31 16:41:17 -07:00
Chad Jones
59fbc067cf
Add device/generic/mips and device/generic/x86
2012-07-31 16:35:10 -07:00
Chad Jones
3f597760ce
am 4eaa9369: am f2458e88: Add frameworks/compile/llvm-ndk-cc
...
* commit '4eaa936911d4551e8cd7f7e5a4a0d80d399fc040':
Add frameworks/compile/llvm-ndk-cc
2012-07-31 12:20:45 -07:00
Chad Jones
4eaa936911
am f2458e88: Add frameworks/compile/llvm-ndk-cc
...
* commit 'f2458e8864577327588c16bf5ac079bfb2f51273':
Add frameworks/compile/llvm-ndk-cc
2012-07-31 12:19:50 -07:00
Chad Jones
f2458e8864
Add frameworks/compile/llvm-ndk-cc
2012-07-31 11:47:27 -07:00
Chad Jones
c526a15eb0
Add device/google/phantasm and external/arduino (revsion=master)
2012-07-31 11:30:34 -07:00
Chad Jones
9f133c2e51
Add asus/grouper3g projects
2012-07-31 11:15:31 -07:00
Ed Heyl
07befd8b85
am e2d89dae: am 621133f8: updates for mako
...
* commit 'e2d89dae3160c89187b03c122c02a0b3d9fb5400':
updates for mako
2012-07-29 22:37:01 -07:00
Ed Heyl
e2d89dae31
am 621133f8: updates for mako
...
* commit '621133f8ec4f44c6201b8c4e7b0bdcb9cfca8f6f':
updates for mako
2012-07-29 22:33:17 -07:00
Ed Heyl
621133f8ec
updates for mako
...
Change-Id: I3ea58c3a5b3813cefd950bc64050cbd6638e77e5
2012-07-27 20:49:53 -07:00
The Android Open Source Project
ce42277e6b
Add motodev
...
Change-Id: I290c1f306476f5405d5146524df41cac1cc6d3ef
2012-07-27 15:16:19 -07:00
Martijn Coenen
330ee31b1a
am 6a5f1e5b: (-s ours) am 4fe52ef7: Add external/libnfc-nci and hardware/broadcom/nfc (DO NOT MERGE).
...
* commit '6a5f1e5b285a28d1404c594f0db500981a204e63':
Add external/libnfc-nci and hardware/broadcom/nfc (DO NOT MERGE).
2012-07-26 16:56:51 -07:00
Martijn Coenen
6a5f1e5b28
am 4fe52ef7: Add external/libnfc-nci and hardware/broadcom/nfc (DO NOT MERGE).
...
* commit '4fe52ef70067f093eee7068fba14dac3baa09838':
Add external/libnfc-nci and hardware/broadcom/nfc (DO NOT MERGE).
2012-07-26 16:51:28 -07:00
Martijn Coenen
4fe52ef700
Add external/libnfc-nci and hardware/broadcom/nfc (DO NOT MERGE).
...
Change-Id: Ia5452ce5d506edac8b092545349d852cbe67733c
2012-07-26 16:29:53 -07:00
Chad Jones
200746c7d7
Add external/libnfc-nci and hardware/broadcom/nfc
2012-07-25 10:31:29 -07:00
Ed Heyl
a29266ada3
Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp'
2012-07-24 21:52:48 -07:00
Ed Heyl
368233b463
Merge remote-tracking branch 'goog/jb-mr1-dev' into jb-mr1-dev-plus-aosp
2012-07-24 21:51:23 -07:00
Ed Heyl
2803971861
Merge remote-tracking branch 'goog/jb-dev-plus-aosp' into jb-mr1-dev
2012-07-24 21:50:05 -07:00
Ed Heyl
b0b381f007
jb-mr1-dev-plus-aosp
2012-07-24 21:48:47 -07:00
Ed Heyl
ed1a164f7b
jb-mr1-dev
2012-07-24 21:47:32 -07:00
Chad Jones
ffd568bd82
Add packages/apps/PhoneCommon
2012-07-20 15:44:36 -07:00
Jean-Baptiste Queru
bc32fb2a7f
Remove obsolete BT projects
...
They're already empty
Change-Id: Ie309f94aaa1ec73f451645fc807fb504caf97b3e
2012-07-19 13:27:32 -07:00
Keun young Park
0bfd0e051d
add mesa3d to PDK
...
Bug: 6842838
2012-07-18 16:14:44 -07:00
Chad Jones
ce553070c6
Update review URL to https://googleplex-android-review.googlesource.com/
2012-07-18 12:09:27 -07:00
Chad Jones
c08d9b8ff2
Change review URL to https://googleplex-android-review.googlesource.com/
2012-07-18 11:17:29 -07:00
Chad Jones
da84c7fb38
Change review URL to https://googleplex-android-review.googlesource.com/
2012-07-18 11:10:33 -07:00
Chad Jones
d64db68a43
Change review URL to https://googleplex-android-review.googlesource.com/
2012-07-18 10:50:03 -07:00
Chad Jones
3cb6077afc
Change review URL to https://googleplex-android.googlesource.com/
2012-07-18 10:28:45 -07:00
Chad Jones
5d4567a411
Change review URL to https://googleplex-android.googlesource.com/
2012-07-18 09:48:09 -07:00
Chad Jones
f080eaeee2
Change review URL to https://googleplex-android.googlesource.com/
2012-07-18 09:43:23 -07:00
Chad Jones
cb7ad53648
Change review URL to https://googleplex-android.googlesource.com/
2012-07-18 09:41:00 -07:00
Chad Jones
c23a6fc7ce
Merge "Change review URL to https://googleplex-android.googlesource.com/ "
2012-07-18 09:10:02 -07:00
Chad Jones
cece53c1d9
Change review URL to https://googleplex-android.googlesource.com/
2012-07-18 09:08:40 -07:00
Chad Jones
8eea6fe40f
Change review URL to https://googleplex-android.googlesource.com/
2012-07-18 08:52:39 -07:00
Chad Jones
127b9ce3ae
Change review URL to https://googleplex-android.googlesource.com/
2012-07-18 08:52:28 -07:00
Chad Jones
b337e5c008
Add external/eigen
2012-07-17 16:01:36 -07:00
Keun young Park
6813912378
add mclinker to PDK
...
Bug: 6834769
2012-07-17 13:23:02 -07:00
Ed Heyl
838c098102
Merge "point Camera, Gallery2, and GalleryGoogle to unbundled branch"
2012-07-13 13:33:32 -07:00
Cyrus Master
113c938df4
am 043b9e78: (-s ours) Use jb-dev instead of jb-release for the GSF library in the gorillaz branch in order to fix a build breakage.
...
* commit '043b9e788779df3a4c3a72927be4e648bf442264':
Use jb-dev instead of jb-release for the GSF library in the gorillaz branch in order to fix a build breakage.
2012-07-13 13:26:05 -07:00
Cyrus Master
043b9e7887
Use jb-dev instead of jb-release for the GSF library in the gorillaz
...
branch in order to fix a build breakage.
2012-07-13 14:08:28 -06:00
Cyrus Master
98f11a43fc
am 0afffc34: (-s ours) Updates the manifest for the unbundled Gorillaz music branch.
...
* commit '0afffc348fd911b4099e74e180e412938cbdd28d': (25 commits)
Updates the manifest for the unbundled Gorillaz music branch.
Change Music2 to froyo-ub-music-gorillaz branch
Add mediarouter
Update AtHome to ics-aah-release
Replace URL with relative path
Switch to jb-dev's version of support library
Initial manifest for jb-dev-ub-music2.
Add support library to our manifest
Add play to master-ub-music2
Add at home to master-ub-music2
Add vendor/unbundled_google/libs/carouselgl
Now prebuilt SDKs are in their own git project.
Fix master-ub-music2
Create master-ub-music2
Include easy mock in unbundled branch
Add guava and jsr dependencies
default branch should by honeycomb-mr1
Track honeycomb.
set build project to gingerbread
remove jumper
...
2012-07-13 12:46:53 -07:00
Ed Heyl
fc476dec7e
point Camera, Gallery2, and GalleryGoogle to unbundled branch
2012-07-13 10:46:16 -07:00
Cyrus Master
0afffc348f
Updates the manifest for the unbundled Gorillaz music branch.
...
This change is similar to one made recently for our jb-dev unbundled
branch. It takes the platform from jb-release by default, and points
to release-esque branch of the AAH core library and media router.
2012-07-11 13:51:19 -07:00
Jean-Baptiste Queru
cb98990dfc
am 655b2f36: (-s ours) am 01015e34: (-s ours) am 6691defd: (-s ours) Manifest for Jelly Bean AOSP master - DO NOT MERGE
...
* commit '655b2f3616c43448f80095dc78342c2a512fac03':
2012-07-10 07:49:10 -07:00
Jean-Baptiste Queru
655b2f3616
am 01015e34: (-s ours) am 6691defd: (-s ours) Manifest for Jelly Bean AOSP master - DO NOT MERGE
...
* commit '01015e34868469018f16196560f0c20457028912':
2012-07-10 07:46:28 -07:00
Jean-Baptiste Queru
01015e3486
am 6691defd: (-s ours) Manifest for Jelly Bean AOSP master - DO NOT MERGE
...
* commit '6691defd6eb8c1a354d652055e885d67a8f0a24c':
2012-07-10 00:31:48 -07:00
Jean-Baptiste Queru
6691defd6e
Manifest for Jelly Bean AOSP master - DO NOT MERGE
2012-07-09 18:31:53 -07:00
The Android Open Source Project
b76792303e
Merge from master
...
Change-Id: I89eab219489eb53f72ec16edf9a2d514963e7070
2012-07-09 17:44:11 -07:00
The Android Open Source Project
6f056451e4
Update manifest for Jelly Bean
...
Change-Id: Idcfb658e668e678d168946b6a6fd6850ef036850
2012-07-09 16:34:06 -07:00
Jean-Baptiste Queru
2b88e97d33
am f7d5ec24: Merge from stage-aosp-master
...
* commit 'f7d5ec24d28d2a98b1a2520278bdddec75c71aaa':
Manifest for stage-aosp-master for JB
2012-07-04 08:00:53 -07:00
Jean-Baptiste Queru
f7d5ec24d2
Merge from stage-aosp-master
...
Change-Id: I8b24e06b116b6c8ed4188f1735e2c7bd85fca596
2012-07-04 07:57:29 -07:00
Jean-Baptiste Queru
c8d1e0718b
Manifest for stage-aosp-master for JB
...
Change-Id: I817df46a6d5e4d725b5326b0e31c401206723287
2012-07-04 06:45:58 -07:00
Jean-Baptiste Queru
757737b6b8
Update mirror-aosp-jb-dev manifest
...
Change-Id: I6f1e015f76994304ff5753c00be73986f3aeea7e
2012-07-03 18:36:16 -07:00
Jean-Baptiste Queru
14a9daffcd
am 05d851db: am 58f16255: am 9b35c505: Add new projects
...
* commit '05d851dbc5c69adfbedcf4301a6e7a85e39f1e6c':
Add new projects
2012-06-27 10:50:20 -07:00
Jean-Baptiste Queru
05d851dbc5
am 58f16255: am 9b35c505: Add new projects
...
* commit '58f16255c87332d28edbe2705f3278ed8a0826d2':
Add new projects
2012-06-27 10:46:57 -07:00
Jean-Baptiste Queru
58f16255c8
am 9b35c505: Add new projects
...
* commit '9b35c5055a2ad7526b0a1a5a350241d423b20dc2':
Add new projects
2012-06-27 10:43:29 -07:00
The Android Open Source Project
3954196889
Add aac and gcc-demangle
...
Change-Id: Ia98561e4052ea9cf19b1b237cd3488649aaec34e
2012-06-27 10:16:58 -07:00
Jean-Baptiste Queru
9b35c5055a
Add new projects
...
Change-Id: Ia15c607242be566a17a18b7d6c1f1959202f377c
2012-06-27 09:58:23 -07:00
Jean-Baptiste Queru
073dcf0998
am 22c27e11: (-s ours) am 89929477: (-s ours) Add gcc-demangle - DO NOT MERGE
...
* commit '22c27e11cd421d32ab2508250dc093ef5a87739f':
Add gcc-demangle - DO NOT MERGE
2012-06-26 16:08:47 -07:00
Jean-Baptiste Queru
22c27e11cd
am 89929477: (-s ours) Add gcc-demangle - DO NOT MERGE
...
* commit '8992947737974916f371f0d05883baec3180dc0e':
Add gcc-demangle - DO NOT MERGE
2012-06-26 16:07:12 -07:00
Jean-Baptiste Queru
8992947737
Add gcc-demangle - DO NOT MERGE
...
Change-Id: Id81fc692831c9313ee886b2f735c246c7f8f01fc
2012-06-26 16:04:16 -07:00
Jean-Baptiste Queru
481abaeec2
am 4f348b91: (-s ours) am ac3406ea: (-s ours) Add external/aac - DO NOT MERGE
...
* commit '4f348b91b369799682c08fb55190e8e4c171bb82':
Add external/aac - DO NOT MERGE
2012-06-26 16:03:56 -07:00
Jean-Baptiste Queru
4f348b91b3
am ac3406ea: (-s ours) Add external/aac - DO NOT MERGE
...
* commit 'ac3406ea44807e45700ba53412e8ff174b534387':
Add external/aac - DO NOT MERGE
2012-06-26 16:01:22 -07:00
Jean-Baptiste Queru
ac3406ea44
Add external/aac - DO NOT MERGE
...
Change-Id: I1e71a1b506fdf8a0bbd529b8cba426be9512f995
2012-06-26 15:57:29 -07:00
Ying Wang
f4384950f0
am acd70ce7: am a20d4de9: Revert "Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core""
...
* commit 'acd70ce79405b2183514db0a0eb474ddcf1cbbc0':
Revert "Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core""
2012-06-21 16:47:29 -07:00
Ying Wang
fe5bcec398
am ce3efad0: am 7033817d: Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core"
...
* commit 'ce3efad0da533bbc2e5ca77297b17ca3366e9a79':
Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core"
2012-06-21 16:47:28 -07:00
Jean-Baptiste Queru
6011a232c6
am d5800412: (-s ours) am 7b46f528: (-s ours) Revert "am bc2610a5: Switch to proper mirrors for dalvik/libcore" - DO NOT MERGE
...
* commit 'd5800412a28c52f6a19109c32da416ae6a5ae225':
Revert "am bc2610a5
2012-06-21 16:47:22 -07:00
Jean-Baptiste Queru
1d36d72998
am 381f814f: Merge from stage-aosp-master
...
* commit '381f814f74f3e972a2dc4ded6612e217ae6127da':
Switch to proper mirrors for dalvik/libcore
2012-06-21 16:47:12 -07:00
Ying Wang
acd70ce794
am a20d4de9: Revert "Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core""
...
* commit 'a20d4de9e26528ee70d1489b337c5495ae7de21a':
Revert "Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core""
2012-06-21 14:47:59 -07:00
Ying Wang
a20d4de9e2
Revert "Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core""
...
This reverts commit 7033817d5c
2012-06-21 14:45:41 -07:00
Ying Wang
ce3efad0da
am 7033817d: Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core"
...
* commit '7033817d5cfa799cb3a022d62798cb563169310b':
Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core"
2012-06-21 14:38:54 -07:00
Ying Wang
7033817d5c
Revert "remove ics-aah-mr0-release revision for AndroidAtHome/Core"
...
This reverts commit 1773c42217
2012-06-21 14:31:37 -07:00
Jean-Baptiste Queru
d5800412a2
am 7b46f528: (-s ours) Revert "am bc2610a5: Switch to proper mirrors for dalvik/libcore" - DO NOT MERGE
...
* commit '7b46f5281a75fb905b44832a6775137386bf9d10':
Revert "am bc2610a5
2012-06-21 14:17:16 -07:00
Jean-Baptiste Queru
7b46f5281a
Revert "am bc2610a5: Switch to proper mirrors for dalvik/libcore" - DO NOT MERGE
...
This reverts commit e7f0d9d210cea75f05bc
2012-06-21 13:03:17 -07:00
Jean-Baptiste Queru
381f814f74
Merge from stage-aosp-master
2012-06-21 13:02:26 -07:00
Jean-Baptiste Queru
e7f0d9d210
am bc2610a5: Switch to proper mirrors for dalvik/libcore
...
* commit 'bc2610a5b10e877d8723095ecebf79c6ea78c0f6':
Switch to proper mirrors for dalvik/libcore
2012-06-21 12:53:42 -07:00
Jean-Baptiste Queru
bc2610a5b1
Switch to proper mirrors for dalvik/libcore
2012-06-21 12:50:47 -07:00
The Android Open Source Project
0cd29e3a32
Switch to snapshots for dalvik and libcore
2012-06-21 10:20:14 -07:00
Ed Heyl
20c19e1528
am b0f21b3c: am 1773c422: remove ics-aah-mr0-release revision for AndroidAtHome/Core
...
* commit 'b0f21b3cfbc51b59cd8f54aa0d1a1e5341852a57':
remove ics-aah-mr0-release revision for AndroidAtHome/Core
2012-06-20 22:43:10 -07:00
Ed Heyl
b0f21b3cfb
am 1773c422: remove ics-aah-mr0-release revision for AndroidAtHome/Core
...
* commit '1773c42217ff6835c2903e2403f826f3c057c5f4':
remove ics-aah-mr0-release revision for AndroidAtHome/Core
2012-06-20 22:38:05 -07:00
Ed Heyl
1773c42217
remove ics-aah-mr0-release revision for AndroidAtHome/Core
2012-06-20 22:29:52 -07:00
Chad Jones
15c20ce92b
Merge "Add external/bluetooth/bluedroid and vendor/broadcom/libbt-vendor"
2012-06-20 11:43:22 -07:00
Chad Jones
53ef261e83
Add external/bluetooth/bluedroid and vendor/broadcom/libbt-vendor
2012-06-20 10:11:37 -07:00
Joe Onorato
d9a8c1d24d
am 4a20d041: (-s ours) Add mediarouter
...
* commit '4a20d041e58a6635732dcb05e14553ad4d02ec06':
Add mediarouter
2012-06-19 22:18:54 -07:00
Chad Jones
0fba485485
Change Music2 to froyo-ub-music-gorillaz branch
2012-06-19 14:11:23 -07:00
Keun young Park
a0487ec870
am 0e7b562d: am 3cdb2454: GPL compliance: add GPL components for binaries in platform.zip
...
* commit '0e7b562dd0bc9895f235b9157a558bf53e6eaa2b':
GPL compliance: add GPL components for binaries in platform.zip
2012-06-18 10:52:17 -07:00
Keun young Park
0e7b562dd0
am 3cdb2454: GPL compliance: add GPL components for binaries in platform.zip
...
* commit '3cdb2454f9d8e5fc55dd768921360137bf6c46af':
GPL compliance: add GPL components for binaries in platform.zip
2012-06-18 10:36:09 -07:00
Keun young Park
ec491a7872
GPL compliance: add GPL components for binaries in platform.zip
...
- These GPL modules are included in platform.zip as binary,
and thus require source for GPL compliance
2012-06-18 10:26:11 -07:00
Keun young Park
3cdb2454f9
GPL compliance: add GPL components for binaries in platform.zip
...
- These GPL modules are included in platform.zip as binary,
and thus require source for GPL compliance
2012-06-16 10:07:27 -07:00
Jean-Baptiste Queru
4c5236f56d
Merge from jb-dev-plus-aosp
2012-06-13 20:04:38 -07:00
Jean-Baptiste Queru
47c8453f79
Add split telephony/mms projects
2012-06-13 18:30:43 -07:00
Jean-Baptiste Queru
61b21fc149
am cea75f05: am 7b050796: Add chromium-trace
...
* commit 'cea75f05bc1b5085e02f680faca32e41803b97de':
Add chromium-trace
2012-06-13 18:06:01 -07:00
Jean-Baptiste Queru
81a601b486
am d22423a5: (-s ours) Add chromium-trace
...
* commit 'd22423a5ef337359c2f438a7a890ce54fede7b47':
Add chromium-trace
2012-06-13 18:05:05 -07:00
The Android Open Source Project
b5a0d13b2f
Add chromium-trace
2012-06-13 18:01:59 -07:00
Jean-Baptiste Queru
cea75f05bc
am 7b050796: Add chromium-trace
...
* commit '7b0507968dfbed145557a51d310080e1874ef281':
Add chromium-trace
2012-06-13 18:01:07 -07:00
Jean-Baptiste Queru
7b0507968d
Add chromium-trace
...
Change-Id: Ie6070f74cc41f07e1d817e50a7346411dfcacbd1
2012-06-13 17:58:11 -07:00
Jean-Baptiste Queru
d22423a5ef
Add chromium-trace
...
Change-Id: If1582020e0571a4ed47c9dcf0895fe649df2d97c
2012-06-13 17:57:29 -07:00
Jean-Baptiste Queru
25d2b57f4c
am d98ef073: Restore frameworks/testing
...
* commit 'd98ef0735936cd52132cf077f277885e11828145':
Restore frameworks/testing
2012-06-13 15:31:42 -07:00
Jean-Baptiste Queru
d98ef07359
Restore frameworks/testing
...
Change-Id: I2ca4665152f829fbd87e8229f72f1602fc6c5ecd
2012-06-13 15:13:08 -07:00
Stephen Hines
0f339251c4
Add compiler-rt to the pdk group.
2012-06-12 16:37:30 -07:00
Joe Onorato
4a20d041e5
Add mediarouter
...
Change-Id: I4eb7fe34f3f2fe8da38e31edeeb9ecef4d424b69
2012-06-08 11:47:13 -07:00
Joe Onorato
ba01f79b89
Add mediarouter
...
Change-Id: I0c484a647cfc4849b072550166771ba3ff051c98
2012-06-08 11:29:40 -07:00
Chad Jones
9e703acd80
am 7ba54ae5: am 69b71ff8: Add vendor/unbundled_google/libs/mediarouter
...
* commit '7ba54ae56ae093d7650d57fdb79c7c2e80825122':
Add vendor/unbundled_google/libs/mediarouter
2012-06-07 09:40:05 -07:00
Chad Jones
7ba54ae56a
am 69b71ff8: Add vendor/unbundled_google/libs/mediarouter
...
* commit '69b71ff8abef5af4324eb2881a80cf8030e09d5a':
Add vendor/unbundled_google/libs/mediarouter
2012-06-07 09:37:09 -07:00
Chad Jones
69b71ff8ab
Add vendor/unbundled_google/libs/mediarouter
2012-06-07 09:00:57 -07:00
Alice Yang
724c2d0b82
Adding Memory app back to master
2012-06-06 12:43:33 -07:00
Jean-Baptiste Queru
819e4609f4
am 37afb058: am 3b4e65c0: Add LegacyCamera
...
* commit '37afb0582f8b7b13eb92c262b48c293050c233c0':
Add LegacyCamera
2012-06-05 14:27:23 -07:00
Jean-Baptiste Queru
37afb0582f
am 3b4e65c0: Add LegacyCamera
...
* commit '3b4e65c0e284888f9980d9f641ca459734956c70':
Add LegacyCamera
2012-06-05 14:24:54 -07:00
Jean-Baptiste Queru
3b4e65c0e2
Add LegacyCamera
...
Change-Id: If7fdcf30a8646d31cbde5fa7324eb6b8247c13eb
2012-06-05 13:14:36 -07:00
Guru Nagarajan
d5807ca10a
am 1888c5a4: am 165c6708: added "stingray" to the groups for PDK sync to p.s.a.c
...
* commit '1888c5a4c6a24eda71ed7ab96bf6d47dc8017941':
added "stingray" to the groups for PDK sync to p.s.a.c
2012-06-05 09:20:51 -07:00
Guru Nagarajan
1888c5a4c6
am 165c6708: added "stingray" to the groups for PDK sync to p.s.a.c
...
* commit '165c670880227a666a03a0c57e1461ed582000de':
added "stingray" to the groups for PDK sync to p.s.a.c
2012-06-04 16:42:48 -07:00
Guru Nagarajan
165c670880
added "stingray" to the groups for PDK sync to p.s.a.c
...
Change-Id: I48cbf88901bd059316b802ed1be2aab169668db6
2012-06-04 13:25:35 -07:00
Jason Simmons
c9fa62df49
am f2ccf772: (-s ours) Point ics-aah builds of Music2 packages at jb-dev again. DO NOT MERGE
...
* commit 'f2ccf7728bd3784934d682eefd09032486dce611':
Point ics-aah builds of Music2 packages at jb-dev again. DO NOT MERGE
2012-06-01 10:45:40 -07:00
Keun young Park
0ccc43a8d6
am 25774333: am 5ab31d46: add three repositories to pdk group
...
* commit '25774333b292816ffcbd15d11552824b346c9235':
add three repositories to pdk group
2012-06-01 10:22:03 -07:00
Keun young Park
25774333b2
am 5ab31d46: add three repositories to pdk group
...
* commit '5ab31d4681d0329f0c7aeefd671d2b04b0537027':
add three repositories to pdk group
2012-06-01 10:19:22 -07:00
Keun young Park
5ab31d4681
add three repositories to pdk group
2012-06-01 09:30:53 -07:00
Keun young Park
8967e5ccd5
am 22b59080: am 4ddea083: Merge "add device/sample to pdk" into jb-dev
...
* commit '22b590807a7eb87f8d355f3700432dde255fc33d':
add device/sample to pdk
2012-05-31 19:02:40 -07:00
Keun young Park
22b590807a
am 4ddea083: Merge "add device/sample to pdk" into jb-dev
...
* commit '4ddea0833abbf17fe5ce605eb0f55e397d195f56':
add device/sample to pdk
2012-05-31 19:00:29 -07:00
Keun young Park
4ddea0833a
Merge "add device/sample to pdk" into jb-dev
2012-05-31 18:57:14 -07:00
Jason Simmons
f2ccf7728b
Point ics-aah builds of Music2 packages at jb-dev again. DO NOT MERGE
2012-05-31 17:16:15 -07:00
Jason Simmons
90dc458cf0
am f646a1f3: (-s ours) Base Tungsten\'s build of Music2 and its support libraries on the master branch
...
* commit 'f646a1f353f3888b1645913d588e716844e04b2f':
Base Tungsten's build of Music2 and its support libraries on the master branch
2012-05-31 11:26:19 -07:00
Keun young Park
9302a91ca4
add device/sample to pdk
...
Change-Id: Ia2cdb64c4e79b397c4d75b635bf3bd29f390bc2d
2012-05-31 08:10:37 -07:00
Jean-Baptiste Queru
64a0aa1979
Manifest for mirror-aosp-jb-dev
...
Change-Id: I85299b14acda7a487234d5f6ddee562b00805a8c
2012-05-30 17:16:24 -07:00
Jason Simmons
f646a1f353
Base Tungsten's build of Music2 and its support libraries on the master branch
2012-05-30 16:31:24 -07:00
Jean-Baptiste Queru
b7a104faf3
Merge from jb-dev
...
Change-Id: I96f9fca4d06426e4a1be9c2be9d56a6bc24d9dae
2012-05-30 14:29:25 -07:00
Anatol Pomazau
53c4c51a33
am 4e1b9aee: am d3b1af3f: Add naver-fonts project
...
* commit '4e1b9aee8ffe33b582ab4210b71f00800c5bb627':
Add naver-fonts project
2012-05-30 13:52:12 -07:00
Anatol Pomazau
4e1b9aee8f
am d3b1af3f: Add naver-fonts project
...
* commit 'd3b1af3fed97ee17401feb9f5c4e2c6b4041f0aa':
Add naver-fonts project
2012-05-30 13:49:28 -07:00
Anatol Pomazau
d3b1af3fed
Add naver-fonts project
2012-05-30 13:47:08 -07:00
Keun young Park
81efda5b03
am be66c8a8: am d1c58ba1: Merge "merge changes for maguro pdk to jb-dev" into jb-dev
...
* commit 'be66c8a8fc4af8d50c09abfcfed264f7bc6b10cd':
merge changes for maguro pdk to jb-dev
2012-05-30 13:13:54 -07:00
Keun young Park
be66c8a8fc
am d1c58ba1: Merge "merge changes for maguro pdk to jb-dev" into jb-dev
...
* commit 'd1c58ba123e3509949642ec5febd02e32399dda3':
merge changes for maguro pdk to jb-dev
2012-05-30 13:08:24 -07:00
Keun young Park
d1c58ba123
Merge "merge changes for maguro pdk to jb-dev" into jb-dev
2012-05-30 13:05:42 -07:00
Jean-Baptiste Queru
31d6932d0e
Merge from jb-dev
...
Change-Id: I8568c447487fdfba7e7e3b373036447d4d69a4b8
2012-05-30 12:49:05 -07:00
Anatol Pomazau
37402d1c3e
am 0cea8d46: am 3973f05c: Add openfst project
...
* commit '0cea8d4635fe3e422fb1468fb7f1e8102bb3cd12':
Add openfst project
2012-05-30 11:09:08 -07:00
Anatol Pomazau
0cea8d4635
am 3973f05c: Add openfst project
...
* commit '3973f05c5a5a314090c98b6f0fe3bbda594e9e4c':
Add openfst project
2012-05-30 11:06:47 -07:00
Anatol Pomazau
3973f05c5a
Add openfst project
2012-05-30 11:03:59 -07:00
Keun young Park
7c6ec456aa
merge changes for maguro pdk to jb-dev
2012-05-25 16:44:31 -07:00
Keun young Park
a9d249b249
fix spell error
2012-05-25 15:54:47 -07:00
Keun young Park
adc9d0acac
update for maguro PDK
...
- jhead to pdk group
- external/libnfc-nxp to nxp_nfc group
Bug: 6557554
2012-05-25 09:45:57 -07:00
Jean-Baptiste Queru
e97be85000
am 12a449ea: resolved conflicts for merge of 54d3f6eb to jb-dev-plus-aosp
...
* commit '12a449ead578bcc25b0a3f2e70a449e14c215124':
Remove 4.4.3 x86 toolchain
2012-05-21 14:12:54 -07:00
Jean-Baptiste Queru
5ea75f184b
Remove repo groups to better match future AOSP manifest
...
Change-Id: I1bd40c86221975979ef26dfd4f1253b331fc178d
2012-05-21 11:07:37 -07:00
Jean-Baptiste Queru
7efa15d635
Remove external/aac from factoryrom staging branch
...
Change-Id: I8ccdf37645234edd8517efa11adbb4150c891dec
2012-05-21 11:05:29 -07:00
Anatol Pomazau
a1708f1fd2
Merge ics-aah into master
2012-05-21 10:25:03 -07:00
Anatol Pomazau
4ef1d4fc2d
Add unbundled/Videos project per request from bryanmawhinney@
2012-05-21 10:11:38 -07:00
Jean-Baptiste Queru
12a449ead5
resolved conflicts for merge of 54d3f6eb to jb-dev-plus-aosp
2012-05-18 16:31:13 -07:00
Jean-Baptiste Queru
483e2d9bb6
Staging manifest for AOSP nakasi-factoryrom-release
...
Change-Id: I50c213ed0a9070cd08082695039f1940ffe7e96d
2012-05-18 14:59:28 -07:00
Jean-Baptiste Queru
54d3f6ebe4
am 6a983a28: Remove 4.4.3 x86 toolchain
...
* commit '6a983a28c48c2a77d0bb0fe674b690e95bd679b9':
Remove 4.4.3 x86 toolchain
2012-05-18 14:19:36 -07:00
The Android Open Source Project
00ece54b1b
Remove i686-android-linux-4.4.3 toolchain
2012-05-18 11:13:34 -07:00
Jean-Baptiste Queru
6a983a28c4
Remove 4.4.3 x86 toolchain
2012-05-18 11:09:57 -07:00
Anatol Pomazau
e8c8e62394
Revert "Remove projects that are not developed on master"
...
This partially reverts commit 5737659492
2012-05-18 10:30:46 -07:00
Anatol Pomazau
5737659492
Remove projects that are not developed on master
...
They are developed on froyo-ub-gcore-brie branch instead
2012-05-17 15:39:48 -07:00
Jean-Baptiste Queru
be6e96b622
Merge from jb-dev
...
Change-Id: I9cdbb80efe11996621c55daf039b403fe52318f7
2012-05-15 13:22:58 -07:00
Colin Cross
0b6d7d6780
am 57a942f4: am efc6cdbf: Merge "Add proguard to pdk-java group" into jb-dev
...
* commit '57a942f49be6ec4444b3422d337095eea21146c5':
Add proguard to pdk-java group
2012-05-15 11:43:04 -07:00
Colin Cross
57a942f49b
am efc6cdbf: Merge "Add proguard to pdk-java group" into jb-dev
...
* commit 'efc6cdbfd7a2f93df264eac09ee0c31edf7deaa0':
Add proguard to pdk-java group
2012-05-15 11:32:44 -07:00
Colin Cross
efc6cdbfd7
Merge "Add proguard to pdk-java group" into jb-dev
2012-05-15 10:55:43 -07:00
Jean-Baptiste Queru
4761b9d7eb
am 35030e11: am 87ad6c8a: am 859d3aa5: Add ant-glob
...
* commit '35030e11ba26c9f19ed368f6022e9b7d17491712':
Add ant-glob
2012-05-14 15:20:12 -07:00
Jean-Baptiste Queru
35030e11ba
am 87ad6c8a: am 859d3aa5: Add ant-glob
...
* commit '87ad6c8ae8b1b57c8992df327e55487297fd0394':
Add ant-glob
2012-05-14 15:16:53 -07:00
The Android Open Source Project
8c70177169
Add ant-glob
2012-05-14 15:14:53 -07:00
Jean-Baptiste Queru
87ad6c8ae8
am 859d3aa5: Add ant-glob
...
* commit '859d3aa513d9a0c5e1372dc547e8096d502d52c0':
Add ant-glob
2012-05-14 15:14:08 -07:00
Jean-Baptiste Queru
9543e71eb2
am eabf5164: am 70d0879e: Add ant-glob
...
* commit 'eabf516444c49866e30e5fc5900e60891d4e601d':
Add ant-glob
2012-05-14 15:01:43 -07:00
Jean-Baptiste Queru
eabf516444
am 70d0879e: Add ant-glob
...
* commit '70d0879e6bbadfc2c53f7bfa4132ccd000d71044':
Add ant-glob
2012-05-14 14:59:08 -07:00
Jean-Baptiste Queru
859d3aa513
Add ant-glob
2012-05-14 14:56:01 -07:00
Jean-Baptiste Queru
70d0879e6b
Add ant-glob
2012-05-14 14:55:20 -07:00
Jean-Baptiste Queru
c5822cd0f0
am e336078d: Add ant-glob
...
* commit 'e336078d6f2e2a759c9066102b80be615dac1691':
Add ant-glob
2012-05-14 14:55:07 -07:00
Jean-Baptiste Queru
e336078d6f
Add ant-glob
2012-05-14 14:51:43 -07:00
Chad Jones
6b5e57b707
Add external/ant-glob
2012-05-14 13:38:28 -07:00
Jean-Baptiste Queru
5186c7ba56
Merge from jb-dev
...
Change-Id: I058579a28785dc29ef26576eb492f431d53f78fe
2012-05-14 11:11:42 -07:00
Colin Cross
a38a2bbd47
am 89095647: am 2c616fe8: Fix build
...
* commit '8909564738162e337374a3a46bf46b8e9d1a55f0':
Fix build
2012-05-14 08:54:39 -07:00
Colin Cross
7b47ec5999
Fix build
...
Change-Id: I1071e00ab85f154fc14feaa53e45a5680386ad7d
2012-05-14 08:51:19 -07:00
Colin Cross
bd5c41f99e
resolved conflicts for merge of 72a65943 to master
...
Change-Id: I3fc3b87660f560d68b4d84a4d677c03bdde882b3
2012-05-14 08:50:53 -07:00
Chad Jones
79dd559ed6
am 36d00062: am 6b2ec1a2: Merge "Add PartnerBookmarksProvider and drop CarrierBookmarksProvider" into jb-dev
...
* commit '36d000620f3a853d46b5c5df3b92b48341319ceb':
Add PartnerBookmarksProvider and drop CarrierBookmarksProvider
2012-05-14 07:49:18 -07:00
Chad Jones
21cc95c5a0
am 287b2702: am dbb1b3a0: Add external/regex-re2
...
* commit '287b270279e9a789bf154c54e66855222c91c025':
Add external/regex-re2
2012-05-14 07:26:13 -07:00
Colin Cross
8909564738
am 2c616fe8: Fix build
...
* commit '2c616fe824a962a2a5550f9aa32171b164de59f8':
Fix build
2012-05-12 19:39:26 -07:00
Colin Cross
2c616fe824
Fix build
...
Change-Id: I1071e00ab85f154fc14feaa53e45a5680386ad7d
2012-05-12 19:34:42 -07:00
Colin Cross
72a6594321
am 00e3a088: Add tags for stingray, tegra2, tuna, and omap4
...
* commit '00e3a088bdcf6d4c62aaac8893dbdb3764f5977a':
Add tags for stingray, tegra2, tuna, and omap4
2012-05-12 17:46:29 -07:00
Colin Cross
00e3a088bd
Add tags for stingray, tegra2, tuna, and omap4
...
Change-Id: I0039a2528d3b6ef9416f0e988c47b0abf0eaa682
2012-05-11 16:19:52 -07:00
Chad Jones
36d000620f
am 6b2ec1a2: Merge "Add PartnerBookmarksProvider and drop CarrierBookmarksProvider" into jb-dev
...
* commit '6b2ec1a2de3aa4441d379d401977cb62f0e8992c':
Add PartnerBookmarksProvider and drop CarrierBookmarksProvider
2012-05-11 14:51:24 -07:00
Chad Jones
6b2ec1a2de
Merge "Add PartnerBookmarksProvider and drop CarrierBookmarksProvider" into jb-dev
2012-05-11 14:48:56 -07:00
Neel Parekh
932e25b296
Update AtHome to ics-aah-release
2012-05-11 11:05:16 -07:00
Jean-Baptiste Queru
5de56bcaf0
Merge from jb-dev
...
Change-Id: Ide5d6c49abe8c98377cf5c49a09b7c61d5b3edb3
2012-05-11 10:49:02 -07:00
Chad Jones
287b270279
am dbb1b3a0: Add external/regex-re2
...
* commit 'dbb1b3a0cc87f391827f74ec560c4cdfa863bfdd':
Add external/regex-re2
2012-05-11 10:44:39 -07:00
Chad Jones
dbb1b3a0cc
Add external/regex-re2
2012-05-11 09:43:37 -07:00
Colin Cross
a292a3eafd
Add proguard to pdk-java group
...
Change-Id: Ia2d43d3838e88c6a270372a44c0e8efb19ed291a
2012-05-10 12:30:04 -07:00
Chad Jones
2cf3a58564
am b4d5a4e7: am 7aefdf8b: Add vendor/xts
...
* commit 'b4d5a4e785e70d26d703c11ab14a0e000f676067':
Add vendor/xts
2012-05-10 12:04:01 -07:00
Ed Heyl
338db00446
am 682ba42e: (-s ours) am bc103fb0: Revert "Revert "set revision for aah/core"" Please do not merge.
...
* commit '682ba42ec5838cb35abdc1406962bf230894a1cb':
Revert "Revert "set revision for aah/core"" Please do not merge.
2012-05-10 11:55:46 -07:00
Chad Jones
b4d5a4e785
am 7aefdf8b: Add vendor/xts
...
* commit '7aefdf8b72aee482d0216b45411d1174858e7322':
Add vendor/xts
2012-05-10 11:53:11 -07:00
Chad Jones
7aefdf8b72
Add vendor/xts
2012-05-10 10:58:13 -07:00
Chad Jones
31a7b2b4f9
Add PartnerBookmarksProvider and drop CarrierBookmarksProvider
2012-05-10 10:50:18 -07:00
Ed Heyl
682ba42ec5
am bc103fb0: Revert "Revert "set revision for aah/core"" Please do not merge.
...
* commit 'bc103fb031abaa245b13988c9bd89434009e730a':
Revert "Revert "set revision for aah/core"" Please do not merge.
2012-05-10 09:26:41 -07:00
Ed Heyl
bc103fb031
Revert "Revert "set revision for aah/core"" Please do not merge.
...
This reverts commit 2b1ee8d90c
2012-05-10 07:37:04 -07:00
Ed Heyl
ecc1bcc4db
am 755841a2: am 2b1ee8d9: Revert "set revision for aah/core"
...
* commit '755841a2310df4ce439d7a8599ce4baded5c4e65':
Revert "set revision for aah/core"
2012-05-09 10:11:26 -07:00
Ed Heyl
d7df691e28
am 9229763c: am aff8c0e1: set revision for aah/core
...
* commit '9229763cd39bcdce86e01c1934b01b1cab019369':
set revision for aah/core
2012-05-09 10:11:25 -07:00
Ed Heyl
8d75006b6f
am 28512787: Revert "set revision for aah/core"
...
* commit '28512787b77087987e2ccd228d5afd13cc83454c':
Revert "set revision for aah/core"
2012-05-09 01:54:18 -07:00
Ed Heyl
bf3980d526
am bed98a13: set revision for aah/core
...
* commit 'bed98a132563986543fbb611aeea96be7e9f5abb':
set revision for aah/core
2012-05-09 01:54:17 -07:00
Ed Heyl
755841a231
am 2b1ee8d9: Revert "set revision for aah/core"
...
* commit '2b1ee8d90cc3f93d7c1e3d8e733726ae99b51924':
Revert "set revision for aah/core"
2012-05-09 01:50:15 -07:00
Ed Heyl
9229763cd3
am aff8c0e1: set revision for aah/core
...
* commit 'aff8c0e1690131503b7d9e914ce1f9fef82b105f':
set revision for aah/core
2012-05-09 01:50:13 -07:00
Ed Heyl
2b1ee8d90c
Revert "set revision for aah/core"
...
This reverts commit aff8c0e169
2012-05-09 00:21:46 -07:00
Ed Heyl
28512787b7
Revert "set revision for aah/core"
...
This reverts commit bed98a1325
2012-05-09 00:20:52 -07:00
Ed Heyl
bed98a1325
set revision for aah/core
2012-05-09 00:01:01 -07:00
Ed Heyl
aff8c0e169
set revision for aah/core
2012-05-08 23:57:21 -07:00
Keun young Park
8f18482331
am 0f9a10fe: am d7b57120: move libnativehelper to pdk-java
...
* commit '0f9a10fe802e869e3161ddd129fccfdeaba4d0c4':
move libnativehelper to pdk-java
2012-05-08 11:31:37 -07:00
Keun young Park
f5094c0a1c
am 78187e9e: am b76b48c9: add libnativeheler to pdk group
...
* commit '78187e9ed836b49078089a5e3da820853af73d3a':
add libnativeheler to pdk group
2012-05-08 11:31:35 -07:00
Jean-Baptiste Queru
8f46926125
Merge from jb-dev
...
Change-Id: I1e9fd8216dfa3dcb06ed92d92aac78dc4a5c3110
2012-05-08 10:07:17 -07:00
Keun young Park
0f9a10fe80
am d7b57120: move libnativehelper to pdk-java
...
* commit 'd7b57120172f4a580c8808baa524ff3b230fd082':
move libnativehelper to pdk-java
2012-05-07 12:58:19 -07:00
Keun young Park
78187e9ed8
am b76b48c9: add libnativeheler to pdk group
...
* commit 'b76b48c99eae970fe659d63d4937e389ad3f4683':
add libnativeheler to pdk group
2012-05-07 12:58:18 -07:00
Keun young Park
d7b5712017
move libnativehelper to pdk-java
2012-05-07 12:34:07 -07:00
Keun young Park
b76b48c99e
add libnativeheler to pdk group
...
Bug: 6369821
2012-05-07 11:30:28 -07:00
Jean-Baptiste Queru
d9bcfb2250
Merge from jb-dev
...
Change-Id: I71ad13c2632318cc13cfd77f0d00fc0ce4c8e34f
2012-05-04 17:44:51 -07:00
Elliott Hughes
919f2e0569
am 791be713: am 70aba032: Merge "Add libnativehelper to manifest." into jb-dev
...
* commit '791be71301b0550e5636fe8c79b86e68a83678cb':
Add libnativehelper to manifest.
2012-05-04 16:53:08 -07:00
Elliott Hughes
791be71301
am 70aba032: Merge "Add libnativehelper to manifest." into jb-dev
...
* commit '70aba0323a11f1813243b19a9590b9e0045b5e68':
Add libnativehelper to manifest.
2012-05-04 16:50:40 -07:00
Elliott Hughes
70aba0323a
Merge "Add libnativehelper to manifest." into jb-dev
2012-05-04 16:48:26 -07:00
Elliott Hughes
a2cd318a06
Add libnativehelper to manifest.
...
Bug: 6369821
Change-Id: Ic4dd3474bdf4a78c8a0822da91f555c3ae292b37
2012-05-04 16:43:46 -07:00
Chad Jones
01336b04bb
am 651e11cf: am 94e84ca6: Add GoogleSearch
...
* commit '651e11cff2f6858e2adc61dee6793c1e89dd9c12':
Add GoogleSearch
2012-05-04 16:36:16 -07:00
Chad Jones
5f0e7cc564
am 3a70a460: Add GoogleSearch
...
* commit '3a70a460e9b4e8f1f45f92e411590ccc35355172':
Add GoogleSearch
2012-05-04 16:36:13 -07:00
Chad Jones
651e11cff2
am 94e84ca6: Add GoogleSearch
...
* commit '94e84ca63045a8938959469cb478e5182b71ac13':
Add GoogleSearch
2012-05-04 15:16:03 -07:00
Chad Jones
3a70a460e9
Add GoogleSearch
2012-05-04 13:45:24 -07:00
Chad Jones
94e84ca630
Add GoogleSearch
2012-05-04 13:35:28 -07:00
Chad Jones
7cfd0355e5
Add GoogleSearch
2012-05-04 13:33:10 -07:00
Jean-Baptiste Queru
9465068af7
Remove unused manifest
...
Change-Id: Ifc1757208bd0bbcec4eb6e1287f5035fbe6da7d8
2012-05-04 08:01:58 -07:00
Jean-Baptiste Queru
01a08e7ed0
am b5507fa7: (-s ours) Restore projects related to pending AOSP contributions - do not merge
...
* commit 'b5507fa7f931eecf3f0edbc0340c3b62fb0a47e6':
Restore projects related to pending AOSP contributions - do not merge
2012-05-04 07:49:52 -07:00
Jean-Baptiste Queru
b5507fa7f9
Restore projects related to pending AOSP contributions - do not merge
...
Change-Id: Ia043cb611aa7b468a7fd24f706b5df44f8b68306
2012-05-04 07:47:19 -07:00
Jean-Baptiste Queru
106d1fc012
Merge from jb-dev
...
Change-Id: I3e8e37fd1780766bf29e17c9407154c00092e3a1
2012-05-04 07:22:14 -07:00
Jean-Baptiste Queru
8adabaae59
am 230bea16: (-s ours) am 1829cbab: Merge "Remove manta-related projects - do not merge" into jb-dev
...
* commit '230bea16ff015552b04fce2861c36db862eb00ff':
Remove manta-related projects - do not merge
2012-05-04 07:22:06 -07:00
Jean-Baptiste Queru
230bea16ff
am 1829cbab: Merge "Remove manta-related projects - do not merge" into jb-dev
...
* commit '1829cbabf20f254a15ce6c101192cc779c66c83a':
Remove manta-related projects - do not merge
2012-05-04 07:19:15 -07:00
Jean-Baptiste Queru
1829cbabf2
Merge "Remove manta-related projects - do not merge" into jb-dev
2012-05-04 07:17:49 -07:00
Jean-Baptiste Queru
654b28189d
Merge from jb-dev
...
Change-Id: I2e88556c290601758fa654bb8edb2d6ab95f651f
2012-05-03 16:44:12 -07:00
Jean-Baptiste Queru
c6518fdd08
am e9e09cbe: (-s ours) am 4f84bc0b: Merge "Delete libppp, not used in JB - do not merge" into jb-dev
...
* commit 'e9e09cbe86dad275d44cfabfc6928c58bb46ecde':
Delete libppp, not used in JB - do not merge
2012-05-03 16:23:32 -07:00
Jean-Baptiste Queru
e9e09cbe86
am 4f84bc0b: Merge "Delete libppp, not used in JB - do not merge" into jb-dev
...
* commit '4f84bc0b7623254b4dd73cbba226d2d35e01b4e2':
Delete libppp, not used in JB - do not merge
2012-05-03 16:21:02 -07:00
Jean-Baptiste Queru
4f84bc0b76
Merge "Delete libppp, not used in JB - do not merge" into jb-dev
2012-05-03 16:18:31 -07:00
Jean-Baptiste Queru
a3e9d8ee5a
am ebeb8269: (-s ours) am f7ca761d: Merge "Remove UnifiedEmail from JB - do not merge" into jb-dev
...
* commit 'ebeb8269b6bc94e7e454de61a92dceecd6cbfcc6':
Remove UnifiedEmail from JB - do not merge
2012-05-03 16:15:00 -07:00
Jean-Baptiste Queru
ebeb8269b6
am f7ca761d: Merge "Remove UnifiedEmail from JB - do not merge" into jb-dev
...
* commit 'f7ca761d5711450db3ec0efd284ccc6741a94f8c':
Remove UnifiedEmail from JB - do not merge
2012-05-03 16:12:40 -07:00
Jean-Baptiste Queru
f7ca761d57
Merge "Remove UnifiedEmail from JB - do not merge" into jb-dev
2012-05-03 16:10:30 -07:00
Jason Simmons
0b94fa54cb
am 11213f05: (-s ours) Switch ics-aah Music2-related projects from master to jb-dev
...
* commit '11213f0597ef27a7f35a3959095298ca52984b04':
Switch ics-aah Music2-related projects from master to jb-dev
2012-05-03 16:05:47 -07:00
Jean-Baptiste Queru
a44f62c08e
Delete libppp, not used in JB - do not merge
...
Change-Id: I8b0b9bae85dbdd3f688f426319c7599e13361e97
2012-05-03 15:54:39 -07:00
Jean-Baptiste Queru
682f88f5e3
am b1eebdc1: am 0fdc5993: Revert "Restore wpa_supplicant, still used"
...
* commit 'b1eebdc16d37e5e0749c022c3c896d86556bb1bf':
Revert "Restore wpa_supplicant, still used"
2012-05-03 15:32:37 -07:00
Jean-Baptiste Queru
b1eebdc16d
am 0fdc5993: Revert "Restore wpa_supplicant, still used"
...
* commit '0fdc5993ede9abd2a563c205c36ffe8fd66d87d5':
Revert "Restore wpa_supplicant, still used"
2012-05-03 15:30:04 -07:00
Jean-Baptiste Queru
0fdc5993ed
Revert "Restore wpa_supplicant, still used"
...
This reverts commit 6b7a5c3cf1
2012-05-03 15:03:00 -07:00
Jean-Baptiste Queru
e46c19bd18
am f01effef: (-s ours) am 852d9e87: Merge "Remove unifiedGmail from JB - do not merge" into jb-dev
...
* commit 'f01effef63b573b5c2660afe7a124aa379352435':
Remove unifiedGmail from JB - do not merge
2012-05-03 14:55:58 -07:00
Jean-Baptiste Queru
f01effef63
am 852d9e87: Merge "Remove unifiedGmail from JB - do not merge" into jb-dev
...
* commit '852d9e87377e84b07788d0a2fda37f54a816c398':
Remove unifiedGmail from JB - do not merge
2012-05-03 14:53:30 -07:00
Jean-Baptiste Queru
852d9e8737
Merge "Remove unifiedGmail from JB - do not merge" into jb-dev
2012-05-03 14:51:38 -07:00
Jean-Baptiste Queru
f0ab8d885c
am 5f6c6410: (-s ours) am 8586d8d8: Remove empty projects that won\'t be used for JB - do not merge
...
* commit '5f6c6410ada66a38e98bebc97cd0aa2105766f24':
Remove empty projects that won't be used for JB - do not merge
2012-05-03 14:44:13 -07:00
Jean-Baptiste Queru
5f6c6410ad
am 8586d8d8: Remove empty projects that won\'t be used for JB - do not merge
...
* commit '8586d8d843d88e0c4506581e07f69d96879275e9':
Remove empty projects that won't be used for JB - do not merge
2012-05-03 14:41:52 -07:00
Jean-Baptiste Queru
8586d8d843
Remove empty projects that won't be used for JB - do not merge
...
Change-Id: Ib4ee0906fc2b6fd5cd4367cff7523d5fd521f877
2012-05-03 14:29:25 -07:00
Jean-Baptiste Queru
421692f8ad
Remove manta-related projects - do not merge
...
Change-Id: I116fef9c14cf454b763ca9fb714ebea00cceb537
2012-05-03 14:25:31 -07:00
Jean-Baptiste Queru
9a7ecb1f02
Remove UnifiedEmail from JB - do not merge
...
Change-Id: I046685eb28c2c108d2deaf6302dacb0fb2cbc09d
2012-05-03 14:04:40 -07:00
Jean-Baptiste Queru
e5b4275685
Remove unifiedGmail from JB - do not merge
...
Change-Id: I1f6272479ef7c797c29134d6e3c7a493e177179a
2012-05-03 14:04:27 -07:00
Jean-Baptiste Queru
ed3d900226
am c713f91e: am 6b7a5c3c: Restore wpa_supplicant, still used
...
* commit 'c713f91e5b74af3832bf7dff3abb0f5f1d316192':
Restore wpa_supplicant, still used
2012-05-03 12:27:17 -07:00
Jean-Baptiste Queru
c713f91e5b
am 6b7a5c3c: Restore wpa_supplicant, still used
...
* commit '6b7a5c3cf1d469c5e3f967918897c8fd1443f290':
Restore wpa_supplicant, still used
2012-05-03 12:25:26 -07:00
Jason Simmons
11213f0597
Switch ics-aah Music2-related projects from master to jb-dev
2012-05-03 12:10:48 -07:00
Jean-Baptiste Queru
6b7a5c3cf1
Restore wpa_supplicant, still used
...
Change-Id: I78aaca1f0f41e2c0904e24ae3c1c7eb46dd73ee2
2012-05-03 11:48:21 -07:00
Jean-Baptiste Queru
21e44bb45b
am 79340260: am da4bf81d: Merge "Remove obsolete/unneccessary projects, in JellyBean and newer." into jb-dev
...
* commit '7934026045356769019b452a10eff7c958289223':
Remove obsolete/unneccessary projects, in JellyBean and newer.
2012-05-03 11:08:41 -07:00
Jean-Baptiste Queru
7934026045
am da4bf81d: Merge "Remove obsolete/unneccessary projects, in JellyBean and newer." into jb-dev
...
* commit 'da4bf81db62ada8d552340de73d252bb8afa5676':
Remove obsolete/unneccessary projects, in JellyBean and newer.
2012-05-03 11:05:32 -07:00
Jean-Baptiste Queru
da4bf81db6
Merge "Remove obsolete/unneccessary projects, in JellyBean and newer." into jb-dev
2012-05-03 11:03:04 -07:00
Anatol Pomazau
3c99b6385a
am e85020fe: am 2c7de062: Add GooglePinyinIME project
...
* commit 'e85020fecb33898c5e585466f35c2a895c66066b':
Add GooglePinyinIME project
2012-05-03 10:29:03 -07:00
Anatol Pomazau
e85020fecb
am 2c7de062: Add GooglePinyinIME project
...
* commit '2c7de062a7ac8ca337f1daaafeefd72119a34fc9':
Add GooglePinyinIME project
2012-05-03 10:06:00 -07:00
Anatol Pomazau
2c7de062a7
Add GooglePinyinIME project
2012-05-03 10:03:12 -07:00
Jean-Baptiste Queru
a3232823e6
Remove obsolete/unneccessary projects, in JellyBean and newer.
...
Change-Id: I48959bc2a1fbfa00c6893401073b9f2f7c46a311
2012-05-03 09:55:11 -07:00
Anatol Pomazau
b0ed8e4b51
am 05ef5550: am 58a5c876: Add zxing project
...
* commit '05ef5550ad546ecce78f161b5043b9fdc0546049':
Add zxing project
2012-05-03 08:27:08 -07:00
Anatol Pomazau
05ef5550ad
am 58a5c876: Add zxing project
...
* commit '58a5c876cdbb7ac396579508dd2ecd213b832388':
Add zxing project
2012-05-03 08:25:00 -07:00
Anatol Pomazau
58a5c876cd
Add zxing project
2012-05-03 08:22:51 -07:00
Jean-Baptiste Queru
ef6df6f956
Merge from jb-dev
...
Change-Id: I1ffaf656106f9260a18a627b9fc77e056d6a154a
2012-05-02 15:58:24 -07:00
Anatol Pomazau
10109182a0
am e5a3a132: am 7af42d87: Add chromium-trace to PDK group
...
* commit 'e5a3a1326098964195ae766c027f27b4ecad6663':
Add chromium-trace to PDK group
2012-05-02 11:11:09 -07:00
Anatol Pomazau
e5a3a13260
am 7af42d87: Add chromium-trace to PDK group
...
* commit '7af42d87c92452b4184494483cc67174bf330b1f':
Add chromium-trace to PDK group
2012-05-02 11:08:21 -07:00
Anatol Pomazau
7af42d87c9
Add chromium-trace to PDK group
2012-05-02 10:49:42 -07:00
Anatol Pomazau
812d189798
am 914510e4: am 67363dc4: Add chromium-trace project
...
* commit '914510e46011a8d9c71d4ea5ffdd46b41d656824':
Add chromium-trace project
2012-05-02 10:31:01 -07:00
Anatol Pomazau
914510e460
am 67363dc4: Add chromium-trace project
...
* commit '67363dc400122119cfbefbfe6d66ed5d44e0e889':
Add chromium-trace project
2012-05-02 10:28:14 -07:00
Anatol Pomazau
67363dc400
Add chromium-trace project
2012-05-02 05:55:19 -07:00
Anatol Pomazau
f203cf0073
am f873a871: Replace URL with relative path
...
* commit 'f873a87110c6f44dbab11b99f795696cb0a8b696':
Replace URL with relative path
2012-05-01 14:32:28 -07:00
Anatol Pomazau
f873a87110
Replace URL with relative path
...
This will make migration to Git-on-Borg easier as repo URL will be changed.
2012-05-01 14:29:36 -07:00
Anatol Pomazau
6e1ef48a1d
am 0d2b81fd: am 7721c962: am 168ccbee: Replace URL with relative path
...
* commit '0d2b81fd7fff3d7542058ba1f973a8a53424336c':
Replace URL with relative path
2012-05-01 14:25:11 -07:00
Anatol Pomazau
79a2fa4eb3
am d408c7b7: am 3302b839: Replace URL with relative path
...
* commit 'd408c7b7ae09418111d4cc927c2680aa25226921':
Replace URL with relative path
2012-05-01 14:22:56 -07:00
Anatol Pomazau
0d2b81fd7f
am 7721c962: am 168ccbee: Replace URL with relative path
...
* commit '7721c9623650a7f4c313ea83919ab1e50e43ce9f':
Replace URL with relative path
2012-05-01 14:22:39 -07:00
Anatol Pomazau
d408c7b7ae
am 3302b839: Replace URL with relative path
...
* commit '3302b83913a7950dfb844ddac5da9299222c0ce0':
Replace URL with relative path
2012-05-01 14:20:09 -07:00
Anatol Pomazau
7721c96236
am 168ccbee: Replace URL with relative path
...
* commit '168ccbeec0d6998048a7da849572619797564786':
Replace URL with relative path
2012-05-01 14:19:53 -07:00
Anatol Pomazau
3302b83913
Replace URL with relative path
...
This will make migration to Git-on-Borg easier as repo URL will be changed.
2012-05-01 14:17:01 -07:00
Anatol Pomazau
168ccbeec0
Replace URL with relative path
...
This will make migration to Git-on-Borg easier as repo URL will be changed.
2012-05-01 14:16:47 -07:00
Anatol Pomazau
ddac94d3f6
Replace URL with relative path
...
This will make migration to Git-on-Borg easier as repo URL will be changed.
2012-05-01 14:03:16 -07:00
Jean-Baptiste Queru
61b5ecb4cc
am 7aa21125: Delete prebuilt project, which is now empty.
...
* commit '7aa21125668ecdb4247a324ceab7700de66130ca':
Delete prebuilt project, which is now empty.
2012-05-01 14:02:41 -07:00
Neel Parekh
c10b7c276b
am 9607317d: (-s ours) Revert "Use JB version of support library"
...
* commit '9607317d2a663763e03d35dbd3dd5a49c09e758a':
Revert "Use JB version of support library"
2012-05-01 14:02:28 -07:00
Neel Parekh
9607317d2a
Revert "Use JB version of support library"
...
This reverts commit a46c855cea
2012-05-01 13:55:58 -07:00
Neel Parekh
9cd43dcd7a
am a46c855c: (-s ours) Use JB version of support library
...
* commit 'a46c855cea45787d9cd4f61c7abd0662df98304c':
Use JB version of support library
2012-05-01 13:41:26 -07:00
Jean-Baptiste Queru
7aa2112566
Delete prebuilt project, which is now empty.
...
Bug: 5409964
Change-Id: Ia994e8b927360d8ce8ef0fdd7a23580a8ea925fe
2012-05-01 13:19:53 -07:00
Neel Parekh
a46c855cea
Use JB version of support library
2012-05-01 12:39:59 -07:00
Jean-Baptiste Queru
8e6ea389a8
Merge from jb-dev
...
Change-Id: I9712b34ceb6383c2d4ef26c8ed140b4f46fc4c5f
2012-05-01 04:57:08 -07:00
Anatol Pomazau
87a91f4412
am 9b4f02e3: am baf875ab: Replace URL with relative path
...
* commit '9b4f02e3acdcd446c2dd4f687fe166647bc7c5e1':
Replace URL with relative path
2012-04-30 16:33:00 -07:00
Anatol Pomazau
9b4f02e3ac
am baf875ab: Replace URL with relative path
...
* commit 'baf875abb301e6abb8e7f00db0e2f97b95748c8e':
Replace URL with relative path
2012-04-30 16:31:39 -07:00
Anatol Pomazau
baf875abb3
Replace URL with relative path
...
This will make migration to Git-on-Borg easier as repo URL will be changed.
2012-04-30 16:28:37 -07:00
Jean-Baptiste Queru
b5763d585e
am ae2a4d57: am 575b4f6f: am 6ce95f41: Add prebuilts/misc
...
* commit 'ae2a4d5794e790ce70e7d95fbcefbc8f251c64f8':
Add prebuilts/misc
2012-04-30 16:04:37 -07:00
Jean-Baptiste Queru
eba7ff4e1d
am a07f8847: am 53bc0511: (-s ours) Add prebuilts/misc
...
* commit 'a07f8847108865f255a71609a2a00ebc073dae26':
Add prebuilts/misc
2012-04-30 16:02:18 -07:00
Jean-Baptiste Queru
ae2a4d5794
am 575b4f6f: am 6ce95f41: Add prebuilts/misc
...
* commit '575b4f6f21ad5949ae93a6d72a1bcbb8fc1112b8':
Add prebuilts/misc
2012-04-30 16:00:24 -07:00
Jean-Baptiste Queru
a07f884710
am 53bc0511: (-s ours) Add prebuilts/misc
...
* commit '53bc05119fb6a571dd66a20cdc6c588b8abff9ee':
Add prebuilts/misc
2012-04-30 15:58:10 -07:00
Jean-Baptiste Queru
575b4f6f21
am 6ce95f41: Add prebuilts/misc
...
* commit '6ce95f41191787c93632d6261ff9721cd0f10ff1':
Add prebuilts/misc
2012-04-30 15:56:21 -07:00
Jean-Baptiste Queru
6ce95f4119
Add prebuilts/misc
...
Change-Id: Id889f79a9a2c9fcf08b78663bd294fa9b649dc86
2012-04-30 15:54:19 -07:00
Jean-Baptiste Queru
53bc05119f
Add prebuilts/misc
...
Change-Id: Id889f79a9a2c9fcf08b78663bd294fa9b649dc86
2012-04-30 15:49:18 -07:00
The Android Open Source Project
03fc9565bb
Add prebuilts/misc
2012-04-30 15:48:17 -07:00
Neel Parekh
3406d90acf
Switch to jb-dev's version of support library
2012-04-30 15:04:42 -07:00
Jean-Baptiste Queru
675ba5ad72
Merge from jb-dev
...
Change-Id: Ifd7b2a0e1b4eade9b8d87601c582ee9af9dd953d
2012-04-28 10:18:30 -07:00
Anatol Pomazau
cf8efa5595
am f436d5fc: am 40f4c91e: Add EmailExchange project
...
* commit 'f436d5fc38ee23da83490053c835f0a34ca4e3a8':
Add EmailExchange project
2012-04-27 13:26:23 -07:00
Anatol Pomazau
f436d5fc38
am 40f4c91e: Add EmailExchange project
...
* commit '40f4c91e9e8afb6b906b6f61f2f319c0c289b7a2':
Add EmailExchange project
2012-04-27 13:23:50 -07:00
Anatol Pomazau
40f4c91e9e
Add EmailExchange project
2012-04-27 13:21:37 -07:00
Colin Cross
d763886389
Add hardware/invensense to a new invensense group
...
Change-Id: I667cfd50f3cdccf29a92c51f02b74f8137163b69
2012-04-26 18:04:44 -07:00
Katherine Kuan
70842b1f32
am 3c7a5098: am a79c0092: Remove Memory project temporarily
...
* commit '3c7a5098be91273dc11479d3633c3bfdd781119f':
Remove Memory project temporarily
2012-04-26 14:31:02 -07:00
Katherine Kuan
3c7a5098be
am a79c0092: Remove Memory project temporarily
...
* commit 'a79c00926639be29c78db60184d156044c78a057':
Remove Memory project temporarily
2012-04-26 14:28:48 -07:00
The Android Open Source Project
8f95dff32f
Switch to the proper location of IA 4.6 toolchain
2012-04-26 14:14:23 -07:00
Jean-Baptiste Queru
a63ea256c1
am 4f255272: Merge from stage-aosp-master
...
* commit '4f25527290ace7d6db8d0e22c82070d519d2a0d0':
Switch to modern location of x86 gcc 4.6
Switch to modern location of x86 gcc 4.6
2012-04-26 14:07:45 -07:00
Jean-Baptiste Queru
4f25527290
Merge from stage-aosp-master
...
Change-Id: Id8e5f5cb350a4d65144ec9d00be152e3606c6491
2012-04-26 14:05:08 -07:00
Jean-Baptiste Queru
ac0a216e76
am 5d63a408: Switch to modern location of x86 gcc 4.6
...
* commit '5d63a40805dc9be2e242fe11703762ebf1c4e509':
Switch to modern location of x86 gcc 4.6
2012-04-26 14:02:28 -07:00
Jean-Baptiste Queru
5d63a40805
Switch to modern location of x86 gcc 4.6
...
Change-Id: I88100d4c3c6b33e5649e0dbf781c28dea7624995
2012-04-26 13:55:12 -07:00
Jean-Baptiste Queru
c9878fa2ca
Switch to modern location of x86 gcc 4.6
...
Change-Id: I88100d4c3c6b33e5649e0dbf781c28dea7624995
2012-04-26 13:33:22 -07:00
Anatol Pomazau
c2a44def8f
am ae59a498: am 3c7b08b5: Rename prebuilt project to stay more consistent with other projects
...
* commit 'ae59a498e71086ce1fe44b2ba3dd6ec17ccd4b32':
Rename prebuilt project to stay more consistent with other projects
2012-04-26 13:03:21 -07:00
Anatol Pomazau
7b8440f918
am dac816cd: am 1059a433: Remove BrowserProvider
...
* commit 'dac816cd4beeb07954b6982a2a9bf15f2cb8bed4':
Remove BrowserProvider
2012-04-26 13:03:20 -07:00
Katherine Kuan
a79c009266
Remove Memory project temporarily
2012-04-26 12:52:14 -07:00
Anatol Pomazau
ae59a498e7
am 3c7b08b5: Rename prebuilt project to stay more consistent with other projects
...
* commit '3c7b08b56aab0372a7e294f73b159e051b861dcd':
Rename prebuilt project to stay more consistent with other projects
2012-04-26 11:58:50 -07:00
Anatol Pomazau
dac816cd4b
am 1059a433: Remove BrowserProvider
...
* commit '1059a4336702e80857a08e447006d40c1dacdc1a':
Remove BrowserProvider
2012-04-26 11:58:38 -07:00
Anatol Pomazau
3c7b08b56a
Rename prebuilt project to stay more consistent with other projects
2012-04-26 11:36:42 -07:00
Anatol Pomazau
1059a43367
Remove BrowserProvider
2012-04-26 11:13:41 -07:00
Jean-Baptiste Queru
3535ed3364
Merge from jb-dev
...
Change-Id: Ie90ae038669c7a3d28766e33589942d32814e78b
2012-04-26 07:07:18 -07:00
Anatol Pomazau
b1ffe5dc78
Revert default branch back to master
2012-04-25 17:20:30 -07:00
Anatol Pomazau
79eb2c5dfc
am d4d5c82a: Merge remote-tracking branch \'ag/jb-dev\' into HEAD
...
* commit 'd4d5c82a4f3eea8f71600b1c5462f5313fc8aad7':
Add CarrierBookmarksProvider
Create branch jb-dev
2012-04-25 16:46:41 -07:00
Anatol Pomazau
02d1b7e4fd
am 41908539: Create branch jb-dev-plus-aosp
...
* commit '41908539dc7cec52396df25ed981761e411b7385':
Create branch jb-dev-plus-aosp
2012-04-25 16:46:41 -07:00
Anatol Pomazau
d4d5c82a4f
Merge remote-tracking branch 'ag/jb-dev' into HEAD
2012-04-25 16:04:28 -07:00
Anatol Pomazau
f26d32e42d
Add CarrierBookmarksProvider
2012-04-25 15:59:53 -07:00
Anatol Pomazau
7bd3a0b73e
Add projects requested by Jeff Hamilton
2012-04-25 13:20:16 -07:00
Jean-Baptiste Queru
408fb07ae4
Branch jb-dev-without-vendor
...
Change-Id: I68cce704310c909ef8f2b90b55891f0ffaee099c
2012-04-25 11:04:55 -07:00
Jean-Baptiste Queru
f24cc5dea4
am a06ac1da: (-s ours) am 32f10c7a: am ea734872: am 5d46ecab: (-s ours) gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit 'a06ac1dac3cc0ef1c361f81cc0c3bc7d8ab11a49':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 15:55:15 -07:00
Jean-Baptiste Queru
75897147fd
am 7ebe6731: (-s ours) am e02ed69c: am be34e0a6: gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit '7ebe67317c79b5997af827f1179bbabe026382d5':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 15:55:14 -07:00
Jean-Baptiste Queru
94add6d69d
am 4152ebc9: (-s ours) am e1c9a9c9: gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit '4152ebc96c5e96b66265a1e716b6d78cce3f9235':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 15:55:13 -07:00
Jean-Baptiste Queru
a6f6c12d6c
am 5ca38518: (-s ours) gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit '5ca38518f8df7e383371e4c6dcf78c4fb3c9ee79':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 15:55:11 -07:00
Jean-Baptiste Queru
d7289c6f2b
am a84f58d4: am c9b27436: am ce806fa1: am d83cbc99: Add new-style toolchains
...
* commit 'a84f58d49c792556aca1585124cb935070062d00':
Add new-style toolchains
2012-04-24 14:27:59 -07:00
Jean-Baptiste Queru
04ed302392
am aea41af9: am 16cb81c9: am 4b84c231: Add new-style toolchains
...
* commit 'aea41af939586e1f3a50316db1a3585fa2c70d61':
Add new-style toolchains
2012-04-24 14:27:58 -07:00
Jean-Baptiste Queru
5678d77c6b
am 2e9b5952: am a0289993: Add new-style toolchains
...
* commit '2e9b5952e8f26abe6b2153ee8b02f62cf13a1598':
Add new-style toolchains
2012-04-24 14:27:57 -07:00
Jean-Baptiste Queru
dab4862571
am bc5a6b99: (-s ours) Add new-style toolchains - DO NOT MERGE
...
* commit 'bc5a6b9944da552cdba312c470e98a6ed931b5fd':
Add new-style toolchains - DO NOT MERGE
2012-04-24 14:27:41 -07:00
The Android Open Source Project
e56e10bfa2
Add 4.6 toolchains
2012-04-24 14:21:39 -07:00
Jean-Baptiste Queru
a06ac1dac3
am 32f10c7a: am ea734872: am 5d46ecab: (-s ours) gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit '32f10c7a8e9a73162a001be97fb70c02b2aaedb6':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 14:00:49 -07:00
Jean-Baptiste Queru
32f10c7a8e
am ea734872: am 5d46ecab: (-s ours) gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit 'ea73487215a4f8211dacd137c7ebf7183cde786f':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 13:58:31 -07:00
Jean-Baptiste Queru
410fdb29d1
am 4ea226a8: am a9453de7: am 9a23ea80: am f70df350: Add prebuilts/eclipse
...
* commit '4ea226a87fa91f3f9d71b21899b11de58679e6d1':
Add prebuilts/eclipse
2012-04-24 13:56:46 -07:00
Jean-Baptiste Queru
ea73487215
am 5d46ecab: (-s ours) gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit '5d46ecab0ebe13652459e9193263727e3637bf98':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 13:56:44 -07:00
Jean-Baptiste Queru
df833f0a76
am 24869f09: am ccfc9048: am 7bcf88fa: Add prebuilts/eclipse
...
* commit '24869f097217b686101b71655044b58f1927171e':
Add prebuilts/eclipse
2012-04-24 13:56:35 -07:00
Jean-Baptiste Queru
4928fea454
am ca80df9a: am 778f2187: Add prebuilts/eclipse
...
* commit 'ca80df9a7de1b4506aa9df39273e391a1c7ff9cd':
Add prebuilts/eclipse
2012-04-24 13:56:26 -07:00
Jean-Baptiste Queru
bf3db38752
resolved conflicts for merge of 4761ff95 to master
2012-04-24 13:53:27 -07:00
Anatol Pomazau
41908539dc
Create branch jb-dev-plus-aosp
2012-04-24 13:49:17 -07:00
Jean-Baptiste Queru
7ebe67317c
am e02ed69c: am be34e0a6: gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit 'e02ed69c557e0b63edf74476518542edd2d02dc4':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 13:34:01 -07:00
Jean-Baptiste Queru
e02ed69c55
am be34e0a6: gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit 'be34e0a616bf6dcb3fdd38b2ebea754302d7001d':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 13:32:05 -07:00
Jean-Baptiste Queru
4152ebc96c
am e1c9a9c9: gcc 4.6 for ALL the architectures - DO NOT MERGE
...
* commit 'e1c9a9c950438c6f0d9e38e9a498846485fa5dc3':
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 13:24:59 -07:00
Ying Wang
a5c49cf587
Initial manifest for jb-dev-ub-music2.
2012-04-24 13:20:16 -07:00
Jean-Baptiste Queru
5d46ecab0e
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 13:02:25 -07:00
Jean-Baptiste Queru
be34e0a616
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 13:00:30 -07:00
Jean-Baptiste Queru
e1c9a9c950
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 12:59:46 -07:00
Jean-Baptiste Queru
5ca38518f8
gcc 4.6 for ALL the architectures - DO NOT MERGE
2012-04-24 12:51:50 -07:00
Anatol Pomazau
682b0a501f
Create branch jb-dev
2012-04-24 12:31:29 -07:00
Anatol Pomazau
6a4f74b5e7
Add gcc 4.6 prebuilts
2012-04-24 11:59:34 -07:00
Alex Sakhartchouk
ad75f32cf3
Merge "Remove collada and pcre"
2012-04-23 14:45:12 -07:00
Anatol Pomazau
8a0bce9423
Add cibu-fonts
2012-04-23 09:36:05 -07:00
Colin Cross
f0d93d5395
Remove mips toolchains from pdk group
...
Change-Id: Iaf8ff81143b69fd3bbe0c0e5308b06e526ac7cf7
2012-04-21 19:47:27 -07:00
The Android Open Source Project
527678f04d
Add new toolchains
2012-04-20 14:29:22 -07:00
Jean-Baptiste Queru
a84f58d49c
am c9b27436: am ce806fa1: am d83cbc99: Add new-style toolchains
...
* commit 'c9b2743616eb155fcbb7192b3c716773881154c2':
Add new-style toolchains
2012-04-20 13:58:42 -07:00
Jean-Baptiste Queru
c9b2743616
am ce806fa1: am d83cbc99: Add new-style toolchains
...
* commit 'ce806fa149f3f7da9a63f8b69caf8aef2daacc06':
Add new-style toolchains
2012-04-20 13:55:53 -07:00
Jean-Baptiste Queru
ce806fa149
am d83cbc99: Add new-style toolchains
...
* commit 'd83cbc99c6a02f103f1212ccc0416b7981cabd07':
Add new-style toolchains
2012-04-20 13:53:44 -07:00
Jean-Baptiste Queru
aea41af939
am 16cb81c9: am 4b84c231: Add new-style toolchains
...
* commit '16cb81c93c367cd81ef374f97801e51741af75e7':
Add new-style toolchains
2012-04-20 13:48:52 -07:00
Jean-Baptiste Queru
d83cbc99c6
Add new-style toolchains
2012-04-20 13:47:09 -07:00
Jean-Baptiste Queru
16cb81c93c
am 4b84c231: Add new-style toolchains
...
* commit '4b84c2313ae5063243692b8881e5839ac84f7114':
Add new-style toolchains
2012-04-20 13:46:24 -07:00
Jean-Baptiste Queru
4b84c2313a
Add new-style toolchains
2012-04-20 13:42:52 -07:00
Jean-Baptiste Queru
2e9b5952e8
am a0289993: Add new-style toolchains
...
* commit 'a02899934f8efcc60aef490231041763b59803d9':
Add new-style toolchains
2012-04-20 13:35:32 -07:00
Jean-Baptiste Queru
a02899934f
Add new-style toolchains
2012-04-20 13:23:37 -07:00
Jean-Baptiste Queru
bc5a6b9944
Add new-style toolchains - DO NOT MERGE
2012-04-20 13:11:57 -07:00
Anatol Pomazau
e66e5c182b
Add fw/mff project
2012-04-20 11:29:38 -07:00
Jean-Baptiste Queru
39f2a8baec
Remove collada and pcre
2012-04-20 11:07:36 -07:00
Jean-Baptiste Queru
4ea226a87f
am a9453de7: am 9a23ea80: am f70df350: Add prebuilts/eclipse
...
* commit 'a9453de78b4216b2825a32c6049afc4413511631':
Add prebuilts/eclipse
2012-04-19 10:47:59 -07:00
Jean-Baptiste Queru
a9453de78b
am 9a23ea80: am f70df350: Add prebuilts/eclipse
...
* commit '9a23ea80c0f1bca8301e2d6bc63681a26d86a45c':
Add prebuilts/eclipse
2012-04-19 10:46:31 -07:00
Jean-Baptiste Queru
9a23ea80c0
am f70df350: Add prebuilts/eclipse
...
* commit 'f70df3508f18f3613e95eddb17a28e67c3c57870':
Add prebuilts/eclipse
2012-04-19 10:44:24 -07:00
Jean-Baptiste Queru
24869f0972
am ccfc9048: am 7bcf88fa: Add prebuilts/eclipse
...
* commit 'ccfc9048baf1ba87ae136e44b5be3f64d8ae57e2':
Add prebuilts/eclipse
2012-04-19 10:44:01 -07:00
Jean-Baptiste Queru
ccfc9048ba
am 7bcf88fa: Add prebuilts/eclipse
...
* commit '7bcf88faa3203d887c057f6ef8fa2e32b126c8e6':
Add prebuilts/eclipse
2012-04-19 10:41:34 -07:00
The Android Open Source Project
23f0e7830d
Add prebuilts/eclipse
2012-04-19 10:41:14 -07:00
Anatol Pomazau
e7f7ab36b7
Add aac to pdk group
2012-04-19 10:38:56 -07:00
Jean-Baptiste Queru
ca80df9a7d
am 778f2187: Add prebuilts/eclipse
...
* commit '778f21875f2c87815f2ada28672c815594f911f9':
Add prebuilts/eclipse
2012-04-19 10:22:44 -07:00
Jean-Baptiste Queru
f70df3508f
Add prebuilts/eclipse
2012-04-19 10:19:28 -07:00
Jean-Baptiste Queru
7bcf88faa3
Add prebuilts/eclipse
2012-04-19 10:19:00 -07:00
Jean-Baptiste Queru
778f21875f
Add prebuilts/eclipse
2012-04-19 10:18:35 -07:00
Jean-Baptiste Queru
4761ff95d1
Add prebuilts/eclipse
2012-04-19 10:14:36 -07:00
Colin Cross
249e1279f3
Add groups attributes to manifest
...
Add the appropriate projects to the following manifest groups:
pdk
vendor
grouper
manta
exynos5
tegra3
broadcom_wlan
Change-Id: I287eb7a3f6d9bba95691c7a48b50c0b3c432b67c
2012-04-18 16:37:52 -07:00
Joe Onorato
b2c61410e6
am 2c64784d: (-s ours) Use Music2 from master instead of eagles.
...
* commit '2c64784dc0c4d36e6e95ba96fdc9dcd4f47965b7':
Use Music2 from master instead of eagles.
2012-04-18 15:27:35 -07:00
Joe Onorato
2c64784dc0
Use Music2 from master instead of eagles.
...
Change-Id: Iced630b0ac3e302dc81ccedec5c966724d470cb2
2012-04-13 14:32:25 -07:00
Jean-Baptiste Queru
c3e078f201
am 79745f04: am b66c554d: am 639e57ed: am 88673330: Add MIPS toolchains
...
* commit '79745f047a6b8f4bf39ce7455c2f38133383b7fd':
Add MIPS toolchains
2012-04-12 15:37:52 -07:00
Jean-Baptiste Queru
036e33a160
am a5403a40: am 0a39f249: am 96b328c2: Add MIPS toolchains
...
* commit 'a5403a405666ebb00c6b2efc35f9229104788322':
Add MIPS toolchains
2012-04-12 15:37:51 -07:00
Jean-Baptiste Queru
79745f047a
am b66c554d: am 639e57ed: am 88673330: Add MIPS toolchains
...
* commit 'b66c554dda9010e98af8c55b5adb9735f1369ba9':
Add MIPS toolchains
2012-04-12 15:35:08 -07:00
Jean-Baptiste Queru
a5403a4056
am 0a39f249: am 96b328c2: Add MIPS toolchains
...
* commit '0a39f249515fa87bf4bbdebb17ef1a8a0a7452d4':
Add MIPS toolchains
2012-04-12 15:35:07 -07:00
Jean-Baptiste Queru
b66c554dda
am 639e57ed: am 88673330: Add MIPS toolchains
...
* commit '639e57ed1a21c465a88778fc9605f0a34e1f612c':
Add MIPS toolchains
2012-04-12 15:32:47 -07:00
Jean-Baptiste Queru
0a39f24951
am 96b328c2: Add MIPS toolchains
...
* commit '96b328c224308420e984c59b5976f68bc46121e5':
Add MIPS toolchains
2012-04-12 15:32:46 -07:00
Jean-Baptiste Queru
639e57ed1a
am 88673330: Add MIPS toolchains
...
* commit '8867333006ef95e8fa07090c0ee68c6313bd61a9':
Add MIPS toolchains
2012-04-12 13:24:16 -07:00
Jean-Baptiste Queru
bdbfdb01c6
am 5ee01fcf: am f0ce529b: Add MIPS toolchains
...
* commit '5ee01fcf67b5908552fd510c574d16c10db828b1':
Add MIPS toolchains
2012-04-12 13:22:45 -07:00
Jean-Baptiste Queru
5ee01fcf67
am f0ce529b: Add MIPS toolchains
...
* commit 'f0ce529b5ba4bf5568a2dbe8b1c1a4e266284e4f':
Add MIPS toolchains
2012-04-12 13:20:09 -07:00
Jean-Baptiste Queru
bb4e3ef55e
Merge form ics-scoop-plus-aosp
2012-04-12 13:20:02 -07:00
Jean-Baptiste Queru
8867333006
Add MIPS toolchains
2012-04-12 13:19:23 -07:00
Jean-Baptiste Queru
96b328c224
Add MIPS toolchains
2012-04-12 13:18:18 -07:00
Jean-Baptiste Queru
f0ce529b5b
Add MIPS toolchains
2012-04-12 13:17:30 -07:00
Jean-Baptiste Queru
fd0ca8827d
Add MIPS toolchains
2012-04-12 13:13:39 -07:00
The Android Open Source Project
9a452a7168
Add MIPS toolchains
2012-04-12 12:49:44 -07:00
Anatol Pomazau
049dcfa9a5
Add MIPS prebuilt projects
2012-04-12 10:25:45 -07:00
Neel Parekh
98e0d170cd
Add support library to our manifest
2012-04-11 16:53:31 -07:00
Jean-Baptiste Queru
b430ce7451
am f922cd9b: am 2c304480: am ed69d239: am 2f84bf58: Add external/checkpolicy
...
* commit 'f922cd9b3ad599a19998ce0eef8c703d745d9297':
Add external/checkpolicy
2012-04-10 13:23:51 -07:00
Jean-Baptiste Queru
f922cd9b3a
am 2c304480: am ed69d239: am 2f84bf58: Add external/checkpolicy
...
* commit '2c304480446ebe040a30a9ab6e45482118b7bbc1':
Add external/checkpolicy
2012-04-10 13:22:15 -07:00
Jean-Baptiste Queru
2c30448044
am ed69d239: am 2f84bf58: Add external/checkpolicy
...
* commit 'ed69d2396bfa9d511699c9149867c254f558891f':
Add external/checkpolicy
2012-04-10 13:20:16 -07:00
Jean-Baptiste Queru
ed69d2396b
am 2f84bf58: Add external/checkpolicy
...
* commit '2f84bf5837dec2c5b763d9a1d2c72f8ba3357010':
Add external/checkpolicy
2012-04-10 13:18:16 -07:00
The Android Open Source Project
1dd8491e5e
Add checkpolicy
2012-04-10 13:09:57 -07:00
Jean-Baptiste Queru
2f84bf5837
Add external/checkpolicy
2012-04-10 12:51:30 -07:00
Jean-Baptiste Queru
6e2ac0db8a
am bc085507: am 1a1e3947: am 7b9e01f8: Add external/checkpolicy
...
* commit 'bc0855077bab1773f36c3d3d2b5353a0961278ba':
Add external/checkpolicy
2012-04-10 12:47:58 -07:00
Jean-Baptiste Queru
bc0855077b
am 1a1e3947: am 7b9e01f8: Add external/checkpolicy
...
* commit '1a1e39470d87c23793eb41e71a7f14505fb8a62c':
Add external/checkpolicy
2012-04-10 12:45:57 -07:00
Jean-Baptiste Queru
1a1e39470d
am 7b9e01f8: Add external/checkpolicy
...
* commit '7b9e01f857b0a91771b51cd4fe1f551a316c1383':
Add external/checkpolicy
2012-04-10 12:44:27 -07:00
Jean-Baptiste Queru
7b9e01f857
Add external/checkpolicy
2012-04-10 12:41:20 -07:00
Jean-Baptiste Queru
b7d34a0efb
am 471a6103: am 7002e6b2: Add external/checkpolicy
...
* commit '471a61036dbfdfb19d1ace6bfaebc6b79e0bc6c1':
Add external/checkpolicy
2012-04-10 12:36:24 -07:00
Jean-Baptiste Queru
471a61036d
am 7002e6b2: Add external/checkpolicy
...
* commit '7002e6b2deb76711191e6d211fc892bed1780465':
Add external/checkpolicy
2012-04-10 12:35:02 -07:00
Jean-Baptiste Queru
7002e6b2de
Add external/checkpolicy
2012-04-10 12:32:38 -07:00
Jean-Baptiste Queru
4a56c2c01e
am 76901269: Add external/checkpolicy
...
* commit '7690126933a3b81161914ebb178b5c4f58112851':
Add external/checkpolicy
2012-04-10 12:28:36 -07:00
Jean-Baptiste Queru
7690126933
Add external/checkpolicy
2012-04-10 12:26:26 -07:00
Anatol Pomazau
37039876d5
Add external/checkpolicy
2012-04-10 10:58:30 -07:00
Anatol Pomazau
1bbe45dde4
Add external/aac
2012-04-06 11:07:21 -07:00
Ed Heyl
49fc750306
reconcile branches for future merges
2012-04-06 09:54:03 -07:00
Anatol Pomazau
487b74ee3e
Add external/stressapptest
2012-04-06 08:56:27 -07:00
Anatol Pomazau
30600e2548
Add external/stressapptest
2012-04-04 17:32:02 -07:00
Jean-Baptiste Queru
940b1a34dc
am cd3ebfe7: am f021a866: am c8931aee: am 2f20ba50: Add external/eclipse-basebuilder
...
* commit 'cd3ebfe78df5a0dc71e77b4ec963a7bcf600dcb7':
Add external/eclipse-basebuilder
2012-04-04 14:19:34 -07:00
The Android Open Source Project
12c5c7e418
Add basebuilder
2012-04-04 14:18:27 -07:00
Jean-Baptiste Queru
cd3ebfe78d
am f021a866: am c8931aee: am 2f20ba50: Add external/eclipse-basebuilder
...
* commit 'f021a86685de548123ca95e31d86fbd38f5ec6c0':
Add external/eclipse-basebuilder
2012-04-04 14:17:29 -07:00
Jean-Baptiste Queru
f021a86685
am c8931aee: am 2f20ba50: Add external/eclipse-basebuilder
...
* commit 'c8931aee99c2369648145bfccbecca2befe7f590':
Add external/eclipse-basebuilder
2012-04-04 14:14:39 -07:00
Jean-Baptiste Queru
c8931aee99
am 2f20ba50: Add external/eclipse-basebuilder
...
* commit '2f20ba504eb344e00548d0be7f1f00cfe0540a0b':
Add external/eclipse-basebuilder
2012-04-04 14:12:40 -07:00
Jean-Baptiste Queru
e0d594df73
am c525ffd4: am 4eccd071: am 1ed67822: Add external/eclipse-basebuilder
...
* commit 'c525ffd4f3dde1d012132f2edebef7d04aa1d0f2':
Add external/eclipse-basebuilder
2012-04-04 13:51:19 -07:00
Jean-Baptiste Queru
c525ffd4f3
am 4eccd071: am 1ed67822: Add external/eclipse-basebuilder
...
* commit '4eccd071ca99d5bc09930fa90af02bc220473626':
Add external/eclipse-basebuilder
2012-04-04 13:48:15 -07:00
Jean-Baptiste Queru
4eccd071ca
am 1ed67822: Add external/eclipse-basebuilder
...
* commit '1ed67822a1c429487bec1ad66dd233ed0d75e37e':
Add external/eclipse-basebuilder
2012-04-04 13:46:04 -07:00
Jean-Baptiste Queru
2f20ba504e
Add external/eclipse-basebuilder
2012-04-04 13:44:31 -07:00
Jean-Baptiste Queru
22c5491af4
am 2d397554: am e6b9b3e8: Add external/eclipse-basebuilder
...
* commit '2d39755404fd70122d8b3b5eb2013d3e6a269165':
Add external/eclipse-basebuilder
2012-04-04 13:40:50 -07:00
Jean-Baptiste Queru
2d39755404
am e6b9b3e8: Add external/eclipse-basebuilder
...
* commit 'e6b9b3e897332da5f4a5df93d7fc823317ae0572':
Add external/eclipse-basebuilder
2012-04-04 13:39:14 -07:00
Jean-Baptiste Queru
1ed67822a1
Add external/eclipse-basebuilder
2012-04-04 13:37:26 -07:00
Jean-Baptiste Queru
4ac62fc37e
am abbb354c: Add external/eclipse-basebuilder
...
* commit 'abbb354cc0bc2357bb3c23db58fb1c8425cff489':
Add external/eclipse-basebuilder
2012-04-04 13:36:53 -07:00
Jean-Baptiste Queru
e6b9b3e897
Add external/eclipse-basebuilder
2012-04-04 13:36:31 -07:00
Jean-Baptiste Queru
abbb354cc0
Add external/eclipse-basebuilder
2012-04-04 13:34:23 -07:00
Anatol Pomazau
409f4c6936
Add external/eclipse-basebuilder
2012-04-03 13:34:51 -07:00
Virgil King
b154cc4adf
Merge "Remove books project to make way for prebuilt"
2012-04-02 13:59:39 -07:00
Anatol Pomazau
ecc22eb99c
Add ub/Ears
2012-03-30 17:49:38 -07:00
Anatol Pomazau
6df51b300e
Add frameworks/testing project
2012-03-29 11:45:48 -07:00
Alex Sakhartchouk
50a17fc7a9
Merge "Add frameworks/rs"
2012-03-28 15:09:05 -07:00
Jean-Baptiste Queru
0659fc2acb
am e6c9ed4c: am 10512192: am 780ed58a: am cec30e2b: Add torospr to AOSP master mirror
...
* commit 'e6c9ed4cd3772e2561494b2bef026fa78adf06f5':
Add torospr to AOSP master mirror
2012-03-28 13:15:26 -07:00
Jean-Baptiste Queru
e6c9ed4cd3
am 10512192: am 780ed58a: am cec30e2b: Add torospr to AOSP master mirror
...
* commit '105121922f875cc21fe52bd4f084d46a685e4268':
Add torospr to AOSP master mirror
2012-03-28 12:27:26 -07:00
Jean-Baptiste Queru
105121922f
am 780ed58a: am cec30e2b: Add torospr to AOSP master mirror
...
* commit '780ed58a5bab929906ab5f69be27ad6782c9061a':
Add torospr to AOSP master mirror
2012-03-28 12:25:13 -07:00
Jean-Baptiste Queru
780ed58a5b
am cec30e2b: Add torospr to AOSP master mirror
...
* commit 'cec30e2b48c78359add7e5b2b65cd05bdb3b728a':
Add torospr to AOSP master mirror
2012-03-28 12:22:57 -07:00
Jean-Baptiste Queru
cec30e2b48
Add torospr to AOSP master mirror
...
Change-Id: I6eae466f65b03d4b206f21ea4a6090f51343999c
2012-03-28 12:21:11 -07:00
The Android Open Source Project
dd6bc4ecde
Merge from ics-mr1, add torospr
2012-03-28 12:15:33 -07:00
The Android Open Source Project
098a6e8117
Add torospr
...
Change-Id: I9f03433b3b4ac7a5c47717cc3c705284547d221f
2012-03-28 12:08:08 -07:00
Anatol Pomazau
37664cd6e2
Add frameworks/rs
2012-03-28 09:38:28 -07:00
Anatol Pomazau
807748aaf1
Add frameworks/wilhelm
2012-03-26 17:17:42 -07:00
Anatol Pomazau
5f6672e180
Add a space for google experimental code
2012-03-23 13:14:19 -07:00
Virgil King
3527ab9de4
Remove books project to make way for prebuilt
2012-03-23 13:44:38 -04:00
Anatol Pomazau
018e43a35c
Move libvideoeditor stuff to av
2012-03-22 18:09:42 -07:00
Anatol Pomazau
2b26fe4fc7
Add linux-tools-perf
2012-03-22 12:42:40 -07:00
Jean-Baptiste Queru
b0c650f4a7
am d9a2b177: am d23f0a1e: am e3b59b2e: am 8c1a6d14: Add clat and gcc 4.6 host prebuilts
...
* commit 'd9a2b1771c7fd906bdbee315e9d8ad478bb6ce88':
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:35:50 -07:00
Jean-Baptiste Queru
d9a2b1771c
am d23f0a1e: am e3b59b2e: am 8c1a6d14: Add clat and gcc 4.6 host prebuilts
...
* commit 'd23f0a1e25b03852d045521225eea2beb73560fc':
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:34:03 -07:00
Jean-Baptiste Queru
d23f0a1e25
am e3b59b2e: am 8c1a6d14: Add clat and gcc 4.6 host prebuilts
...
* commit 'e3b59b2e0c569a1283dfc9808fc7071d2388489a':
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:32:46 -07:00
Jean-Baptiste Queru
e3b59b2e0c
am 8c1a6d14: Add clat and gcc 4.6 host prebuilts
...
* commit '8c1a6d142f40d9b75b43ecfd83ea3fb16d180c72':
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:31:11 -07:00
Jean-Baptiste Queru
8c1a6d142f
Add clat and gcc 4.6 host prebuilts
...
Change-Id: I2c1ed3f642afe5610206f35b24e0a7f3cbcafda5
2012-03-22 08:27:37 -07:00
The Android Open Source Project
2ba9cf7435
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:24:42 -07:00
Jean-Baptiste Queru
5321a1c8b1
am 932cc4a0: am fc2f6ca4: am 53f2a700: Add clat and gcc 4.6 host prebuilts
...
* commit '932cc4a0b900022fb2051140990346d3f0033b5c':
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:06:25 -07:00
Jean-Baptiste Queru
932cc4a0b9
am fc2f6ca4: am 53f2a700: Add clat and gcc 4.6 host prebuilts
...
* commit 'fc2f6ca4863a90cf4d5dfc0a579c7713935bb2bb':
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:04:39 -07:00
Jean-Baptiste Queru
fc2f6ca486
am 53f2a700: Add clat and gcc 4.6 host prebuilts
...
* commit '53f2a700168250a55741da543e68dd1170a89566':
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:03:39 -07:00
Jean-Baptiste Queru
452a059292
am 0c671abb: am 8e7d1447: Add clat and gcc 4.6 host prebuilts
...
* commit '0c671abb8b12779daf6cca3471980c4068696377':
Add clat and gcc 4.6 host prebuilts
2012-03-22 08:01:39 -07:00
Jean-Baptiste Queru
53f2a70016
Add clat and gcc 4.6 host prebuilts
...
Change-Id: I8ba29b2ca86bbb55db649cbc10f821092ac39f9d
2012-03-22 08:00:36 -07:00
Jean-Baptiste Queru
0c671abb8b
am 8e7d1447: Add clat and gcc 4.6 host prebuilts
...
* commit '8e7d1447e8d774237544b3954e5ce151fb11c7c5':
Add clat and gcc 4.6 host prebuilts
2012-03-22 07:59:58 -07:00
Jean-Baptiste Queru
89ea999627
Merge d8fdd85c
...
Change-Id: I928dee71a92f32b474011b4e23f2cca2550b963c
2012-03-22 07:58:33 -07:00
Jean-Baptiste Queru
8e7d1447e8
Add clat and gcc 4.6 host prebuilts
...
Change-Id: Id1b1a288e625b41b03fa680af85f4ba9e8b2fa0d
2012-03-22 07:56:27 -07:00
Jean-Baptiste Queru
d8fdd85cd2
Add clat and gcc 4.6 host prebuilts
...
Change-Id: Ia857c72b9503afa7032bcdb94fa6013ceeaffd13
2012-03-22 07:51:14 -07:00
The Android Open Source Project
422710ca23
Add windowbuilder
2012-03-21 16:45:42 -07:00
Jean-Baptiste Queru
2f7fb11c8a
am 12bad297: am c0219ad5: am 6e9d1d33: am 99d136bf: Add eclipse-windowbuilder
...
* commit '12bad297b00324ec781941d21a9d938eb3f39e31':
Add eclipse-windowbuilder
2012-03-21 16:39:27 -07:00
Jean-Baptiste Queru
12bad297b0
am c0219ad5: am 6e9d1d33: am 99d136bf: Add eclipse-windowbuilder
...
* commit 'c0219ad57f367bb39307c1521b2c1ac580f66c24':
Add eclipse-windowbuilder
2012-03-21 16:37:12 -07:00
Jean-Baptiste Queru
c0219ad57f
am 6e9d1d33: am 99d136bf: Add eclipse-windowbuilder
...
* commit '6e9d1d33cec6da6db2ede120533d2f72e4d362ed':
Add eclipse-windowbuilder
2012-03-21 16:35:51 -07:00
Jean-Baptiste Queru
6e9d1d33ce
am 99d136bf: Add eclipse-windowbuilder
...
* commit '99d136bf35ffa4b1b94f12fc40705725b6140f4c':
Add eclipse-windowbuilder
2012-03-21 16:33:50 -07:00
Jean-Baptiste Queru
99d136bf35
Add eclipse-windowbuilder
2012-03-21 16:29:15 -07:00
Jean-Baptiste Queru
c81b939e52
am 6a79f6c6: am 5ad053f7: am 46c7d6cd: Add eclipse-windowbuilder
...
* commit '6a79f6c65a4422d66117bdfc08e6ad9e6d0d9ee1':
Add eclipse-windowbuilder
2012-03-21 16:21:08 -07:00
Jean-Baptiste Queru
6a79f6c65a
am 5ad053f7: am 46c7d6cd: Add eclipse-windowbuilder
...
* commit '5ad053f74c3e3b504f8f445efcbd6fc147cbe0b6':
Add eclipse-windowbuilder
2012-03-21 16:19:11 -07:00
Jean-Baptiste Queru
5ad053f74c
am 46c7d6cd: Add eclipse-windowbuilder
...
* commit '46c7d6cd0cc0e390ea40ce2955c0b7dd958bc7b6':
Add eclipse-windowbuilder
2012-03-21 16:17:36 -07:00
Jean-Baptiste Queru
88a7461af9
am 3f25fa9c: am 6a848aa0: Add eclipse-windowbuilder
...
* commit '3f25fa9cf4583ada5d19777681f5af395ee87833':
Add eclipse-windowbuilder
2012-03-21 16:12:04 -07:00
Jean-Baptiste Queru
46c7d6cd0c
Add eclipse-windowbuilder
...
Change-Id: I85aac2490491359e67953934a63bc242eaa7bb8b
2012-03-21 16:11:54 -07:00
Jean-Baptiste Queru
3f25fa9cf4
am 6a848aa0: Add eclipse-windowbuilder
...
* commit '6a848aa0a8e37ad20c3f952380effd717faddb5f':
Add eclipse-windowbuilder
2012-03-21 16:10:22 -07:00
Jean-Baptiste Queru
cdada2fa25
am a1d7008f: Add eclipse-windowbuilder
...
* commit 'a1d7008f0da2aa4a48655e9b7df4f97c418669b6':
Add eclipse-windowbuilder
2012-03-21 15:58:57 -07:00
Jean-Baptiste Queru
6a848aa0a8
Add eclipse-windowbuilder
2012-03-21 15:58:09 -07:00
Jean-Baptiste Queru
a1d7008f0d
Add eclipse-windowbuilder
2012-03-21 15:56:38 -07:00
Anatol Pomazau
e358461952
Add eclipse-windowbuilder
2012-03-21 15:24:57 -07:00
Anatol Pomazau
b2ed63c3e3
Add mdnsresponder project
2012-03-20 12:02:53 -07:00
Andrew Flynn
946538f575
am 0c100d2a: (-s ours) am 59572bd9: DO NOT MERGE Use prebuilt for Gmail
...
* commit '0c100d2ac2b2a5bcdf543dd3715339b4a821804e':
DO NOT MERGE Use prebuilt for Gmail
2012-03-15 11:17:31 -07:00
Ed Heyl
3dbf9deb38
added new YouTube project
2012-03-15 09:01:58 -07:00
Jeff Hamilton
4302d206d8
Add OneUp to master.
2012-03-14 19:10:19 -05:00
Andrew Flynn
0c100d2ac2
am 59572bd9: DO NOT MERGE Use prebuilt for Gmail
...
* commit '59572bd91c4b08e57af55ea9ec7c5eec2302f3af':
DO NOT MERGE Use prebuilt for Gmail
2012-03-14 09:05:24 -07:00
Andrew Flynn
59572bd91c
DO NOT MERGE Use prebuilt for Gmail
...
Change-Id: I40258989056f0bc94750fa475cf54e8e13c207b7
2012-03-13 15:34:03 -07:00
Anatol Pomazau
06bc115476
Add pdk/data/google
2012-03-13 14:24:55 -07:00
Jack Palevich
88204a2515
Pull glview and carouselgl from froyo-ub-music-eagles
...
This matches where we pull music2 from, so we will
stay in sync with changes that cross the music2,
glview and carouselgl components.
2012-03-13 13:00:26 -07:00
Andrew Flynn
3badc47491
am 75d56957: (-s ours) am 9b609e32: DO NOT MERGE
...
* commit '75d56957761557dacfbd48f87a571bdb7fc5d4ba':
DO NOT MERGE
2012-03-13 09:36:10 -07:00
Andrew Flynn
75d5695776
am 9b609e32: DO NOT MERGE
...
* commit '9b609e32f00e23ff98c16684ffb394066d64942c':
DO NOT MERGE
2012-03-13 09:33:20 -07:00
Andrew Flynn
9b609e32f0
DO NOT MERGE
...
Books is provided via prebuilt, so remove project from ics-scoop.
Change-Id: Iedbc369b6c6af6e8894c689ab448a52e0daed876
2012-03-13 08:59:36 -07:00
Ying Wang
9a7fdd9382
am 860263c8: (-s ours) am ef0eb8a7: am c0ba5d94: [DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
...
* commit '860263c8ec62b158a25a97e84162f38771d45712':
2012-03-09 11:28:12 -08:00
Ying Wang
1c71a815bb
am ee8782d3: (-s ours) am 7ee5913d: am c0ba5d94: [DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
...
* commit 'ee8782d3d9e443be0ef6e74c8361a9132a0c654e':
[DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
2012-03-09 10:24:27 -08:00
Ying Wang
792fcc4f2a
Add back Music2.
...
Which was remvoed in my previous conflict resolve.
2012-03-09 10:20:56 -08:00
Ying Wang
364c254ac8
resolved conflicts for merge of c0ba5d94 to ics-aah
2012-03-08 21:36:53 -08:00
Ying Wang
860263c8ec
am ef0eb8a7: am c0ba5d94: [DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
...
* commit 'ef0eb8a74402a8d9e2228ba49a8cbef70ab7e9ba':
2012-03-08 20:17:18 -08:00
Ying Wang
ee8782d3d9
am 7ee5913d: am c0ba5d94: [DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
...
* commit '7ee5913d9997fc9d4f0a92c74525a7b892310bb5':
[DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
2012-03-08 20:14:10 -08:00
Ying Wang
ef0eb8a744
am c0ba5d94: [DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
...
* commit 'c0ba5d94967a6af0188402341878dc34caabe015':
[DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
2012-03-08 20:12:16 -08:00
Ying Wang
7ee5913d99
am c0ba5d94: [DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
...
* commit 'c0ba5d94967a6af0188402341878dc34caabe015':
[DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
2012-03-08 20:11:56 -08:00
Ying Wang
c0ba5d9496
[DO NOT MERGE] Use prebuilt Music2, Videos, YouTube now.
...
Bug: 6140987
2012-03-08 16:49:56 -08:00
Anatol Pomazau
95ab01c32d
Merge "Add framewors/native project"
2012-03-08 14:47:11 -08:00
Neel Parekh
8984dbaca5
Add play library
2012-03-08 13:37:53 -08:00
Anatol Pomazau
e9600244ca
am 64296583: am b25f546f: Add grouper-alsa
...
* commit '64296583f23809f5e6e0a51b50111f8891da37a8':
Add grouper-alsa
2012-03-08 12:23:34 -08:00
Anatol Pomazau
64296583f2
am b25f546f: Add grouper-alsa
...
* commit 'b25f546f2d43aa355f93ab7e5211d7e26a963dcd':
Add grouper-alsa
2012-03-08 12:21:21 -08:00
Anatol Pomazau
b25f546f2d
Add grouper-alsa
2012-03-08 12:17:37 -08:00
Anatol Pomazau
82ba7d5c24
Add compiler-rt from LLVM suit
2012-03-08 10:15:03 -08:00
Anatol Pomazau
59049e8821
am af13b6dc: am 6abec5f4: Add BrowserProvider project
...
* commit 'af13b6dc13dfa2ddf5c48c321faa34c1a33141d2':
Add BrowserProvider project
2012-03-08 09:00:30 -08:00
Anatol Pomazau
3438ef9359
am 632739a8: am 26aa4d69: Add Chrome project
...
* commit '632739a8243ef8be5c50410434257eb8ef180edc':
Add Chrome project
2012-03-08 09:00:29 -08:00
Anatol Pomazau
af13b6dc13
am 6abec5f4: Add BrowserProvider project
...
* commit '6abec5f4394d68f541d89aa7452ea968cf9a394b':
Add BrowserProvider project
2012-03-08 08:57:34 -08:00
Anatol Pomazau
632739a824
am 26aa4d69: Add Chrome project
...
* commit '26aa4d699b616d1c337353ea371ddd9b30b1b058':
Add Chrome project
2012-03-08 08:57:33 -08:00
Anatol Pomazau
6abec5f439
Add BrowserProvider project
2012-03-08 08:54:05 -08:00
Anatol Pomazau
26aa4d699b
Add Chrome project
2012-03-08 08:53:30 -08:00
Anatol Pomazau
c945b7fd80
Add GoogleSpellChecker project
2012-03-08 08:15:19 -08:00
Ying Wang
cbba012ffc
Add back vendor/unbundled_google/packages/PlusOne
...
Bug: 6119217
The PlusOne project was removed in ics-mr1 manifest and merged into
master manifest. We don't merge the prebuilt changes to master, so we
need to add back the PlusOne project.
2012-03-07 17:40:41 -08:00
Ying Wang
6a53a0d09d
am d05d50ac: am acc11480: am 2a73f52b: Switch to prebuilt Phonesky and PlusOne.
...
* commit 'd05d50ac3221da7dc8d999c24916ee2113a5f301':
2012-03-07 15:39:48 -08:00
Ying Wang
9af817a05f
am c7471788: am 4239bc83: am 2a73f52b: Switch to prebuilt Phonesky and PlusOne.
...
* commit 'c7471788a2002785ef2045fb1d4521a1797c3306':
Switch to prebuilt Phonesky and PlusOne.
2012-03-07 15:39:47 -08:00
Anatol Pomazau
cd9618cb25
Add framewors/native project
2012-03-07 15:09:40 -08:00
Anatol Pomazau
f0863ae143
Add prebuilts projects
2012-03-06 12:21:29 -08:00
Ying Wang
d05d50ac32
am acc11480: am 2a73f52b: Switch to prebuilt Phonesky and PlusOne.
...
* commit 'acc114804811ca3bcab018fa366dd4268eec0fb8':
2012-03-05 16:36:57 -08:00
Jason Simmons
645e0436ef
Merge "Point Music2 at the Eagles branch" into ics-aah
2012-03-05 16:36:13 -08:00
Ying Wang
c7471788a2
am 4239bc83: am 2a73f52b: Switch to prebuilt Phonesky and PlusOne.
...
* commit '4239bc83ec314fbff33b09c2b26ecd3e655534b3':
Switch to prebuilt Phonesky and PlusOne.
2012-03-05 16:36:00 -08:00
Ying Wang
acc1148048
am 2a73f52b: Switch to prebuilt Phonesky and PlusOne.
...
* commit '2a73f52b8df06f9b011816f0042d6b45e903a4c0':
Switch to prebuilt Phonesky and PlusOne.
2012-03-05 15:50:56 -08:00
Ying Wang
ca673a4193
am 2a73f52b: Switch to prebuilt Phonesky and PlusOne.
...
* commit '2a73f52b8df06f9b011816f0042d6b45e903a4c0':
Switch to prebuilt Phonesky and PlusOne.
2012-03-05 15:50:47 -08:00
Ying Wang
4239bc83ec
am 2a73f52b: Switch to prebuilt Phonesky and PlusOne.
...
* commit '2a73f52b8df06f9b011816f0042d6b45e903a4c0':
Switch to prebuilt Phonesky and PlusOne.
2012-03-05 15:50:35 -08:00
Ying Wang
2a73f52b8d
Switch to prebuilt Phonesky and PlusOne.
...
Bug: 6119217
2012-03-05 15:36:19 -08:00
The Android Open Source Project
e8fe688bee
add ti/wpan
2012-03-05 13:56:50 -08:00
Jean-Baptiste Queru
c95271cdc6
am 1fb1a647: am 238b09c4: am cf2ec998: am ed723de8: Add wpan project
...
* commit '1fb1a647466de74355c2e56e15c9f62798ca1690':
Add wpan project
2012-03-05 13:47:04 -08:00
Jean-Baptiste Queru
1fb1a64746
am 238b09c4: am cf2ec998: am ed723de8: Add wpan project
...
* commit '238b09c4a734284b83c3c06e37d9d6dddadabd14':
Add wpan project
2012-03-05 13:44:21 -08:00
Jean-Baptiste Queru
238b09c4a7
am cf2ec998: am ed723de8: Add wpan project
...
* commit 'cf2ec99845a6a2a2321b2a7ff4766397739fb18f':
Add wpan project
2012-03-05 13:42:45 -08:00
Jean-Baptiste Queru
cf2ec99845
am ed723de8: Add wpan project
...
* commit 'ed723de84fbb4ba3906f461ec2307c8be7905b5b':
Add wpan project
2012-03-05 13:40:27 -08:00
Jean-Baptiste Queru
27af03597e
am b0ae4401: am c78fead4: am 2605f987: Add wpan project
...
* commit 'b0ae4401c3c5636ac36a951f4fe7c1de708d036b':
Add wpan project
2012-03-05 13:39:42 -08:00
Jean-Baptiste Queru
b0ae4401c3
am c78fead4: am 2605f987: Add wpan project
...
* commit 'c78fead4eed17b60ac01ffbd7653395667839674':
Add wpan project
2012-03-05 13:37:09 -08:00
Jean-Baptiste Queru
ed723de84f
Add wpan project
...
Change-Id: Ife0356c54922f54dd2105628665ca20325f4393b
2012-03-05 13:35:19 -08:00
Jean-Baptiste Queru
c78fead4ee
am 2605f987: Add wpan project
...
* commit '2605f98706626e6ae506b923aa78499b18b34976':
Add wpan project
2012-03-05 13:34:43 -08:00
Jean-Baptiste Queru
2605f98706
Add wpan project
...
Change-Id: I7dc87f943452249a671ef8d7f6fe6a3f3738c686
2012-03-05 13:29:13 -08:00
Jean-Baptiste Queru
09a32427ac
am b0c53909: am 4bebb9d2: Add wpan project
...
* commit 'b0c539091194ee2f958da307b2763263c7984b8c':
Add wpan project
2012-03-05 13:24:02 -08:00
Jean-Baptiste Queru
b0c5390911
am 4bebb9d2: Add wpan project
...
* commit '4bebb9d23a19fd3775ac0a14def5a87fa0fa7b6c':
Add wpan project
2012-03-05 13:22:45 -08:00
Jean-Baptiste Queru
4bebb9d23a
Add wpan project
...
Change-Id: If23cf15ff74f1b6a22f6902f43bcecf0417c49fa
2012-03-05 13:20:28 -08:00
Jean-Baptiste Queru
c572943082
am b42ecbc0: Add wpan project
...
* commit 'b42ecbc0ef953ccd1243939250e8619617c92525':
Add wpan project
2012-03-05 13:19:06 -08:00
Jean-Baptiste Queru
b42ecbc0ef
Add wpan project
...
Change-Id: Ifdee28fc7c11a7cff4aa346e22eed24735b306d3
2012-03-05 13:16:06 -08:00
Jason Simmons
d57055fd0b
Point Music2 at the Eagles branch
2012-03-05 13:09:41 -08:00
Anatol Pomazau
5f7e7f4d69
Add ti/wpan
2012-03-05 12:21:15 -08:00
Neel Parekh
a70f10de55
Add play to master-ub-music2
2012-03-01 15:43:08 -08:00
Anatol Pomazau
f9502fb3f2
Add frameworks/ml
2012-03-01 11:02:34 -08:00
Ying Wang
d3dc20e524
Remove Finsky from the master manifest.
...
Bug: 6094257
Now we use prebuilt for the Market app.
2012-02-29 18:11:34 -08:00
Ying Wang
72e98589b8
Switch Finksy's revision to master.
...
To check in prebuilt Phonesky.apk.
Bug: 6094257.
2012-02-29 16:12:16 -08:00
Anatol Pomazau
87a51c2757
Add a project for 'Play' device specific libraries
2012-02-29 14:09:41 -08:00
Dima Zavin
8f866fd6b6
master_manifest: do not include arm/mali in the manifest
...
Signed-off-by: Dima Zavin <dima@android.com >
2012-02-29 11:13:26 -08:00
Anatol Pomazau
3b165c210d
Add jmonkeyengine project
2012-02-28 13:34:49 -08:00
Anatol Pomazau
b0b56032e4
am e5a21ff8: am 1b48f7fe: Add asus/nakasi project
...
* commit 'e5a21ff829069508bce2cb9bfd5ff188bf67cdf1':
Add asus/nakasi project
2012-02-28 13:33:22 -08:00
Anatol Pomazau
e5a21ff829
am 1b48f7fe: Add asus/nakasi project
...
* commit '1b48f7fef82792dc360405ba8c39c7d4f7f66090':
Add asus/nakasi project
2012-02-28 13:30:38 -08:00
Anatol Pomazau
1b48f7fef8
Add asus/nakasi project
2012-02-28 13:27:47 -08:00
Neel Parekh
6e2a24d783
Add at home to master-ub-music2
2012-02-24 11:02:07 -08:00
Jean-Baptiste Queru
a8e3c28072
Merge selinux changes from upstream branches
2012-02-24 09:09:24 -08:00
Jean-Baptiste Queru
d692042cf9
am ecd5c837: am c5fe9114: am 9ff2fdb0: Add selinux projects
...
* commit 'ecd5c837fcc72e0e88edf91ff92388ab53a8095f':
Add selinux projects
2012-02-24 09:06:06 -08:00
Jean-Baptiste Queru
ecd5c837fc
am c5fe9114: am 9ff2fdb0: Add selinux projects
...
* commit 'c5fe911493d4d1798397a3ba6f6bff4d16b5aa85':
Add selinux projects
2012-02-24 09:04:04 -08:00
Jean-Baptiste Queru
f9a7473999
am 5c8b46cd: am c22b8164: Add selinux projects
...
* commit '5c8b46cd0e9d0b3a5bf0d387ac1bacf600b94358':
Add selinux projects
2012-02-24 09:03:18 -08:00
Jean-Baptiste Queru
c5fe911493
am 9ff2fdb0: Add selinux projects
...
* commit '9ff2fdb0d7655e56bdab0577f9d2f70d9b5ca12b':
Add selinux projects
2012-02-24 09:02:52 -08:00
Jean-Baptiste Queru
5c8b46cd0e
am c22b8164: Add selinux projects
...
* commit 'c22b8164f087a8aa6f32494f6e09d8db7ff5a1a4':
Add selinux projects
2012-02-24 09:01:16 -08:00
Jean-Baptiste Queru
9ff2fdb0d7
Add selinux projects
...
Change-Id: I846254b312c395fa6a75cc5659d81a5f1e31a70a
2012-02-24 09:00:00 -08:00
Jean-Baptiste Queru
c22b8164f0
Add selinux projects
...
Change-Id: I846254b312c395fa6a75cc5659d81a5f1e31a70a
2012-02-24 08:57:52 -08:00
Jean-Baptiste Queru
3f563e852c
am d480093e: Add selinux projects
...
* commit 'd480093e9397c67ad654086116fbd64e963a7b7e':
Add selinux projects
2012-02-24 08:57:41 -08:00
Jean-Baptiste Queru
d480093e93
Add selinux projects
...
Change-Id: I846254b312c395fa6a75cc5659d81a5f1e31a70a
2012-02-24 08:55:01 -08:00
Jean-Baptiste Queru
abb38b4582
Add selinux projects
...
Change-Id: I846254b312c395fa6a75cc5659d81a5f1e31a70a
2012-02-24 08:51:57 -08:00
Chad Jones
ff291b6750
Merge "Add selinux projects"
2012-02-23 17:01:06 -08:00
Jean-Baptiste Queru
59fc475131
Add selinux projects
2012-02-23 14:43:10 -08:00
Chad Jones
8da18490b6
Adding platform/pdk
2012-02-23 13:59:56 -08:00
Chad Jones
f0ac8c545b
Merge "Add platform/external/hamcrest to master manifest"
2012-02-23 10:53:14 -08:00
Dima Zavin
fe65344a60
Merge "add samsung_slsi exynos5 and arm mali projects"
2012-02-23 10:45:42 -08:00
Dima Zavin
281860505f
add samsung_slsi exynos5 and arm mali projects
...
Signed-off-by: Dima Zavin <dima@android.com >
2012-02-22 22:56:07 -08:00
Chad Jones
ebd994f981
Add platform/external/hamcrest to master manifest
2012-02-22 16:52:37 -08:00
Chad Jones
3e397db9d0
Add platform/vendor/unbundled_google/packages/Videos
2012-02-22 16:32:13 -08:00
The Android Open Source Project
62b5aea0ae
Add selinux-related projects
2012-02-22 15:10:10 -08:00
Anatol Pomazau
a247ea0052
Revert revision accidentally set by 18a35ae30d
2012-02-16 13:30:31 -08:00
Anatol Pomazau
18a35ae30d
Merge goog/master
2012-02-15 17:13:46 -08:00
Anatol Pomazau
bfdb8f581f
Add system/security project
2012-02-15 17:12:31 -08:00
Anatol Pomazau
5b9f1e7aa0
Add system/security project
2012-02-15 12:44:46 -08:00
Anatol Pomazau
1bed28e66b
resolved conflicts for merge of 67af7ef1 to master
2012-02-14 13:27:55 -08:00
Ed Heyl
9cd649e908
am d26d9fbb: Merge commit \'0a395cf4\' into ics-scoop-plus-aosp
...
* commit 'd26d9fbb70c9b219c1b28917d891924be9f7aa92':
ics-scoop branch based on ics-mr1
2012-02-14 13:22:28 -08:00
Anatol Pomazau
67af7ef1ca
am 5cda2496: Add grouper projects
...
* commit '5cda2496ab54dacdff02b0f91526fbcdecca1be1':
Add grouper projects
2012-02-14 13:06:06 -08:00
Ed Heyl
d26d9fbb70
Merge commit '0a395cf4' into ics-scoop-plus-aosp
2012-02-14 13:04:00 -08:00
Anatol Pomazau
5cda2496ab
Add grouper projects
2012-02-14 11:52:20 -08:00
Anatol Pomazau
792b7fcff3
Add projects from ics-aah to master
2012-02-08 10:51:27 -08:00
Anatol Pomazau
1fb702eac9
Add compile/mclinker project
2012-02-06 09:09:20 -08:00
Anatol Pomazau
85b73fca2c
Add samsung/manta to master manifest
2012-02-02 11:41:01 -08:00
Jean-Baptiste Queru
962c58287f
Ignore from ics-scoop-plus-aosp
2012-02-02 09:23:16 -08:00
Jean-Baptiste Queru
62b4c96f53
am 2bc52436: am 2765a314: am f0a63df6: Add replicaisland
...
* commit '2bc524363b72d197fa67a03b758a54ce6db55dd1':
Add replicaisland
2012-02-01 15:15:07 -08:00
Jean-Baptiste Queru
2bc524363b
am 2765a314: am f0a63df6: Add replicaisland
...
* commit '2765a314e4d9ebacdcd499d461ba8d1e775c99a0':
Add replicaisland
2012-02-01 15:13:09 -08:00
Jean-Baptiste Queru
2765a314e4
am f0a63df6: Add replicaisland
...
* commit 'f0a63df69049e528d7d0a8255cb0c75f658d5843':
Add replicaisland
2012-02-01 15:10:34 -08:00
Jean-Baptiste Queru
f0a63df690
Add replicaisland
...
Change-Id: I2f583056c0704814eef94218336d3b6755ba6c99
2012-02-01 15:04:22 -08:00
Ed Heyl
65274c9e84
ics-scoop-plus-aosp branch based on ics-mr1-plus-aosp
2012-01-31 08:58:23 -08:00
Ed Heyl
0a395cf4d1
ics-scoop branch based on ics-mr1
2012-01-31 08:55:56 -08:00
Anatol Pomazau
0c72e60979
Add Babel project instead of Avalon
2012-01-24 13:42:19 -08:00
Jean-Baptiste Queru
79ac104aab
am 2cecb8e7: am d06b286d: Add replicaisland
...
* commit '2cecb8e7ea14bbc3028fc957c7cada0d4ee6015b':
Add replicaisland
2012-01-20 15:52:33 -08:00
Ying Wang
0dbf27330e
am 77f9f885: am a507a5fe: Merge "Add external/replicaisland." into ics-mr1
...
* commit '77f9f8853904d0ec6a99b9a3f001b7dc9f89f2ad':
Add external/replicaisland.
2012-01-20 15:48:23 -08:00
Brett Chabot
77e5953f01
Add external/dexmaker to manifest.
2012-01-20 13:28:43 -08:00
Jean-Baptiste Queru
2cecb8e7ea
am d06b286d: Add replicaisland
...
* commit 'd06b286d1643558e92cd0625ccd5eddb2938ce03':
Add replicaisland
2012-01-19 13:50:48 -08:00
Jean-Baptiste Queru
d06b286d16
Add replicaisland
...
Change-Id: I013eca99d88993a625288b92cab8d34b6d585bff
2012-01-19 13:48:55 -08:00
The Android Open Source Project
2f0e4055ae
Add replicaisland
2012-01-19 13:27:35 -08:00
The Android Open Source Project
eaaaae4444
Add replicaisland
2012-01-19 13:23:48 -08:00
Anatol Pomazau
94eff689a1
Add Icing project
2012-01-19 12:58:16 -08:00
Ying Wang
176724d0f9
am a507a5fe: Merge "Add external/replicaisland." into ics-mr1
...
* commit 'a507a5febe823b7d4d2c974346a42f117cdf2e3b':
Add external/replicaisland.
2012-01-18 16:53:49 -08:00
Ying Wang
77f9f88539
am a507a5fe: Merge "Add external/replicaisland." into ics-mr1
...
* commit 'a507a5febe823b7d4d2c974346a42f117cdf2e3b':
Add external/replicaisland.
2012-01-18 16:53:33 -08:00
Ying Wang
a507a5febe
Merge "Add external/replicaisland." into ics-mr1
2012-01-18 16:51:37 -08:00
Ying Wang
bdf36d275a
am e12cbf6c: am 554ddb96: am 647c3155: Add external/replicaisland.
...
* commit 'e12cbf6c5b5345ed48321d774c5680b03e6b7e8c':
Add external/replicaisland.
2012-01-18 15:48:48 -08:00
Ying Wang
e12cbf6c5b
am 554ddb96: am 647c3155: Add external/replicaisland.
...
* commit '554ddb961dec7903a54ede1a7163ee104c60f3c8':
Add external/replicaisland.
2012-01-18 15:46:59 -08:00
Ying Wang
368278a001
am 554ddb96: am 647c3155: Add external/replicaisland.
...
* commit '554ddb961dec7903a54ede1a7163ee104c60f3c8':
Add external/replicaisland.
2012-01-18 15:46:36 -08:00
Ying Wang
554ddb961d
am 647c3155: Add external/replicaisland.
...
* commit '647c315507545c50b2d46a71d48d399c8e971697':
Add external/replicaisland.
2012-01-18 15:44:25 -08:00
Jean-Baptiste Queru
f7edbe9b45
am ced174f3: am 0b30aad4: Add torospr
...
* commit 'ced174f3c3121a0112f964d60761a557993dfc65':
Add torospr
2012-01-18 13:10:23 -08:00
Jean-Baptiste Queru
ced174f3c3
am 0b30aad4: Add torospr
...
* commit '0b30aad4f05aa114ef9b5281ba094be7d97cae00':
Add torospr
2012-01-18 13:08:35 -08:00
Jean-Baptiste Queru
0b30aad4f0
Add torospr
...
Change-Id: I877b28ec22b048386ffc5829f2967def7c43088e
2012-01-18 12:52:31 -08:00
Anatol Pomazau
acf562acbb
am ccd46039: am dc956275: Add torospr project
...
* commit 'ccd46039dfe57ff78faa666366e265d2d52e1bd4':
Add torospr project
2012-01-13 12:44:28 -08:00
Anatol Pomazau
ccd46039df
am dc956275: Add torospr project
...
* commit 'dc95627512e53e8877e6b24b97d3102a5b6211c4':
Add torospr project
2012-01-13 12:42:41 -08:00
Anatol Pomazau
6dac8591be
am dc956275: Add torospr project
...
* commit 'dc95627512e53e8877e6b24b97d3102a5b6211c4':
Add torospr project
2012-01-13 12:42:36 -08:00
Ying Wang
337f0c9764
Add external/replicaisland.
2012-01-13 10:31:28 -08:00
Anatol Pomazau
dc95627512
Add torospr project
2012-01-13 09:52:31 -08:00
Ying Wang
647c315507
Add external/replicaisland.
2012-01-13 09:50:04 -08:00
Anatol Pomazau
295bbd88a3
Add prebuilts/eclipse
2012-01-12 13:41:46 -08:00
The Android Open Source Project
3b6bfd8b9c
Add review URI.
2012-01-11 20:07:46 -08:00
Ying Wang
b04b4f6daf
Add external/dexmaker to fix build.
2012-01-11 10:36:50 -08:00
Anatol Pomazau
cf2624db73
Add external/ganymed-ssh2
2012-01-10 14:08:26 -08:00
Anatol Pomazau
5736936523
Add dexmaker project
2012-01-10 13:50:08 -08:00
Anatol Pomazau
dfeb355cd4
Add external/ganymed-ssh2
2012-01-10 13:26:27 -08:00
Ying Wang
2a513e4eba
Add external/replicaisland to fix build.
2012-01-10 09:17:36 -08:00
Jean-Baptiste Queru
ece9755c41
Merge "Delete empty omap4 project"
2012-01-10 07:22:25 -08:00
Jean-Baptiste Queru
6f4fcaeda3
am 17fc943f: (-s ours) am d722ab4d: am 4fe9c440: (-s ours) Manifest for mirror-aosp-master - DO NOT MERGE
...
* commit '17fc943f920b86fba7724877f9668affd15684c7':
Manifest for mirror-aosp-master - DO NOT MERGE
2012-01-09 16:37:36 -08:00
Jean-Baptiste Queru
17fc943f92
am d722ab4d: am 4fe9c440: (-s ours) Manifest for mirror-aosp-master - DO NOT MERGE
...
* commit 'd722ab4d1e9adc36c2c798bb7e460b0e4563b683':
Manifest for mirror-aosp-master - DO NOT MERGE
2012-01-09 16:11:37 -08:00
Jean-Baptiste Queru
d722ab4d1e
am 4fe9c440: (-s ours) Manifest for mirror-aosp-master - DO NOT MERGE
...
* commit '4fe9c4405b3124ece3fa258af2586ea86c364780':
Manifest for mirror-aosp-master - DO NOT MERGE
2012-01-09 16:09:25 -08:00
Anatol Pomazau
47b2f41fc9
Add replicaisland
2012-01-09 16:00:16 -08:00
Jean-Baptiste Queru
4fe9c4405b
Manifest for mirror-aosp-master - DO NOT MERGE
...
Change-Id: Ib66671a68d6848a891e5c497f2a6a2e4683b4c17
2012-01-09 15:33:12 -08:00
Jean-Baptiste Queru
8a7b20e4a3
Delete empty omap4 project
2012-01-09 15:22:35 -08:00
Anatol Pomazau
47a27b63e9
Remove empty project
2012-01-09 15:00:19 -08:00
Anatol Pomazau
bb7511e8f4
Add gcc prebuilts projects
2012-01-09 09:16:03 -08:00
Anatol Pomazau
8d6e17f76f
am ffc80dcc: am 00b355a4: Add samsung/mysidspr project
...
* commit 'ffc80dcc1fe84c1c956ec5744190da10b249c31f':
Add samsung/mysidspr project
2012-01-06 16:55:20 -08:00
Anatol Pomazau
ffc80dcc1f
am 00b355a4: Add samsung/mysidspr project
...
* commit '00b355a46e11e80ed0abae5630078da67912e470':
Add samsung/mysidspr project
2012-01-06 16:51:56 -08:00
Anatol Pomazau
e3e04ad121
am 00b355a4: Add samsung/mysidspr project
...
* commit '00b355a46e11e80ed0abae5630078da67912e470':
Add samsung/mysidspr project
2012-01-06 16:51:11 -08:00
Anatol Pomazau
00b355a46e
Add samsung/mysidspr project
2012-01-06 16:49:02 -08:00
Ying Wang
891e3813e1
Add vendor/unbundled_google/libs/carouselgl
2012-01-06 13:00:51 -08:00
Jing Yu
58b3c3e83e
Sync manifest with master.
2012-01-06 11:54:22 -08:00
Anatol Pomazau
d3bc49c276
Add unbundled_google/packages/Avalon project
2012-01-05 15:20:57 -08:00
Anatol Pomazau
2ec964d8a2
Add prebuilts/gcc projects
2012-01-04 13:19:26 -08:00
Ed Heyl
517e1bd41e
add Memory project
2011-12-20 10:54:18 -08:00
Ed Heyl
b7e6f10c05
Merge "Add UnifiedGmail & UnifiedEmail"
2011-12-19 14:19:02 -08:00
Ed Heyl
7310001b36
Add UnifiedGmail & UnifiedEmail
2011-12-19 14:11:12 -08:00
The Android Open Source Project
d39eff647e
Manifest for icr-mr1
2011-12-15 16:36:17 -08:00
The Android Open Source Project
f9d7e57800
Add new projects to match 4.0.3
2011-12-15 16:16:22 -08:00
Ficus Kirkpatrick
ae73f879ec
am 7879ed50: Revert "Move the Market build in ICS MR1 to Daiquiri."
...
* commit '7879ed509de19526ddc3dc8c57d9a899c0f692f6':
Revert "Move the Market build in ICS MR1 to Daiquiri."
2011-12-13 10:52:30 -08:00
Ficus Kirkpatrick
f3ae47d32b
am 901885c2: Move the Market build in ICS MR1 to Daiquiri.
...
* commit '901885c25e926eef542df171d572070638dd93ae':
Move the Market build in ICS MR1 to Daiquiri.
2011-12-13 10:52:28 -08:00
Ficus Kirkpatrick
86494e76fd
am 60eeb7c3: am 7879ed50: Revert "Move the Market build in ICS MR1 to Daiquiri."
...
* commit '60eeb7c31f5fb590fb2824851c9913a58f249f84':
Revert "Move the Market build in ICS MR1 to Daiquiri."
2011-12-12 20:54:10 -08:00
Ficus Kirkpatrick
60eeb7c31f
am 7879ed50: Revert "Move the Market build in ICS MR1 to Daiquiri."
...
* commit '7879ed509de19526ddc3dc8c57d9a899c0f692f6':
Revert "Move the Market build in ICS MR1 to Daiquiri."
2011-12-12 20:51:47 -08:00
Ficus Kirkpatrick
7879ed509d
Revert "Move the Market build in ICS MR1 to Daiquiri."
...
Market depends on some static libraries that apparently only exist in master.
This reverts commit 901885c25e
2011-12-12 20:45:13 -08:00
Ficus Kirkpatrick
094e4e1b24
am 226fd641: am 901885c2: Move the Market build in ICS MR1 to Daiquiri.
...
* commit '226fd641a2572ad726fbb96f13c27fe098c67e5b':
Move the Market build in ICS MR1 to Daiquiri.
2011-12-12 20:30:56 -08:00
Ficus Kirkpatrick
226fd641a2
am 901885c2: Move the Market build in ICS MR1 to Daiquiri.
...
* commit '901885c25e926eef542df171d572070638dd93ae':
Move the Market build in ICS MR1 to Daiquiri.
2011-12-12 20:29:39 -08:00
Anatol Pomazau
b08772d516
Add vendor/eclipse
2011-12-12 17:14:19 -08:00
Ficus Kirkpatrick
901885c25e
Move the Market build in ICS MR1 to Daiquiri.
2011-12-12 13:46:48 -08:00
Ed Heyl
240e5aa371
add glview and carouselgl project for Music2
2011-12-09 18:43:24 -08:00
Jean-Baptiste Queru
40bf83b185
am 22aabdb5: am 5dc8bed9: New projects for MR1
...
* commit '22aabdb51c5d183f692dcbf64382a722b0a12c1e':
New projects for MR1
2011-12-06 22:52:04 -08:00
Jean-Baptiste Queru
22aabdb51c
am 5dc8bed9: New projects for MR1
...
* commit '5dc8bed902dc3ee507ae1e5a95630105c3b76380':
New projects for MR1
2011-12-06 22:48:07 -08:00
Jean-Baptiste Queru
5dc8bed902
New projects for MR1
...
Change-Id: I4a364820982cb4b0f164562cd6b7c2502fee209f
2011-12-06 16:09:45 -08:00
Jing Yu
fbe3dd6d4d
Add smali, wlan, carouselgl, glview projects
...
Tracking master
2011-12-06 15:47:55 -08:00
Anatol Pomazau
b9834887b4
Split libraries into subprojects
2011-11-29 14:19:36 -08:00
Ying Wang
c58839f3e6
Add the new prebuilts git projects.
2011-11-29 11:49:07 -08:00
Ying Wang
878977843f
Now prebuilt SDKs are in their own git project.
2011-11-29 11:38:28 -08:00
The Android Open Source Project
cf1e7063a9
Add prebuilts/qemu-kernel and prebuilts/tools
2011-11-28 16:25:30 -08:00
Jean-Baptiste Queru
dd344cd364
am fc439238: (-s ours) am 7508deb0: Add devtools-related prebuilts - do not merge
...
* commit 'fc439238ca584defce6aff4f8fa3676e0ceabfbf':
Add devtools-related prebuilts - do not merge
2011-11-28 16:13:35 -08:00
Jean-Baptiste Queru
fc439238ca
am 7508deb0: Add devtools-related prebuilts - do not merge
...
* commit '7508deb0f42d66eb9d1e05fce4e51171560aeabc':
Add devtools-related prebuilts - do not merge
2011-11-28 16:10:04 -08:00
Jean-Baptiste Queru
7508deb0f4
Add devtools-related prebuilts - do not merge
...
Change-Id: I7e6b81d293c3a5af89b6643b7198968a982e252a
2011-11-28 16:05:17 -08:00
Jean-Baptiste Queru
978ca48205
am e7e065c2: (-s ours) Add devtools-related prebuilts - do not merge
...
* commit 'e7e065c293feb7c94dbf0ff54ab075b0b0597092':
Add devtools-related prebuilts - do not merge
2011-11-28 15:59:15 -08:00
Jean-Baptiste Queru
e7e065c293
Add devtools-related prebuilts - do not merge
...
Change-Id: I7e6b81d293c3a5af89b6643b7198968a982e252a
2011-11-28 15:55:08 -08:00
Anatol Pomazau
e550cab453
Merge "Split prebuilt project into smaller pieces"
2011-11-28 14:48:55 -08:00
Anatol Pomazau
486be1d20e
Split prebuilt project into smaller pieces
2011-11-28 14:38:13 -08:00
Anatol Pomazau
36d53d1c30
am 13190205: (-s ours) am bd3707fc: Revert "Switch ics-mr0 to tools_r16 branch DO NOT MERGE"
...
* commit '13190205b186b06d346f8139b7442f0ed3530010':
Revert "Switch ics-mr0 to tools_r16 branch DO NOT MERGE"
2011-11-28 14:28:32 -08:00
Anatol Pomazau
8dd3df383c
am d1e60d88: (-s ours) am 33d72348: am 8ea24c61: Switch ics-mr0 to tools_r16 branch DO NOT MERGE
...
* commit 'd1e60d88998e8521a72296cf84feded09a4b6a08':
Switch ics-mr0 to tools_r16 branch DO NOT MERGE
2011-11-28 14:28:31 -08:00
Anatol Pomazau
e093be8c93
am bd3707fc: Revert "Switch ics-mr0 to tools_r16 branch DO NOT MERGE"
...
* commit 'bd3707fc717a847379e1ddcb2ddd9441ee9e2e8b':
Revert "Switch ics-mr0 to tools_r16 branch DO NOT MERGE"
2011-11-28 14:27:15 -08:00
Anatol Pomazau
f762bbe2cd
am 33d72348: am 8ea24c61: Switch ics-mr0 to tools_r16 branch DO NOT MERGE
...
* commit '33d7234848bbda793477754649c1ffe743d49bdc':
Switch ics-mr0 to tools_r16 branch DO NOT MERGE
2011-11-28 14:27:14 -08:00
Anatol Pomazau
13190205b1
am bd3707fc: Revert "Switch ics-mr0 to tools_r16 branch DO NOT MERGE"
...
* commit 'bd3707fc717a847379e1ddcb2ddd9441ee9e2e8b':
Revert "Switch ics-mr0 to tools_r16 branch DO NOT MERGE"
2011-11-28 14:26:42 -08:00
Anatol Pomazau
d1e60d8899
am 33d72348: am 8ea24c61: Switch ics-mr0 to tools_r16 branch DO NOT MERGE
...
* commit '33d7234848bbda793477754649c1ffe743d49bdc':
Switch ics-mr0 to tools_r16 branch DO NOT MERGE
2011-11-28 14:26:41 -08:00
Anatol Pomazau
bd3707fc71
Revert "Switch ics-mr0 to tools_r16 branch DO NOT MERGE"
...
This reverts commit 8ea24c6165
2011-11-28 14:12:46 -08:00
Anatol Pomazau
33d7234848
am 8ea24c61: Switch ics-mr0 to tools_r16 branch DO NOT MERGE
...
* commit '8ea24c61658e52dea67c27ee2c265840cb8b3a00':
Switch ics-mr0 to tools_r16 branch DO NOT MERGE
2011-11-28 13:37:16 -08:00
Anatol Pomazau
8ea24c6165
Switch ics-mr0 to tools_r16 branch DO NOT MERGE
2011-11-28 13:12:05 -08:00
Jean-Baptiste Queru
aad1eddd7c
am 0da26237: am f0d6b98e: Add toro in next master drop
...
* commit '0da26237c537800de22bb2754993d20e0ca61bbe':
Add toro in next master drop
2011-11-22 16:56:17 -08:00
Jean-Baptiste Queru
0da26237c5
am f0d6b98e: Add toro in next master drop
...
* commit 'f0d6b98eb5917627c85e4a469bb0fbc9f0881d92':
Add toro in next master drop
2011-11-22 16:53:54 -08:00
Jean-Baptiste Queru
f0d6b98eb5
Add toro in next master drop
...
Change-Id: I569a704ca4953c2478ebb0e03bafc9c1d5d3dec8
2011-11-22 16:51:15 -08:00
Ed Heyl
f9f95b6773
merge 6c7381d by hand
2011-11-21 10:35:51 -08:00
Ed Heyl
7917a12fac
am ac748197: (-s ours) Merge commit \'6c7381d\' into ics-mr1-plus-aosp
...
* commit 'ac74819746763e4d746e28dd560b7201f3f8c4f8':
add external/libyuv
2011-11-21 10:33:58 -08:00
Ed Heyl
ac74819746
Merge commit '6c7381d' into ics-mr1-plus-aosp
2011-11-21 10:24:01 -08:00
Ed Heyl
6c7381d545
add external/libyuv
2011-11-21 10:03:36 -08:00
The Android Open Source Project
5f8c416796
Manifest for post-ICS master
2011-11-14 13:48:14 -08:00
Jean-Baptiste Queru
647231bfed
am 22a44452: am 3cde91ac: Add hardware/ti/wlan back
...
* commit '22a44452a2160dc1cc62614f9ac1da5bb5b4c757':
Add hardware/ti/wlan back
2011-11-11 15:21:40 -08:00
Jean-Baptiste Queru
22a44452a2
am 3cde91ac: Add hardware/ti/wlan back
...
* commit '3cde91ac3a1d90aba9cdfdb39128d9a30b63ca96':
Add hardware/ti/wlan back
2011-11-11 15:19:33 -08:00
Jean-Baptiste Queru
3cde91ac3a
Add hardware/ti/wlan back
...
Change-Id: Id4360ad1d1b3ad8393058d859f024e3a811ca901
2011-11-11 15:17:25 -08:00
Jean-Baptiste Queru
a4995a3523
am c342fe07: Add hardware/ti/wlan back
...
* commit 'c342fe072ad85684d46ecf686babe360de566678':
Add hardware/ti/wlan back
2011-11-11 14:51:36 -08:00
Jean-Baptiste Queru
c342fe072a
Add hardware/ti/wlan back
2011-11-11 14:48:26 -08:00
Anatol Pomazau
a478bf9c9f
Partially revert "Remove obsolete ti/wlan projects"
...
This reverts commit 13414d2e72
2011-11-11 13:46:19 -08:00
Anatol Pomazau
1a3c4cbf05
Add smali project
2011-11-11 10:12:16 -08:00
Anatol Pomazau
355f0aba9d
Add gcc-demangle project
2011-11-09 14:07:17 -08:00
Ficus Kirkpatrick
4698c5bcd7
Move Finsky to Cachaca now that it is in prod.
2011-11-09 14:07:10 -08:00
Anatol Pomazau
d36427574c
Add gcc-demangle project
2011-11-07 14:13:13 -08:00
Anatol Pomazau
ba8c5dabdc
Add libyuv project
2011-11-04 14:23:14 -07:00
Anatol Pomazau
34dbfd5f48
Add libyuv project
2011-11-02 11:07:05 -07:00
Ficus Kirkpatrick
25d0ee2cac
am 110bcc3f: am 798357e6: am 7410595e: Move Finsky to Cachaca now that it is in prod.
...
* commit '110bcc3f2a8326d9938e1f306daf49461254863e':
Move Finsky to Cachaca now that it is in prod.
2011-11-02 17:50:21 +00:00
Ficus Kirkpatrick
110bcc3f2a
am 798357e6: am 7410595e: Move Finsky to Cachaca now that it is in prod.
...
* commit '798357e6ca3ead0249ad2c96587e6f6ed5e54705':
Move Finsky to Cachaca now that it is in prod.
2011-11-02 02:28:28 +00:00
Ficus Kirkpatrick
b98317728f
am 798357e6: am 7410595e: Move Finsky to Cachaca now that it is in prod.
...
* commit '798357e6ca3ead0249ad2c96587e6f6ed5e54705':
Move Finsky to Cachaca now that it is in prod.
2011-11-02 02:27:47 +00:00
Ficus Kirkpatrick
798357e6ca
am 7410595e: Move Finsky to Cachaca now that it is in prod.
...
* commit '7410595ecd732e49c06d53e8041cdf9372532139':
Move Finsky to Cachaca now that it is in prod.
2011-11-02 02:26:33 +00:00
Ficus Kirkpatrick
7410595ecd
Move Finsky to Cachaca now that it is in prod.
2011-11-01 10:00:18 -07:00
Jean-Baptiste Queru
997e81eb6c
am 684bd35d: Merge (ignore) from stage-aosp-master
...
* commit '684bd35d7c7be523a4e49f39102ab57db49cd6c5':
Manifest for ICS-based AOSP master - do not merge
Standalone manifest for stage-aosp-master
2011-10-28 22:44:13 +00:00
Jean-Baptiste Queru
684bd35d7c
Merge (ignore) from stage-aosp-master
...
Change-Id: I9fe34cabc6772c0d78298cadafbc8226737a284d
2011-10-28 14:35:39 -07:00
Jean-Baptiste Queru
291bdcbec8
Manifest for ICS-based AOSP master - do not merge
...
Change-Id: I250accb721fa61ed69bd28f0274ba9bfd4207c4a
2011-10-28 14:12:30 -07:00
Anatol Pomazau
78c6eb51a0
Rename tungsten to phantasm
2011-10-27 10:26:27 -07:00
Jean-Baptiste Queru
4fa7d3c322
am 72dc0244: am bc89da55: (-s ours) Add projects that are both in AOSP and master.
...
* commit '72dc0244bdc3bfaea383786902ed2070d2838bb5':
Add projects that are both in AOSP and master.
2011-10-26 07:25:25 -07:00
Jean-Baptiste Queru
72dc0244bd
am bc89da55: (-s ours) Add projects that are both in AOSP and master.
...
* commit 'bc89da55fecdadc082f754d86e53b7b566699d4d':
Add projects that are both in AOSP and master.
2011-10-26 14:22:56 +00:00
Jean-Baptiste Queru
3408c5da44
am 5cb020df: (-s ours) am 10d894b4: (-s ours) Merge from ics-mr1 - do not merge
...
* commit '5cb020df2126f28245a7f8c54c7b0866c1b5e788':
Remove projects that aren't needed in MR1. do not merge.
2011-10-26 07:22:45 -07:00
Ed Heyl
202b1660d1
am 7b81c1db: am c80a680a: (-s ours) reset after ics-mr1 reset
...
* commit '7b81c1db3f3b4a870085f921f85f0a1a928a0303':
set branch name
2011-10-26 07:22:45 -07:00
Ed Heyl
c7a48b622f
am 995d9f1a: am f2b8ed3c: (-s ours) ics-mr1-plus-aosp
...
* commit '995d9f1acbdad4e8c5fc114c9c8da6f84ba50a42':
ics-mr1-plus-aosp
2011-10-26 07:21:05 -07:00
Jean-Baptiste Queru
5cb020df21
am 10d894b4: (-s ours) Merge from ics-mr1 - do not merge
...
* commit '10d894b470d2bbab46c8d14cf8ce86d701912fb8':
Remove projects that aren't needed in MR1. do not merge.
2011-10-26 14:20:10 +00:00
Ed Heyl
7b81c1db3f
am c80a680a: (-s ours) reset after ics-mr1 reset
...
* commit 'c80a680aee4f2eb7fc8d186fe7d018161d5750c2':
set branch name
2011-10-26 14:20:09 +00:00
Ed Heyl
70ac6b2c6e
am a7838e37: am d242bcb9: (-s ours) ics-mr1
...
* commit 'a7838e37ad4090e1a957a179fa6615eeacd300ec':
ics-mr1
2011-10-26 07:19:26 -07:00
Ed Heyl
995d9f1acb
am f2b8ed3c: (-s ours) ics-mr1-plus-aosp
...
* commit 'f2b8ed3c0dd5ca8ccde26026500c7e7e977bdffe':
ics-mr1-plus-aosp
2011-10-26 14:18:28 +00:00
Ed Heyl
a7838e37ad
am d242bcb9: (-s ours) ics-mr1
...
* commit 'd242bcb9d7558473ee817f0f57230b87b50cbf48':
ics-mr1
2011-10-26 14:15:49 +00:00
Jean-Baptiste Queru
bc89da55fe
Add projects that are both in AOSP and master.
...
They're not in MR1 as they're not needed there, but
we're technically accepting contribution into those
that can flow into master.
Change-Id: I097a1e064d954981dcfe93ce515127488a12b918
2011-10-25 10:01:23 -07:00
Jean-Baptiste Queru
10d894b470
Merge from ics-mr1 - do not merge
...
Change-Id: Ia59366155d476340969cc2639d2cec950369309c
2011-10-25 09:44:35 -07:00
Jean-Baptiste Queru
b6a8f0e952
Remove projects that aren't needed in MR1. do not merge.
...
Those are the same projects that had been removed from MR0.
Also delete readonly-korg-master, which isn't needed
in this branch.
Change-Id: Ibbcac5ca26bf846dc4d4d9f5e5d50490fd2a6418
2011-10-25 08:48:41 -07:00
Ed Heyl
c80a680aee
reset after ics-mr1 reset
2011-10-25 07:33:29 -07:00
Ed Heyl
ca342a2543
set branch name
2011-10-25 04:05:21 -07:00
Ed Heyl
cac29c7d95
ics-mr1 based on master now
2011-10-25 04:04:22 -07:00
Ed Heyl
f2b8ed3c0d
ics-mr1-plus-aosp
2011-10-23 19:50:56 -07:00
Ed Heyl
d242bcb9d7
ics-mr1
2011-10-23 19:43:54 -07:00
Ed Heyl
8de5f3a4d3
am 6068cc8b: (-s ours) am 74cb7050: (-s ours) tools_r14 to tools_r15, please do not merge
...
* commit '6068cc8b9c451542a2d1e0a33b59828a8f0a242e':
tools_r14 to tools_r15, please do not merge
2011-10-21 14:56:57 -07:00
Ed Heyl
6068cc8b9c
am 74cb7050: (-s ours) tools_r14 to tools_r15, please do not merge
...
* commit '74cb705005fff13f9520307826af90225ce5121e':
tools_r14 to tools_r15, please do not merge
2011-10-21 14:55:11 -07:00
Ed Heyl
74cb705005
tools_r14 to tools_r15, please do not merge
2011-10-21 14:34:04 -07:00
Ed Heyl
5bc60a1868
set the branch in prebuilt for compiler-dev
2011-10-14 04:21:48 -07:00
Jean-Baptiste Queru
8bd167893d
am 5f31901a: am 26195ef7: Delete empty PhotoEditor project
...
* commit '5f31901a71cb084dcec375bfc22f8bfa9c70501a':
Delete empty PhotoEditor project
2011-10-12 20:01:11 -07:00
Jean-Baptiste Queru
ec4317d6bf
am 8e403792: (-s ours) Revert "ics-mr0"
...
* commit '8e4037924b577baba624ac649f97c1ede30192b7':
Revert "ics-mr0"
2011-10-12 18:39:02 -07:00
Jean-Baptiste Queru
b7c36f099a
am 56fd3a4b: (-s ours) am 5b2fd0da: (-s ours) Remove projects that aren\'t needed in MR0. do not merge.
...
* commit '56fd3a4bf766abbcacc7105191d138f909db1ea6':
Remove projects that aren't needed in MR0. do not merge.
2011-10-12 17:43:04 -07:00
Ed Heyl
1e396166ae
am 216276f1: (-s ours) ics-mr0
...
* commit '216276f1814098f995066cd6348ea6b4fa76c282':
ics-mr0
2011-10-12 17:43:03 -07:00
Jean-Baptiste Queru
5f31901a71
am 26195ef7: Delete empty PhotoEditor project
...
* commit '26195ef71733fb29d78356ab34a958b42f47625e':
Delete empty PhotoEditor project
2011-10-12 10:51:09 -07:00
Jean-Baptiste Queru
26195ef717
Delete empty PhotoEditor project
...
Change-Id: I867ff678d12f47f246182374dcc1dd0e97c33b22
2011-10-12 10:41:33 -07:00
Jean-Baptiste Queru
8e4037924b
Revert "ics-mr0"
...
This reverts commit 216276f181
2011-10-12 08:00:06 -07:00
Jean-Baptiste Queru
56fd3a4bf7
am 5b2fd0da: (-s ours) Remove projects that aren\'t needed in MR0. do not merge.
...
* commit '5b2fd0da5851024be25803ca009ee4365e08f94d':
Remove projects that aren't needed in MR0. do not merge.
2011-10-12 07:52:06 -07:00
Jean-Baptiste Queru
5b2fd0da58
Remove projects that aren't needed in MR0. do not merge.
...
Also delete readonly-korg-master, which isn't needed
in this branch.
Change-Id: I2096788cca0442ba8db9b7c65826e41a629ea0bd
2011-10-11 11:09:14 -07:00
Ed Heyl
216276f181
ics-mr0
2011-10-10 13:33:43 -07:00
Jason Chen
61492f3a47
am 8d386176: Add Shopper to master manifest
...
* commit '8d3861766efc9d18045cddf22a1536ffb07e2f52':
Add Shopper to master manifest
2011-10-07 08:45:06 -07:00
Jason Chen
8d3861766e
Add Shopper to master manifest
2011-10-06 17:01:32 -07:00
Anatol Pomazau
a69e0414c1
am e4a7e090: Add srtp,gips,vidyo projects to master
...
* commit 'e4a7e090bfcbea6010d0bc67903c1bf843887d91':
Add srtp,gips,vidyo projects to master
2011-10-06 15:18:16 -07:00
Anatol Pomazau
e4a7e090bf
Add srtp,gips,vidyo projects to master
2011-10-06 13:11:15 -07:00
The Android Open Source Project
1e41b43928
Bases on top of which the GPL components of 3.0 and 3.1 can be built
2011-10-06 10:47:09 -07:00
Anatol Pomazau
b68a35c6b6
am 1f54dc6d: Add samsung/yakju
...
* commit '1f54dc6d7fce2d97a4c448333604e4405f133e4c':
Add samsung/yakju
2011-09-30 15:47:32 -07:00
Anatol Pomazau
1f54dc6d7f
Add samsung/yakju
2011-09-30 15:45:35 -07:00
Jean-Baptiste Queru
6828031115
am ef009bc3: am bf77dc95: am 0e95596c: Stop special-casing sdk and qemu entirely
...
* commit 'ef009bc31052e897363a647bc1e1d2b0da25cd86':
Stop special-casing sdk and qemu entirely
2011-09-29 16:43:02 -07:00
Jean-Baptiste Queru
ef009bc310
am bf77dc95: am 0e95596c: Stop special-casing sdk and qemu entirely
...
* commit 'bf77dc95f0edd968e5595c839500f4fef3145bda':
Stop special-casing sdk and qemu entirely
2011-09-29 16:40:59 -07:00
Jean-Baptiste Queru
bf77dc95f0
am 0e95596c: Stop special-casing sdk and qemu entirely
...
* commit '0e95596c1904401f56c6c9ac4af3408af1436ac8':
Stop special-casing sdk and qemu entirely
2011-09-29 16:39:34 -07:00
Jean-Baptiste Queru
0e95596c19
Stop special-casing sdk and qemu entirely
...
From experience, it turned out that special-casing
them caused more headaches than advantages.
Change-Id: I02bd35bb918d6313371e2d50178aa17d535d48ab
2011-09-29 16:21:17 -07:00
Jean-Baptiste Queru
9f00259a9a
Standalone manifest for stage-aosp-master
...
Change-Id: I8d6b9bc5e24ff9d3577cb5476c77713e72060b1a
2011-09-29 15:40:58 -07:00
Jean-Baptiste Queru
24cd1c9d1a
am e2c654bf: (-s ours) am ccc21497: (-s ours) DO NOT MERGE - merge from gingerbread-plus-aosp
...
* commit 'e2c654bf52ea8ad0257656e82d74701c5446985a':
Switch to mirror-aosp-master for the devtools projects
2011-09-29 15:37:55 -07:00
Jean-Baptiste Queru
e2c654bf52
am ccc21497: (-s ours) DO NOT MERGE - merge from gingerbread-plus-aosp
...
* commit 'ccc21497c00b4fa6e5783c6d713b28809b210fd4':
Switch to mirror-aosp-master for the devtools projects
2011-09-29 15:36:40 -07:00
Jean-Baptiste Queru
ccc21497c0
DO NOT MERGE - merge from gingerbread-plus-aosp
2011-09-29 15:29:23 -07:00
The Android Open Source Project
6ff5aa77f0
Base on top of which the GPL components of 3.2 can be built
2011-09-29 15:21:10 -07:00
Jean-Baptiste Queru
20661b16ad
Switch to mirror-aosp-master for the devtools projects
2011-09-29 14:50:58 -07:00
The Android Open Source Project
802898b8dd
Add external/qemu-pc-bios
2011-09-29 13:02:29 -07:00
Jean-Baptiste Queru
c023083d45
Merge from gingerbread
...
Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d
2011-09-28 15:47:46 -07:00
Jean-Baptiste Queru
9381f5c96f
Switch to a relative fetch URI
...
Change-Id: Iaf9ba7f9da670f8cd2e6416d676f18357d2f0af0
2011-09-28 15:38:56 -07:00
Anatol Pomazau
dae8736551
am 13414d2e: Remove obsolete ti/wlan projects
...
* commit '13414d2e7269450fce19b5910c0c790d75653709':
Remove obsolete ti/wlan projects
2011-09-28 11:46:53 -07:00
Anatol Pomazau
13414d2e72
Remove obsolete ti/wlan projects
...
These projects are not needed for master build
2011-09-28 11:43:58 -07:00
Jean-Baptiste Queru
f03f6201c0
Restore additional projects.
...
Those projects existed in the master branch on kernel.org
but aren't part of Gingerbread.
2011-09-28 10:14:50 -07:00
Joe Onorato
40ff0aa825
Switch music2 in ics-aah manifest to master-ub-music2-aah branch
2011-09-26 20:03:41 -07:00
Anatol Pomazau
17c438e79b
am c0f4e449: am 73179e31: Add lohit fonts
...
* commit 'c0f4e4494f67ca8561b2034be0fc9a4794d076c1':
Add lohit fonts
2011-09-23 10:20:01 -07:00
Anatol Pomazau
c0f4e4494f
am 73179e31: Add lohit fonts
...
* commit '73179e3184bfed7ec378ed8973a37ce894b6373a':
Add lohit fonts
2011-09-23 10:18:17 -07:00
Anatol Pomazau
73179e3184
Add lohit fonts
2011-09-23 10:16:40 -07:00
Jean-Baptiste Queru
4eecec13f3
Merge from gingerbread
2011-09-23 08:08:16 -07:00
Jean-Baptiste Queru
a251edb0ed
Set up merge point from gingerbread
2011-09-23 08:07:36 -07:00
Shawn O. Pearce
92ae90681a
Set sync default to -j4
2011-09-23 07:36:45 -07:00
Anatol Pomazau
b66e9e9b09
am 07327c79: am a08394a6: Add more wallpapers from Google
...
* commit '07327c79a528a0a4c667d5aa30b80e3fb8a41af4':
Add more wallpapers from Google
2011-09-22 23:42:33 -07:00
Anatol Pomazau
07327c79a5
am a08394a6: Add more wallpapers from Google
...
* commit 'a08394a612f115dc41efcc5699b6b06c8ba340a0':
Add more wallpapers from Google
2011-09-22 23:39:41 -07:00
Anatol Pomazau
a08394a612
Add more wallpapers from Google
2011-09-22 16:25:59 -07:00
Ed Heyl
a475f5b561
am d116d915: (-s ours) am 014de3e6: (-s ours) Merge "Use "tools_r14" for sdk and qemu projects. Do not merge." into ics-factoryrom
...
* commit 'd116d915096ba59fd80728ef270ab0af557c4572':
Use "tools_r14" for sdk and qemu projects. Do not merge.
2011-09-22 10:51:43 -07:00
Ed Heyl
d116d91509
am 014de3e6: (-s ours) Merge "Use "tools_r14" for sdk and qemu projects. Do not merge." into ics-factoryrom
...
* commit '014de3e6b3160b37fdcbad9891310f35a4109b60':
Use "tools_r14" for sdk and qemu projects. Do not merge.
2011-09-22 10:49:58 -07:00
Ed Heyl
014de3e6b3
Merge "Use "tools_r14" for sdk and qemu projects. Do not merge." into ics-factoryrom
2011-09-22 10:47:36 -07:00
Anatol Pomazau
93093a7870
am 2e015d15: am ab82fb27: Add BrowserGoogle project
...
* commit '2e015d15ca5d6db2cd49c1d685c18b9f9249d7ad':
Add BrowserGoogle project
2011-09-22 09:41:00 -07:00
Anatol Pomazau
2e015d15ca
am ab82fb27: Add BrowserGoogle project
...
* commit 'ab82fb275a249187c9e45393c97415a49171dfd1':
Add BrowserGoogle project
2011-09-22 09:39:10 -07:00
Anatol Pomazau
ab82fb275a
Add BrowserGoogle project
2011-09-22 09:37:19 -07:00
Ed Heyl
2e4b09a659
Use "tools_r14" for sdk and qemu projects. Do not merge.
2011-09-22 06:24:16 -07:00
Anatol Pomazau
626c0e1f84
am 6ab1e2ed: Remove ti/bootloader as it is not needed during master build
...
* commit '6ab1e2ed7d3ee6f6b1e6141471121e25aa239582':
Remove ti/bootloader as it is not needed during master build
2011-09-21 11:20:10 -07:00
Anatol Pomazau
6ab1e2ed7d
Remove ti/bootloader as it is not needed during master build
2011-09-21 11:18:16 -07:00
Anatol Pomazau
a055929889
am 6107e7c3: Add more wallpapers from Google
...
* commit '6107e7c3edbe81abb162b4becc074aa31e541a3d':
Add more wallpapers from Google
2011-09-20 17:01:57 -07:00
Anatol Pomazau
6107e7c3ed
Add more wallpapers from Google
2011-09-20 16:59:42 -07:00
Flavio Lerda
cd95354027
am 6f43a3b8: am 5dfc8394: Remove VoicemailProvider since it is no longer in use.
...
* commit '6f43a3b863d35edcd728e10ee6b9c178aba7e84b':
Remove VoicemailProvider since it is no longer in use.
2011-09-20 16:26:32 -07:00
Flavio Lerda
6f43a3b863
am 5dfc8394: Remove VoicemailProvider since it is no longer in use.
...
* commit '5dfc8394aff808ffe56138219daf1d476737c92a':
Remove VoicemailProvider since it is no longer in use.
2011-09-20 15:59:01 -07:00
The Android Open Source Project
82d0651c62
Initial manifest for gingerbread
2011-09-20 10:59:29 -07:00
The Android Open Source Project
6cf16a5620
First pass at master manifest
2011-09-16 12:30:27 -07:00
Ed Heyl
649c3ddfe3
am b28b304f: am a041e672: (-s ours) set branch name to ics-factoryrom
...
* commit 'b28b304ff686b85771ba1b7dd52ec59290988417':
set branch name to ics-factoryrom
2011-09-15 16:23:12 -07:00
Ed Heyl
b28b304ff6
am a041e672: (-s ours) set branch name to ics-factoryrom
...
* commit 'a041e672129b024dafdae796d39de686bac68569':
set branch name to ics-factoryrom
2011-09-15 16:18:36 -07:00
Anatol Pomazau
8b0832c6e6
am 4b6b8aa8: Add BrowserGoogle project
...
* commit '4b6b8aa86862140d0cf0997743cc85506509a33f':
Add BrowserGoogle project
2011-09-15 09:54:52 -07:00
Anatol Pomazau
4b6b8aa868
Add BrowserGoogle project
2011-09-15 09:53:24 -07:00
Flavio Lerda
5dfc8394af
Remove VoicemailProvider since it is no longer in use.
...
Bug: 5290063
Change-Id: I829940dffdf6acd1bde1d3d3a9406c7a8c32b448
2011-09-15 15:51:50 +01:00
Ed Heyl
a041e67212
set branch name to ics-factoryrom
2011-09-14 13:51:08 -07:00
Anatol Pomazau
57a26dae26
am 35011988: Remove hsqldb as it is not used in master
...
* commit '35011988be9ef8d3dae3537dc3b920b8ea5a9243':
Remove hsqldb as it is not used in master
2011-09-13 16:54:34 -07:00
Anatol Pomazau
35011988be
Remove hsqldb as it is not used in master
2011-09-13 16:52:15 -07:00
Anatol Pomazau
032c902e49
am b040282c: Add ti/usbboot project
...
* commit 'b040282c99f62463ac54f12165908710cd0188ca':
Add ti/usbboot project
2011-09-13 11:09:29 -07:00
Anatol Pomazau
b040282c99
Add ti/usbboot project
2011-09-13 11:07:33 -07:00
Anatol Pomazau
0b4348074e
am 459a1206: Add jmdns
...
* commit '459a12063f989e494e519e38310749015f92f9e4':
Add jmdns
2011-09-12 13:30:44 -07:00
Anatol Pomazau
459a12063f
Add jmdns
2011-09-12 13:27:43 -07:00
Ficus Kirkpatrick
491499a763
am 5c52ef9f: Merge "Remove Market from master manifest; long replaced by Phonesky."
...
* commit '5c52ef9fe70997c65862001b26139d800964f471':
Remove Market from master manifest; long replaced by Phonesky.
2011-09-09 13:36:09 -07:00
Ficus Kirkpatrick
5c52ef9fe7
Merge "Remove Market from master manifest; long replaced by Phonesky."
2011-09-09 13:34:02 -07:00
Ficus Kirkpatrick
d8d61393ac
Remove Market from master manifest; long replaced by Phonesky.
2011-09-09 13:33:23 -07:00
Jean-Baptiste Queru
7fce6d05af
am d59f6cc5: (-s ours) am 7e3a9c7c: (-s ours) Revert "Switch honeycomb family to tools_r12 - do not merge"
...
* commit 'd59f6cc55f2092b60ed2bd0caf5c9ae3aac97e5c':
Revert "Switch honeycomb family to tools_r12 - do not merge"
2011-09-09 12:08:12 -07:00
Jean-Baptiste Queru
d59f6cc55f
am 7e3a9c7c: (-s ours) Revert "Switch honeycomb family to tools_r12 - do not merge"
...
* commit '7e3a9c7c5f291977e054ba3eab13ea10a8b052fc':
Revert "Switch honeycomb family to tools_r12 - do not merge"
2011-09-09 12:04:46 -07:00
Uriel Rodriguez
a9af49819f
am 77841e44: removing boost from master manifest
...
* commit '77841e4425270fc84f5e02d384d3fc758da5ef4e':
removing boost from master manifest
2011-09-09 10:17:37 -07:00
Uriel Rodriguez
77841e4425
removing boost from master manifest
2011-09-09 12:57:44 -04:00
Uriel Rodriguez
51fe6e5199
am 610146cc: Merge "updating manifest with new pittpatt projects"
...
* commit '610146cc6079aeb53754528622a582ec51f1fcdc':
updating manifest with new pittpatt projects
2011-09-09 09:01:11 -07:00
Anatol Pomazau
74ec479b4b
am 1460786f: Add openssh
...
* commit '1460786fa29feb7e2343eadece10620f5dad3648':
Add openssh
2011-09-09 09:00:42 -07:00
Uriel Rodriguez
610146cc60
Merge "updating manifest with new pittpatt projects"
2011-09-08 15:10:40 -07:00
Anatol Pomazau
1460786fa2
Add openssh
2011-09-08 14:56:26 -07:00
Uriel Rodriguez
a2925ccda3
updating manifest with new pittpatt projects
...
added:
- vendor/unbundled_google/packages/PittPatt
- vendor/unbundled_google/packages/FaceLock
- external/boost
removed:
- vendor/pittpatt/prebuilt
2011-09-08 17:46:59 -04:00
Jean-Baptiste Queru
7e3a9c7c5f
Revert "Switch honeycomb family to tools_r12 - do not merge"
...
This reverts commit ee6d4c65c4
2011-09-08 14:41:03 -07:00
Anatol Pomazau
90f3d01978
am 0df8e9bf: Add pittpatt binaries
...
* commit '0df8e9bfefcb8bc53888bf19176c9eb4778a171c':
Add pittpatt binaries
2011-08-29 15:15:54 -07:00
Ed Heyl
b7abc6eb16
am 92d04daa: Change default Finsky version from froyo-ub-finsky-bourbon to froyo-ub-finsky-brandy
...
* commit '92d04daad619c9dfc92ef1c92d604780ebe3d07b':
Change default Finsky version from froyo-ub-finsky-bourbon to froyo-ub-finsky-brandy
2011-08-29 15:15:22 -07:00
Anatol Pomazau
0df8e9bfef
Add pittpatt binaries
2011-08-29 11:09:27 -07:00
Ed Heyl
92d04daad6
Change default Finsky version from froyo-ub-finsky-bourbon to froyo-ub-finsky-brandy
2011-08-29 05:25:04 -07:00
Anatol Pomazau
371d31be98
am faae2a07: Add PackageVerifier
...
* commit 'faae2a074ff0963bd153d037090a92e4dfc44ed7':
Add PackageVerifier
2011-08-25 13:09:40 -07:00
Anatol Pomazau
3eea9f117e
am 4d783adb: Add bart project
...
* commit '4d783adb057bb7d59dcc88583b20d74df7ad478a':
Add bart project
2011-08-25 11:34:42 -07:00
Anatol Pomazau
faae2a074f
Add PackageVerifier
2011-08-24 14:45:28 -07:00
Anatol Pomazau
4d783adb05
Add bart project
2011-08-24 08:37:34 -07:00
Flavio Lerda
bb1b4e25c6
am 2abaefe3: Remove VoicemailOmtp repository.
...
* commit '2abaefe37fe9426de008cd11a126ee0c5d1b9d88':
Remove VoicemailOmtp repository.
2011-08-23 03:41:52 -07:00
Flavio Lerda
2abaefe37f
Remove VoicemailOmtp repository.
...
It was never actually used.
2011-08-22 18:12:44 +01:00
Ed Heyl
a35df5d015
am e93077d3: (-s ours) am ee6d4c65: (-s ours) Switch honeycomb family to tools_r12 - do not merge
...
* commit 'e93077d3c5ea83ae112a18896c5212f88c4b4d94':
Switch honeycomb family to tools_r12 - do not merge
2011-08-22 09:06:32 -07:00
Ed Heyl
e93077d3c5
am ee6d4c65: (-s ours) Switch honeycomb family to tools_r12 - do not merge
...
* commit 'ee6d4c65c40d631bbfec0faeb8bf4cb5d08376c4':
Switch honeycomb family to tools_r12 - do not merge
2011-08-22 09:04:49 -07:00
Ed Heyl
ee6d4c65c4
Switch honeycomb family to tools_r12 - do not merge
2011-08-22 09:02:23 -07:00
Owen Lin
b955d8bd92
am bce6bb49: Merge "remove Gallery3D"
...
* commit 'bce6bb49250402c658c4cd2b8cd76f6e421b8f0a':
remove Gallery3D
2011-08-18 02:19:59 -07:00
Owen Lin
bce6bb4925
Merge "remove Gallery3D"
2011-08-18 02:18:04 -07:00
Dan Morrill
443a24ce18
Updating project config to match final unbundled branch config.
...
Change-Id: I4a1418cbd1343ef78691bdf671015ce1899bb67d
2011-08-16 14:53:49 -07:00
Anatol Pomazau
12ccb05d9f
am c220b77b: Add kittehface
...
* commit 'c220b77b483847e0220f5602a605f19743bc83d2':
Add kittehface
2011-08-16 14:18:06 -07:00
Anatol Pomazau
c220b77b48
Add kittehface
2011-08-16 14:16:18 -07:00
Mike J. Chen
984c7dec54
Add some Android@Home projects
...
Added the following projects:
vendor/google_devices/tungsten
vendor/unbundled_google/packages/AndroidAtHome/Core
vendor/unbundled_google/packages/AndroidAtHome/Lights
vendor/unbundled_google/packages/AndroidAtHome/Mesh
Change-Id: Ibb858872c95a2ccadbf7a9d0e6d32eacbeb1831b
Signed-off-by: Mike J. Chen <mjchen@google.com >
2011-08-12 17:52:04 -07:00
Anatol Pomazau
d6587ca6c3
Add google_devices/cujo
2011-08-12 15:08:45 -07:00
Anatol Pomazau
e6c71c4558
am 6868e06d: Add external jack project
...
* commit '6868e06df4e858604889367191cfbd50e700035f':
Add external jack project
2011-08-12 11:02:58 -07:00
Anatol Pomazau
6868e06df4
Add external jack project
2011-08-12 11:00:46 -07:00
Ed Heyl
49ccd93cf0
remove Gallery3D
2011-08-11 06:55:25 -07:00
Ed Heyl
c186e4aef9
am cfff85ec: added Gallery2 and GalleryGoogle
...
* commit 'cfff85ecc27e72cd045ad16c5c03fd9705ded636':
added Gallery2 and GalleryGoogle
2011-08-11 06:54:04 -07:00
Ed Heyl
cfff85ecc2
added Gallery2 and GalleryGoogle
2011-08-11 06:47:37 -07:00
Ed Heyl
ead239b783
am c90c1262: Added vendor/unbundled_google/packages/Docs
...
* commit 'c90c12628bdec6e10f1ac6d16455b7785a41051a':
Added vendor/unbundled_google/packages/Docs
2011-08-09 05:41:29 -07:00
Ed Heyl
c90c12628b
Added vendor/unbundled_google/packages/Docs
2011-08-09 05:39:04 -07:00
Ed Heyl
8e542f8498
am 0b6b16dc: Revert "Added vendor/unbundled_google/packages/Docs"
...
* commit '0b6b16dc567e805c61af1a68f5b1a32d8c5b2c3c':
Revert "Added vendor/unbundled_google/packages/Docs"
2011-08-08 17:25:35 -07:00
Ed Heyl
0b6b16dc56
Revert "Added vendor/unbundled_google/packages/Docs"
...
This reverts commit 20010f0188
2011-08-08 17:23:54 -07:00
Ed Heyl
b36078b280
am 20010f01: Added vendor/unbundled_google/packages/Docs
...
* commit '20010f0188b61e733ce99638c4a819cab9717d9e':
Added vendor/unbundled_google/packages/Docs
2011-08-08 17:01:04 -07:00
Ed Heyl
20010f0188
Added vendor/unbundled_google/packages/Docs
2011-08-08 16:58:47 -07:00
Anatol Pomazau
75b70696b9
am f156952d: Add libnl-headers
...
* commit 'f156952d818ff9111b9d327d08bd1d79b58477fb':
Add libnl-headers
2011-08-08 10:36:17 -07:00
Anatol Pomazau
f156952d81
Add libnl-headers
2011-08-08 10:34:00 -07:00
Anatol Pomazau
ac9b6b2e30
am 5e7c2907: Add frameworks/picasasync
...
* commit '5e7c2907b4922965185b2f3f282c61d302018382':
Add frameworks/picasasync
2011-08-05 15:25:21 -07:00
Anatol Pomazau
5e7c2907b4
Add frameworks/picasasync
2011-08-05 15:23:56 -07:00
Anatol Pomazau
ac3856deee
am 23db953d: Add omap4xxx
...
* commit '23db953ddadf07d060724b1ab3a0d0d3926de0a3':
Add omap4xxx
2011-08-03 09:33:49 -07:00
Anatol Pomazau
23db953dda
Add omap4xxx
2011-08-03 09:31:36 -07:00
Anatol Pomazau
dc77505f0b
am e4dff9ef: Add hardware/invensense
...
* commit 'e4dff9ef8ce6a017cef1ec836208f5431e49041b':
Add hardware/invensense
2011-08-01 09:48:01 -07:00
Anatol Pomazau
e4dff9ef8c
Add hardware/invensense
2011-08-01 09:44:58 -07:00
Jean-Baptiste Queru
93bf97ce87
am 9800bd69: Update mirror for AOSP master
...
* commit '9800bd69c884917408b252fca51eaca156ff1e27':
Update mirror for AOSP master
2011-07-26 07:23:41 -07:00
Jean-Baptiste Queru
9800bd69c8
Update mirror for AOSP master
2011-07-25 20:38:06 -07:00
Ed Heyl
bc3e8e3341
manifest for ics-aah
2011-07-24 11:11:24 -07:00
Ed Heyl
9006abce6f
Change finsky default revisioin to froyo-ub-finsky-bourbon
2011-07-20 11:19:35 -07:00
Ed Heyl
bb318c1fb6
am 916f27d7: (-s ours) am 6c7b0f88: (-s ours) am 5092dfc0: Add Shopper app. Do not merge.
...
* commit '916f27d71a2fb00392dd84de80bdae6f654e5bed':
Add Shopper app. Do not merge.
2011-07-19 17:55:40 -07:00
Ed Heyl
916f27d71a
am 6c7b0f88: (-s ours) am 5092dfc0: Add Shopper app. Do not merge.
...
* commit '6c7b0f88009eb933e95f5346b125bd4deb7e0007':
Add Shopper app. Do not merge.
2011-07-19 17:53:04 -07:00
Ed Heyl
6c7b0f8800
am 5092dfc0: Add Shopper app. Do not merge.
...
* commit '5092dfc031db5b72fa44a22dfd5ef1c08fe3cf06':
Add Shopper app. Do not merge.
2011-07-19 17:51:15 -07:00
Ed Heyl
5092dfc031
Add Shopper app. Do not merge.
2011-07-19 17:46:49 -07:00
Anatol Pomazau
06f9c983bb
Add frameworks/opt/calendar
2011-07-07 15:01:43 -07:00
Anatol Pomazau
f79773e7d2
Add inputmethodcommon project
2011-07-06 10:31:42 -07:00
Anatol Pomazau
9b825303df
Addd littelmock
2011-07-06 10:19:18 -07:00
Anatol Pomazau
379ec97c8f
Add MusicFX
2011-06-27 10:03:09 -07:00
Ed Heyl
c256e76927
am c7054ec2: (-s ours) am e7c08127: am d3c965c9: use hc-mr2 branch for Market and Finsky
...
* commit 'c7054ec2a55bbeef9a8cd33460760e0c6e402607':
use hc-mr2 branch for Market and Finsky
2011-06-24 17:17:13 -07:00
Dmitry Shmidt
36e62c802d
Add external/libnl_2
...
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2011-06-24 14:10:43 -07:00
Ed Heyl
c7054ec2a5
am e7c08127: am d3c965c9: use hc-mr2 branch for Market and Finsky
...
* commit 'e7c0812751332d5224a4c2b17c3c8bba60447844':
use hc-mr2 branch for Market and Finsky
2011-06-23 10:55:29 -07:00
Ed Heyl
e7c0812751
am d3c965c9: use hc-mr2 branch for Market and Finsky
...
* commit 'd3c965c9e15bdcb154833df95ffae993cae1325e':
use hc-mr2 branch for Market and Finsky
2011-06-23 10:48:09 -07:00
Ed Heyl
d3c965c9e1
use hc-mr2 branch for Market and Finsky
2011-06-23 10:26:34 -07:00
Ficus Kirkpatrick
e1df3d4bde
Point master to finsky-bourbon (ICS-timeframe Market release branch)
2011-06-23 09:23:05 -07:00
Anatol Pomazau
c856884d5b
Add ti/omap4
2011-06-17 13:03:28 -07:00
Arve Hjønnevåg
912f569227
Merge "Add vendor/invensense"
2011-06-16 20:14:50 -07:00
Anatol Pomazau
e61fe979b7
Add art
2011-06-16 08:28:39 -07:00
Arve Hjønnevåg
8ece019306
Add vendor/invensense
2011-06-15 19:42:48 -07:00
Anatol Pomazau
91205a5aa3
Add CalendarGoogle
2011-06-15 12:37:14 -07:00
Anatol Pomazau
c91710280f
am 60bf4ee4: am 6cee46b9: am 514da59f: Add mksh
...
* commit '60bf4ee4e3c5ebc679364a073981dbe39a8695a0':
Add mksh
2011-06-14 07:41:47 -07:00
Anatol Pomazau
60bf4ee4e3
am 6cee46b9: am 514da59f: Add mksh
...
* commit '6cee46b9fae9f81e50de160158b5defe98720498':
Add mksh
2011-06-13 18:48:44 -07:00
Jean-Baptiste Queru
e4c87afdd9
Merge from honeycomb-plus-aosp
2011-06-13 18:46:11 -07:00
Anatol Pomazau
6cee46b9fa
am 514da59f: Add mksh
...
* commit '514da59fc00f3f051f24c1ebb15d245b34c2de32':
Add mksh
2011-06-13 18:43:45 -07:00
Jean-Baptiste Queru
ca44fb9af2
Merge from gingerbread-plus-aosp
2011-06-13 18:42:36 -07:00
Anatol Pomazau
514da59fc0
Add mksh
2011-06-13 18:38:59 -07:00
Anatol Pomazau
b6eafa4a35
Add mksh
2011-06-13 18:34:08 -07:00
Anatol Pomazau
51a33a8e14
Add mksh
2011-06-13 18:30:04 -07:00
Anatol Pomazau
e330c22883
Add mksh
2011-06-10 08:17:28 -07:00
Anatol Pomazau
769fa0b50e
Add installer_cd
2011-06-10 08:13:26 -07:00
Anatol Pomazau
1e67395162
Add linkloader
2011-06-07 16:24:34 -07:00
Anatol Pomazau
1cf1089621
Add tinyalsa
2011-06-06 15:02:46 -07:00
Anatol Pomazau
2544c9f480
Add abi/cpp
2011-06-06 10:27:19 -07:00
Anatol Pomazau
865e7d9ef5
Add eyes-free
2011-06-02 09:59:04 -07:00
Anatol Pomazau
044159c092
Revert "Add aft"
...
This reverts commit dd0114bd4f
2011-06-01 10:20:50 -07:00
Anatol Pomazau
dd0114bd4f
Add aft
2011-06-01 09:34:48 -07:00
Anatol Pomazau
84b6dac5e1
Fix typo
2011-05-31 15:22:24 -07:00
Anatol Pomazau
88c35ca263
Add PlusOne
2011-05-31 15:21:08 -07:00
Anatol Pomazau
f286a3e5e7
Add libppp
2011-05-31 15:14:35 -07:00
Anatol Pomazau
026e9756fb
Add mockwebserver
2011-05-31 10:01:38 -07:00
Jean-Baptiste Queru
db7c7c5103
Add missing projects in AOSP mirror
2011-05-25 14:04:35 -07:00
Anatol Pomozov
abbca00639
Add external/opencv
2011-05-25 13:14:45 -07:00
Jean-Baptiste Queru
34a6e8b481
Merge "Remove passion and sholes repositories"
2011-05-25 10:08:21 -07:00
Jean-Baptiste Queru
dbf080ae24
Merge from honeycomb-plus-aosp
2011-05-25 09:32:33 -07:00
Jean-Baptiste Queru
36d705d593
Merge from gingerbread
2011-05-25 09:26:34 -07:00
Jean-Baptiste Queru
9dbc90dd01
am 88db81fc: Add SmartCardService
...
* commit '88db81fccd9faed479de9b806caae3d9223b64c9':
Add SmartCardService
2011-05-25 07:26:46 -07:00
Jean-Baptiste Queru
bbb1ad2b16
Add SmartCardService to AOSP mirror
2011-05-25 07:26:12 -07:00
Jean-Baptiste Queru
88db81fccd
Add SmartCardService
2011-05-25 07:17:26 -07:00
Anatol Pomozov
ad85495f4d
am f918120d: Add SmartCardService
...
* commit 'f918120d518918885d26335284c2008f29ff5583':
Add SmartCardService
2011-05-24 09:31:26 -07:00
Anatol Pomozov
f918120d51
Add SmartCardService
2011-05-24 09:23:01 -07:00
Jean-Baptiste Queru
72ba1e89c8
No-op merge from honeycomb-plus-aosp
2011-05-23 16:04:22 -07:00
Jean-Baptiste Queru
424dd060f8
am 5b2849ff: am 68495519: Add mtp/usb libs
...
* commit '5b2849ff569799eef66a0a57cc8a4859c369e014':
Add mtp/usb libs
2011-05-23 14:54:40 -07:00
Jean-Baptiste Queru
5b2849ff56
am 68495519: Add mtp/usb libs
...
* commit '6849551968630093ea7a8d7ee8960c7c1038b052':
Add mtp/usb libs
2011-05-23 14:48:24 -07:00
Jean-Baptiste Queru
b852d41359
am 4790cd7c: Add mtp/usb libs
...
* commit '4790cd7c5c08854839e549820e5601cf9f3efad0':
Add mtp/usb libs
2011-05-23 14:31:38 -07:00
Jean-Baptiste Queru
6849551968
Add mtp/usb libs
2011-05-23 14:09:46 -07:00
Jean-Baptiste Queru
4790cd7c5c
Add mtp/usb libs
2011-05-23 14:04:51 -07:00
Jean-Baptiste Queru
9b2b96908f
Add mtp/usb libs
2011-05-23 13:56:46 -07:00
Anatol Pomozov
a84abdfd53
Add libmtp/libusb libraries
2011-05-23 11:20:05 -07:00
Anatol Pomozov
a12fb93751
Add antlr
2011-05-20 11:54:10 -07:00
Jean-Baptiste Queru
b738a3a921
Remove passion and sholes repositories
2011-05-20 08:49:14 -07:00
Jean-Baptiste Queru
cb43c5b439
Merge from honeycomb-plus-aosp
2011-05-19 08:15:30 -07:00
Jean-Baptiste Queru
ef2d878bac
am 21167f33: Merge from stage-korg-master
...
* commit '21167f3387e9b59c6f0da4aadb13034b28666c63':
Add qemu BIOS
2011-05-19 08:06:50 -07:00
Jean-Baptiste Queru
21167f3387
Merge from stage-korg-master
2011-05-19 08:01:32 -07:00
Jean-Baptiste Queru
a40c9a209e
am fcfc5ae1: Add qemu BIOS
...
* commit 'fcfc5ae10e1da7b3be595076451f096a95d77a47':
Add qemu BIOS
2011-05-19 07:52:32 -07:00
Jean-Baptiste Queru
094e8756d2
Add qemu BIOS to korg mirror
2011-05-19 07:42:45 -07:00
Jean-Baptiste Queru
541295184d
Add qemu BIOS
2011-05-19 07:39:11 -07:00
Jean-Baptiste Queru
fcfc5ae10e
Add qemu BIOS
2011-05-19 07:34:58 -07:00
Jean-Baptiste Queru
5bc16081f6
Add qemu BIOS
2011-05-19 07:27:16 -07:00
Anatol Pomozov
7cf66aa327
Add qemu-pc-bios
2011-05-19 07:01:35 -07:00
Jean-Baptiste Queru
7787423579
Merge form honeycomb-plus-aosp
2011-05-18 15:59:23 -07:00
Jean-Baptiste Queru
c1f7192fe6
Mirror crespo4g. Oops.
2011-05-18 15:51:22 -07:00
Jean-Baptiste Queru
9720c774fe
Add valgrind to AOSP mirror
2011-05-18 15:39:14 -07:00
Jean-Baptiste Queru
225f91b8cc
Add docs/s.a.c to korg mirror
2011-05-18 13:14:31 -07:00
Jean-Baptiste Queru
a7be92965f
am 67ca743c: Merge from stage-korg-master
...
* commit '67ca743cd0ad5ef3750f06e3238e2b77eb0c86d9':
Add docs/source.android.com
2011-05-18 09:16:46 -07:00
Jean-Baptiste Queru
67ca743cd0
Merge from stage-korg-master
2011-05-18 09:13:06 -07:00
Jean-Baptiste Queru
4de4a82456
Add docs/source.android.com
2011-05-18 09:08:27 -07:00
Jean-Baptiste Queru
87305faaa2
am d484fe3b: (-s ours) Add docs/source.android.com
...
* commit 'd484fe3bc5ff2dc615dd028084f1912d36843cda':
Add docs/source.android.com
2011-05-18 08:57:02 -07:00
Jean-Baptiste Queru
d484fe3bc5
Add docs/source.android.com
2011-05-18 08:50:37 -07:00
Jean-Baptiste Queru
eb1eb622e2
am 5ac2a926: am fa4d46a4: Add valgrind
...
* commit '5ac2a926f88c21ab45fe951652294f1e593d1711':
Add valgrind
2011-05-18 08:36:20 -07:00
Jean-Baptiste Queru
5ac2a926f8
am fa4d46a4: Add valgrind
...
* commit 'fa4d46a4d96f5a559a116c4e1bca3eb8c49abca4':
Add valgrind
2011-05-18 08:34:22 -07:00
Jean-Baptiste Queru
fa4d46a4d9
Add valgrind
2011-05-18 08:31:08 -07:00
Jean-Baptiste Queru
99e31ebfd3
am f1cfc9d4: Add valgrind
...
* commit 'f1cfc9d4023f9de11b391382f9ee1df9a8c2ab64':
Add valgrind
2011-05-18 08:13:59 -07:00
Jean-Baptiste Queru
f1cfc9d402
Add valgrind
2011-05-18 08:09:49 -07:00
Jean-Baptiste Queru
ca5de996cb
am 602e7637: am 6917ff3e: am 57b2caae: Add CBReveiver
...
* commit '602e7637d8451b0e2bc7b3be61fd0f53272fa2c9':
Add CBReveiver
2011-05-17 18:26:23 -07:00
Jean-Baptiste Queru
602e7637d8
am 6917ff3e: am 57b2caae: Add CBReveiver
...
* commit '6917ff3e840a0e478245f31fff5f7bd7e8679b1d':
Add CBReveiver
2011-05-17 12:31:54 -07:00
Jean-Baptiste Queru
6917ff3e84
am 57b2caae: Add CBReveiver
...
* commit '57b2caae57e1a6be5a5ee310856c1ecb47f0d155':
Add CBReveiver
2011-05-17 12:29:05 -07:00
Jean-Baptiste Queru
57b2caae57
Add CBReveiver
2011-05-17 12:24:11 -07:00
Anatol Pomozov
350705a136
am e44aa6fc: am 6abe0bbc: am b5062584: Add CellBroadcastReceiver
...
* commit 'e44aa6fcebd773db137f7bc297e567c4c8cbf96d':
Add CellBroadcastReceiver
2011-05-17 12:01:56 -07:00
Anatol Pomozov
e44aa6fceb
am 6abe0bbc: am b5062584: Add CellBroadcastReceiver
...
* commit '6abe0bbc8c83b5345e6ebca857d1f7cffba61a9a':
Add CellBroadcastReceiver
2011-05-17 11:59:47 -07:00
Anatol Pomozov
6abe0bbc8c
am b5062584: Add CellBroadcastReceiver
...
* commit 'b506258458e901b87118c72fe9dfde66bb94b4e5':
Add CellBroadcastReceiver
2011-05-17 11:56:16 -07:00
Anatol Pomozov
b506258458
Add CellBroadcastReceiver
2011-05-17 11:47:42 -07:00
Anatol Pomozov
74b9b6fbab
Add PhotoEditorGoogle
2011-05-17 10:51:59 -07:00
Anatol Pomozov
a0ef721c20
Add webrtc
2011-05-16 14:14:38 -07:00
Jean-Baptiste Queru
6ec876c3e7
am f24c4550: am fb6b8913: am 2657a331: Add NetworkLocation
...
* commit 'f24c45505a7db700019c54a283265935ad1705a1':
Add NetworkLocation
2011-05-13 16:28:53 -07:00
Jean-Baptiste Queru
f24c45505a
am fb6b8913: am 2657a331: Add NetworkLocation
...
* commit 'fb6b89135cee94c7ac5c4c70c04e623206026ab8':
Add NetworkLocation
2011-05-13 16:26:29 -07:00
Jean-Baptiste Queru
fb6b89135c
am 2657a331: Add NetworkLocation
...
* commit '2657a331f51ffcc0da4df537a312036f1f8bcc39':
Add NetworkLocation
2011-05-13 16:23:53 -07:00
Jean-Baptiste Queru
0eaf004edb
am 76af8b44: am aa6d059d: Add NetworkLocation
...
* commit '76af8b441f318d4d667ee41b77f7471b95a02069':
Add NetworkLocation
2011-05-13 15:22:48 -07:00
Jean-Baptiste Queru
76af8b441f
am aa6d059d: Add NetworkLocation
...
* commit 'aa6d059d33d490d7d38d42d0bee7d5796a509435':
Add NetworkLocation
2011-05-13 14:04:43 -07:00
Jean-Baptiste Queru
2657a331f5
Add NetworkLocation
2011-05-13 14:01:13 -07:00
Jean-Baptiste Queru
aa6d059d33
Add NetworkLocation
2011-05-13 13:53:43 -07:00
Jean-Baptiste Queru
3c04ebdeca
Merge from honeycomb-plus-aosp
2011-05-12 16:47:57 -07:00
Jean-Baptiste Queru
252fbbb72b
am 29f71114: am 1acf586a: Add NetworkLocation
...
* commit '29f71114daac603f3c977d67bc0adc0c9eedde68':
Add NetworkLocation
2011-05-12 16:23:23 -07:00
Jean-Baptiste Queru
29f71114da
am 1acf586a: Add NetworkLocation
...
* commit '1acf586a541b2061da0115d1bc9206a33a046d46':
Add NetworkLocation
2011-05-12 16:20:55 -07:00
Jean-Baptiste Queru
1acf586a54
Add NetworkLocation
2011-05-12 16:00:21 -07:00
Jean-Baptiste Queru
0961437d52
am 3f4cead8: am c5cab253: add webp
...
* commit '3f4cead86a37aad87a453cf62939f2b08cfd6d17':
add webp
2011-05-12 15:42:33 -07:00
Jean-Baptiste Queru
3f4cead86a
am c5cab253: add webp
...
* commit 'c5cab253d6c87059f359bed9c004c246000a1659':
add webp
2011-05-12 15:37:44 -07:00
Jean-Baptiste Queru
87da543b9c
add webp in mirror
2011-05-12 14:44:38 -07:00
Jean-Baptiste Queru
c5cab253d6
add webp
2011-05-12 14:13:47 -07:00
Jean-Baptiste Queru
8ea70387f0
Merge from honeycomb-plus-aosp
2011-05-11 10:16:47 -07:00
Anatol Pomozov
8447354bfa
am 16c8ab31: Merge remote-tracking branch \'ag/honeycomb-mr2\' into HEAD
...
* commit '16c8ab31007e5aaf848bb3f01e77a78c55b1894c':
Add htc/flyer project
honeycomb-mr2 branch manifest
2011-05-10 17:05:08 -07:00
Anatol Pomozov
16c8ab3100
Merge remote-tracking branch 'ag/honeycomb-mr2' into HEAD
...
Conflicts:
default.xml
2011-05-10 17:01:06 -07:00
Anatol Pomozov
4eeb889aa7
Add htc/flyer project
2011-05-10 16:34:10 -07:00
Jean-Baptiste Queru
69d99568ea
Add accessory stuff
2011-05-10 14:08:40 -07:00
Jean-Baptiste Queru
78feddaca9
Add NLP
2011-05-06 16:45:12 -07:00
Ed Heyl
c423cc469e
merge "remove gingerbread revision for vendor/samsung/crespo"
2011-05-06 16:34:56 -07:00
Ed Heyl
dbd5f8d4f4
Merge commit '172f56c' into honeycomb-plus-aosp
2011-05-06 16:31:04 -07:00
Ed Heyl
172f56cea3
no longer point to gingerbread version of vendor/samsung/crespo
2011-05-06 16:26:01 -07:00
Jean-Baptiste Queru
813d4c9528
Ignore from stage-korg-master
2011-05-06 14:22:11 -07:00
Jean-Baptiste Queru
55617385e9
add crespo4g
2011-05-06 14:12:43 -07:00
Jean-Baptiste Queru
2240806d3d
am 323cac79: Add accessory stuff
...
* commit '323cac79060e623fd7bdeb20731154aa92418f7b':
Add accessory stuff
2011-05-06 14:06:01 -07:00
Jean-Baptiste Queru
323cac7906
Add accessory stuff
2011-05-06 13:59:23 -07:00
Ed Heyl
0430db54d9
honeycomb-mr2 branch manifest
2011-05-03 16:53:02 -07:00
Ed Heyl
ad4180251a
point Finsky project to 'hc-ub-finsky'
2011-05-03 11:08:56 -07:00
Jean-Baptiste Queru
235a5f4360
am c3270dc6: Merge from gingerbread-plus-aosp
...
* commit 'c3270dc65af888654b4acfa4e10504059101ccd3':
Add apache-qp and carddav projects
2011-04-29 15:06:48 -07:00
Jean-Baptiste Queru
c3270dc65a
Merge from gingerbread-plus-aosp
2011-04-29 14:50:42 -07:00
Jean-Baptiste Queru
c167db5683
Revert "Add NetworkLocation"
...
This reverts commit 985f61ec2d
2011-04-28 13:21:55 -07:00
Jean-Baptiste Queru
985f61ec2d
Add NetworkLocation
2011-04-28 12:38:49 -07:00
Jean-Baptiste Queru
7ab8470cb9
add qp and carddav to korg mirror
2011-04-28 08:06:25 -07:00
Jean-Baptiste Queru
0944c4661c
am ef6ebf09: Add apache-qp and carddav projects
...
* commit 'ef6ebf09148f99b529833e754611c38b4b8165e6':
Add apache-qp and carddav projects
2011-04-28 07:59:04 -07:00
Jean-Baptiste Queru
ef6ebf0914
Add apache-qp and carddav projects
2011-04-28 07:50:02 -07:00
Anatol Pomozov
9adb1a09c6
Add apache-qp and carddav projects
2011-04-27 15:53:22 -07:00
Anatol Pomazau
3349eeb363
Add apache harmony
2011-04-26 16:40:24 -07:00
Jean-Baptiste Queru
c965bfec87
am b7fecc0d: (-s ours) fix whitespace for consistency - do not merge
...
* commit 'b7fecc0d47c952645b29908811759e6acab08cbd':
fix whitespace for consistency - do not merge
2011-04-21 16:54:48 -07:00
Jean-Baptiste Queru
b7fecc0d47
fix whitespace for consistency - do not merge
2011-04-21 16:42:01 -07:00
Anatol Pomazau
9a236f84e6
Add mailcommon
2011-04-20 15:32:37 -07:00
Anatol Pomazau
e33e8725a5
Add Iosched project
2011-04-18 09:15:40 -07:00
Jean-Baptiste Queru
a3fb2a5664
Delete now-empty project frameworks/compile/pixelflinger2
2011-04-15 13:02:02 -07:00
Sriram Raman
a177da5502
Fix master-ub-music2
2011-04-13 19:13:18 -04:00
Sriram Raman
03a883d667
Create master-ub-music2
2011-04-13 18:50:44 -04:00
Anatol Pomazau
056c79d7e8
Add a few samsung projects
2011-04-11 18:29:45 -07:00
Anatol Pomazau
4345729e0f
Revert "Add samsung/prime"
...
This reverts commit f4b3460d74
2011-04-11 17:54:59 -07:00
Jean-Baptiste Queru
88dd14780b
am 467433d1: am 2b6a0a92: ignore from stage-korg-master
...
* commit '467433d1059d3561a4b14818e24b570a8e1bae3e':
Remove demokit and panda repositories from staging
2011-04-11 17:38:16 -07:00
Jean-Baptiste Queru
467433d105
am 2b6a0a92: ignore from stage-korg-master
...
* commit '2b6a0a922f2b72f226c56d5c0dcb3b0fbad319aa':
Remove demokit and panda repositories from staging
2011-04-11 17:32:57 -07:00
Jean-Baptiste Queru
4cdf97c721
am 1bb66e69: am 05bf1b08: Ignore from stage-korg-master
...
* commit '1bb66e69ba01fcf0dcc88fc553a5ea223a10624d':
Update staging manifest for 2.3.4
2011-04-11 17:31:47 -07:00
Jean-Baptiste Queru
1bb66e69ba
am 05bf1b08: Ignore from stage-korg-master
...
* commit '05bf1b087966fdf4c93d4135f156208e430b37ac':
Update staging manifest for 2.3.4
2011-04-11 17:27:28 -07:00
Anatol Pomazau
f4b3460d74
Add samsung/prime
2011-04-11 14:37:12 -07:00
Neel Parekh
852c807cec
Include easy mock in unbundled branch
2011-04-11 13:59:08 -07:00
Jean-Baptiste Queru
2b6a0a922f
ignore from stage-korg-master
2011-04-11 09:35:06 -07:00
Jean-Baptiste Queru
2e1024ca91
Remove demokit and panda repositories from staging
2011-04-11 09:05:46 -07:00
Anatol Pomazau
d9abef0714
Add KeyChain project
2011-04-09 14:09:38 -07:00
Jean-Baptiste Queru
05bf1b0879
Ignore from stage-korg-master
2011-04-07 10:48:48 -07:00
Jean-Baptiste Queru
aa3b24793b
Update staging manifest for 2.3.4
2011-04-07 10:39:39 -07:00
Anatol Pomazau
24ad930e23
Add SpareParts application
2011-04-06 13:45:56 -07:00
Ed Heyl
2ce139f207
am 92ca86b0: am 7a280eec: (-s ours) am 5752f650: remove special branch for Market, set to default (gingerbread)
...
* commit '92ca86b04629e3dad67ba801351968b233a71d03':
remove special branch for Market, set to default (gingerbread)
2011-04-04 17:48:42 -07:00
Ed Heyl
92ca86b046
am 7a280eec: (-s ours) am 5752f650: remove special branch for Market, set to default (gingerbread)
...
* commit '7a280eec988a237fef43737415fcdb1da1efaabb':
remove special branch for Market, set to default (gingerbread)
2011-04-04 17:41:57 -07:00
Ed Heyl
23e0ebed16
am 112e11f5: am 7a6c5e3f: (-s ours) am 1b2f17c9: point Market to market-granola now as per Ficus
...
* commit '112e11f583fe0efd399fafa009873666f00a9249':
point Market to market-granola now as per Ficus
2011-04-04 17:11:42 -07:00
Ed Heyl
112e11f583
am 7a6c5e3f: (-s ours) am 1b2f17c9: point Market to market-granola now as per Ficus
...
* commit '7a6c5e3f63b0341c50d0a69ffbf66df832b6caa1':
point Market to market-granola now as per Ficus
2011-04-04 17:10:15 -07:00
Ed Heyl
7a280eec98
am 5752f650: remove special branch for Market, set to default (gingerbread)
...
* commit '5752f65072060b79cc511c3fdb27474bf29dd040':
remove special branch for Market, set to default (gingerbread)
2011-04-04 12:20:24 -07:00
Ed Heyl
7a6c5e3f63
am 1b2f17c9: point Market to market-granola now as per Ficus
...
* commit '1b2f17c9236962cade267bc9792939b1588f479d':
point Market to market-granola now as per Ficus
2011-04-04 12:20:16 -07:00
Jean-Baptiste Queru
c52d9cd32b
am e9add8d8: (-s ours) am 877e4d6b: am 78d3b6a1: am 868f207a: (-s ours) Switch honeycomb family to tools_r10 - DO NOT MERGE
...
* commit 'e9add8d83bc4b59b224057fff33858a2d6e78bb2':
Switch honeycomb family to tools_r10 - DO NOT MERGE
2011-03-31 09:44:20 -07:00
Jean-Baptiste Queru
e9add8d83b
am 877e4d6b: am 78d3b6a1: am 868f207a: (-s ours) Switch honeycomb family to tools_r10 - DO NOT MERGE
...
* commit '877e4d6bb45e823133710527e39fcfa1b0a445bd':
Switch honeycomb family to tools_r10 - DO NOT MERGE
2011-03-31 09:31:27 -07:00
Jean-Baptiste Queru
877e4d6bb4
am 78d3b6a1: am 868f207a: (-s ours) Switch honeycomb family to tools_r10 - DO NOT MERGE
...
* commit '78d3b6a162cc711f937091a21f569a4a570e9055':
Switch honeycomb family to tools_r10 - DO NOT MERGE
2011-03-31 09:05:15 -07:00
Jean-Baptiste Queru
78d3b6a162
am 868f207a: (-s ours) Switch honeycomb family to tools_r10 - DO NOT MERGE
...
* commit '868f207af2bb5b881020b6271bf79a4aabd1d5a3':
Switch honeycomb family to tools_r10 - DO NOT MERGE
2011-03-31 08:46:12 -07:00
Jean-Baptiste Queru
868f207af2
Switch honeycomb family to tools_r10 - DO NOT MERGE
2011-03-30 15:39:18 -07:00
Ed Heyl
5752f65072
remove special branch for Market, set to default (gingerbread)
2011-03-29 17:36:49 -07:00
Ed Heyl
1b2f17c923
point Market to market-granola now as per Ficus
2011-03-29 17:11:37 -07:00
Neel Parekh
9c3156a5ad
Add guava and jsr dependencies
2011-03-29 11:36:06 -07:00
Anatol Pomazau
0f63fc3e4a
Add PhotoEditor project
2011-03-29 10:58:16 -07:00
Ed Heyl
990a7c0ac1
default branch should by honeycomb-mr1
2011-03-29 09:48:25 -07:00
Ying Wang
830fbaad25
Track honeycomb.
2011-03-28 18:38:56 -07:00
Ed Heyl
64803472e8
set build project to gingerbread
2011-03-28 17:52:42 -07:00
Ed Heyl
07e6269ba5
remove jumper
2011-03-28 17:43:44 -07:00
Ed Heyl
c6f83ea161
libraries needs to be branched/versioned too
2011-03-28 17:11:26 -07:00
Anatol Pomazau
54cac0e89f
Remove elfcopy as it is not used anymore
2011-03-22 17:23:27 -07:00
Ed Heyl
e1ab6faa6e
am f88bfafa: (-s ours) am 4871fcec: am 1cd98983: Finsky project now points to hc-ub-finsky-release branch (please don\'t merge)
...
* commit 'f88bfafa51e6ae76ec41ed5dc640a597291d1fa8':
Finsky project now points to hc-ub-finsky-release branch (please don't merge)
2011-03-21 11:59:36 -07:00
Ed Heyl
f88bfafa51
am 4871fcec: am 1cd98983: Finsky project now points to hc-ub-finsky-release branch (please don\'t merge)
...
* commit '4871fcec90603f9dbf75a433c6c249c1c46b9c1f':
Finsky project now points to hc-ub-finsky-release branch (please don't merge)
2011-03-21 11:57:27 -07:00
Ed Heyl
4871fcec90
am 1cd98983: Finsky project now points to hc-ub-finsky-release branch (please don\'t merge)
...
* commit '1cd989831dea4c00861f09feaadae14e4a276029':
Finsky project now points to hc-ub-finsky-release branch (please don't merge)
2011-03-21 11:54:35 -07:00
Ed Heyl
1cd989831d
Finsky project now points to hc-ub-finsky-release branch (please don't merge)
2011-03-21 11:50:50 -07:00
Ed Heyl
a41c46a0e6
add external/liblzf
2011-03-18 15:34:23 -07:00
Ed Heyl
ac83fa1a37
am 001f43a0: resolved conflicts for merge of 6aead45c to honeycomb-plus-aosp
...
* commit '001f43a04fa8f2b2c9bf9b9020d8af510eedd5b2':
restore qemu and sdk version to open master
honeycomb-LTE branch
2011-03-18 11:27:07 -07:00
Ed Heyl
001f43a04f
resolved conflicts for merge of 6aead45c to honeycomb-plus-aosp
2011-03-18 11:20:54 -07:00
Ed Heyl
6aead45cc2
am 90db3868: restore qemu and sdk version to open master
...
* commit '90db3868f85120e4b23d730f070eb64f1d5210d2':
restore qemu and sdk version to open master
2011-03-18 11:02:09 -07:00
Ed Heyl
90db3868f8
restore qemu and sdk version to open master
2011-03-18 09:32:58 -07:00
Ed Heyl
8b1bfb7a8e
am a31c98b9: (-s ours) am ad13c42e: (-s ours) am 9381f26c: Add Talk2; Talk with VC. (please don\'t merge)
...
* commit 'a31c98b919d3e4cba7c5de8b06ff6b2c471ee205':
Add Talk2; Talk with VC. (please don't merge)
2011-03-17 16:29:38 -07:00
Ed Heyl
a31c98b919
am ad13c42e: (-s ours) am 9381f26c: Add Talk2; Talk with VC. (please don\'t merge)
...
* commit 'ad13c42ee5a57a2f89a5d91d4e04041831002aa1':
Add Talk2; Talk with VC. (please don't merge)
2011-03-17 16:27:15 -07:00
Ed Heyl
ad13c42ee5
am 9381f26c: Add Talk2; Talk with VC. (please don\'t merge)
...
* commit '9381f26cc17a7a40ea2a4ec40ec710e72b8730cf':
Add Talk2; Talk with VC. (please don't merge)
2011-03-17 16:21:00 -07:00
Ed Heyl
3ce5ac2238
add javasqlite
2011-03-17 11:58:07 -07:00
Ed Heyl
9381f26cc1
Add Talk2; Talk with VC. (please don't merge)
2011-03-17 11:13:07 -07:00
Anatol Pomazau
9181ae82e1
Add GDK project
2011-03-14 12:07:16 -07:00
Ed Heyl
65b6fc6f0b
honeycomb-LTE branch
2011-03-13 23:13:53 -07:00
Anatol Pomazau
bcafbc0552
Add device/goldfish
2011-03-11 09:17:14 -08:00
Anatol Pomazau
e803574709
Add GoogleTTS
2011-03-09 09:23:10 -08:00
Jason Chen
d71cf5f4f0
Merge "Add VoicemailOmtp and VoicemailProvider to master"
2011-03-07 19:27:36 -08:00
Jason Chen
905f6b0612
Add VoicemailOmtp and VoicemailProvider to master
2011-03-07 19:24:17 -08:00
Kristian Monsen
386280bf6e
am 3306453b: am e06d2eee: Removing external/curl from the default checkout.
...
* commit '3306453bc95da5a79dd6288339e6eda15a04a2f0':
Removing external/curl from the default checkout.
2011-03-04 11:38:18 -08:00
Kristian Monsen
3306453bc9
am e06d2eee: Removing external/curl from the default checkout.
...
* commit 'e06d2eeec2aa3b39efa0aaf8cb76164418a467b1':
Removing external/curl from the default checkout.
2011-03-04 11:07:44 -08:00
Kristian Monsen
e06d2eeec2
Removing external/curl from the default checkout.
...
Sent a mail to android-eng and it is not being used. If we use it
we have to spend time applying security patches.
Bug raised by the security team:
http://b/issue?id=3341506
2011-03-04 17:39:26 +00:00
Jean-Baptiste Queru
2e6e54e0d5
restore master manifests to their intended glory
2011-03-04 09:32:56 -08:00
The Android Automerger
3ffd61362c
fix branch name
2011-03-04 00:52:29 -08:00
Ed Heyl
56ded9a3bb
am fc2a8a17: include new projects from master
...
* commit 'fc2a8a17b786b5a1dc191e830a66c766159c746c':
set branch name/default revision to honeycomb-mr1
2011-03-03 18:20:16 -08:00
Ed Heyl
fc2a8a17b7
include new projects from master
2011-03-03 17:20:52 -08:00
Jean-Baptiste Queru
c10e8e24c2
am bad24b30: (-s ours) am 106e1e4b: (-s ours) Remove stray white line - do not merge
...
* commit 'bad24b30d41dbe0cd68ea8b418884ba00e8494ef':
Remove stray white line - do not merge
2011-03-03 11:46:24 -08:00
Jean-Baptiste Queru
bad24b30d4
am 106e1e4b: (-s ours) Remove stray white line - do not merge
...
* commit '106e1e4b30d7884663acf3e3541c71b65fbe1ba1':
Remove stray white line - do not merge
2011-03-03 11:42:17 -08:00
Jean-Baptiste Queru
630b911327
am 75e31694: (-s ours) Add tradefed to -plus-aosp branch - do not merge
...
* commit '75e316940419bdb3413b762da6d5e9138bf2d9dc':
Add tradefed to -plus-aosp branch - do not merge
2011-03-03 10:10:20 -08:00
Jean-Baptiste Queru
75e3169404
Add tradefed to -plus-aosp branch - do not merge
2011-03-03 09:55:13 -08:00
Jean-Baptiste Queru
106e1e4b30
Remove stray white line - do not merge
2011-03-03 09:28:45 -08:00
Ed Heyl
af5a94564d
set branch name/default revision to honeycomb-mr1
2011-03-03 00:08:57 -08:00
Jean-Baptiste Queru
e39e7fe9dd
am 353550ce: am 8ffc1f97: Ignore from stage-korg-master
...
* commit '353550ce799905251559c5caf7d2e6fac1a8a5f7': (34 commits)
Remove ndk from master staging area
new webkit-related projects
use the proper staging branch for tradefed
Manifest for stage-korg-master
Manifest to prepare the gingerbread open-source drop
Manifest to stage the gingerbread-related master push
remove HTC stuff from GB open-source
add tradefederation
Un-specialize system/wlan/ti
remove passion from open-source-ish tree
Remove llvm as it is not used in gingerbread
Remove llvm as it is not used in gingerbread
Switch to post-kraken branches
Removing dead code
remove passionc
Add libcore
Add libcore
Removing obsolete Twitter package
Adding Twitter prebuilt project
Use a separate branch for system/wlan/ti
...
2011-03-02 15:33:19 -08:00
Jean-Baptiste Queru
353550ce79
am 8ffc1f97: Ignore from stage-korg-master
...
* commit '8ffc1f97079e6890fe65d6feceefee42e6e868c5': (34 commits)
Remove ndk from master staging area
new webkit-related projects
use the proper staging branch for tradefed
Manifest for stage-korg-master
Manifest to prepare the gingerbread open-source drop
Manifest to stage the gingerbread-related master push
remove HTC stuff from GB open-source
add tradefederation
Un-specialize system/wlan/ti
remove passion from open-source-ish tree
Remove llvm as it is not used in gingerbread
Remove llvm as it is not used in gingerbread
Switch to post-kraken branches
Removing dead code
remove passionc
Add libcore
Add libcore
Removing obsolete Twitter package
Adding Twitter prebuilt project
Use a separate branch for system/wlan/ti
...
2011-03-02 11:38:56 -08:00
Jean-Baptiste Queru
8ffc1f9707
Ignore from stage-korg-master
2011-03-02 07:41:19 -08:00
Jean-Baptiste Queru
cb10b397e3
Remove ndk from master staging area
2011-03-01 13:23:13 -08:00
Marc Blank
6ae30a59c1
Merge "Add Exchange project"
2011-02-25 10:58:35 -08:00
Anatol Pomazau
4033ee2fc5
add BasicSmsReceiver
2011-02-24 11:00:32 -08:00
Anatol Pomazau
61c4d6d8cd
am 0df898b4: Merge commit \'843bc78d\' into ag-honeycomb-plus-aosp
...
* commit '0df898b43457750047ff669d927be0df738eb6a6':
Add unbundled_google/Wallet
2011-02-23 16:28:47 -08:00
Anatol Pomazau
0df898b434
Merge commit '843bc78d' into ag-honeycomb-plus-aosp
...
Conflicts:
default.xml
2011-02-23 16:24:53 -08:00
Anatol Pomazau
843bc78df0
am 3ac97161: Add unbundled_google/Wallet
...
* commit '3ac971610400d0990979980a839e0f738cd8c2d3':
Add unbundled_google/Wallet
2011-02-23 16:10:58 -08:00
Anatol Pomazau
3ac9716104
Add unbundled_google/Wallet
2011-02-23 15:12:14 -08:00
Anatol Pomazau
230f0501ee
am e6e210cb: am 83d076f4: am b49fcfac: Add device/google/accessory/... projects
...
* commit 'e6e210cbb3762573e9361a03c4e4ef7c133b4961':
Add device/google/accessory/... projects
2011-02-22 21:35:35 -08:00
Anatol Pomazau
e3e71fc93a
Make spaces more consistent with psac manifest
2011-02-22 15:04:01 -08:00
Anatol Pomazau
e6e210cbb3
am 83d076f4: am b49fcfac: Add device/google/accessory/... projects
...
* commit '83d076f425a994bf2d95733072c7366e8403bf7a':
Add device/google/accessory/... projects
2011-02-22 14:48:07 -08:00
Anatol Pomazau
81ed57af41
Sort projects alphabetically
2011-02-22 14:39:54 -08:00
Anatol Pomazau
b7140aea4d
Add android mock and javassist
2011-02-22 14:32:19 -08:00
Anatol Pomazau
be42e8bcc3
am e6f68c8a: am 5ad8aa2d: Add device/moto/wingray
...
* commit 'e6f68c8a5db6d5d98c23296813c2c695702633cf':
Add device/moto/wingray
2011-02-18 11:00:30 -08:00
Anatol Pomazau
e6f68c8a5d
am 5ad8aa2d: Add device/moto/wingray
...
* commit '5ad8aa2d777e5f6ebe0c6486786e69f60465c5f9':
Add device/moto/wingray
2011-02-18 10:58:12 -08:00
Anatol Pomazau
5ad8aa2d77
Add device/moto/wingray
2011-02-18 10:55:38 -08:00
Anatol Pomazau
07c90b00dc
Add Exchange project
2011-02-18 09:30:38 -08:00
Anatol Pomazau
83d076f425
am b49fcfac: Add device/google/accessory/... projects
...
* commit 'b49fcfac1826ba818b455afc9fc5ba25723c6049':
Add device/google/accessory/... projects
2011-02-17 20:11:15 -08:00
Anatol Pomazau
b49fcfac18
Add device/google/accessory/... projects
2011-02-17 17:57:03 -08:00
Anatol Pomazau
92e05580d3
am 4c37ac11: am 97f069c6: Merge commit \'25a05776\' into gingerbread-plus-aosp
...
* commit '4c37ac1151affa069f32de797848ae0e71e8c3e1':
Fix crespo4g project path
2011-02-15 22:56:20 -08:00
Anatol Pomazau
4c37ac1151
am 97f069c6: Merge commit \'25a05776\' into gingerbread-plus-aosp
...
* commit '97f069c61a1dfce314aaf60f33c879698a9e0922':
Fix crespo4g project path
2011-02-15 22:54:30 -08:00
Anatol Pomazau
ccc080c71f
am a7de07ee: Fix crespo4g project path
...
* commit 'a7de07ee724feda75aa478f970863c7d63be77ce':
Fix crespo4g project path
2011-02-15 22:54:17 -08:00
Anatol Pomazau
cac5b309e8
Fix path to crespo4g
2011-02-15 21:15:06 -08:00
Anatol Pomazau
a7de07ee72
Fix crespo4g project path
...
Conflicts:
default.xml
2011-02-15 21:09:26 -08:00
Anatol Pomazau
97f069c61a
Merge commit '25a05776' into gingerbread-plus-aosp
...
Conflicts:
default.xml
2011-02-15 21:01:11 -08:00
Anatol Pomazau
d5443be6a0
am 6fbf881b: am b2042360: resolved conflicts for merge of c0b079ab to gingerbread-plus-aosp
...
* commit '6fbf881bac1021e19575fb83fe75f73a2040f646':
Add crespo4g
2011-02-15 20:45:08 -08:00
Anatol Pomazau
6fbf881bac
am b2042360: resolved conflicts for merge of c0b079ab to gingerbread-plus-aosp
...
* commit 'b204236005f6d9daee69691146478e74a05e03b9':
Add crespo4g
2011-02-15 20:42:44 -08:00
Anatol Pomazau
b204236005
resolved conflicts for merge of c0b079ab to gingerbread-plus-aosp
2011-02-15 20:38:08 -08:00
Anatol Pomazau
25a05776ab
Fix crespo4g project path
2011-02-15 18:33:29 -08:00
Anatol Pomazau
c0b079ab8b
Add crespo4g
2011-02-15 17:48:09 -08:00
Anatol Pomazau
45bae0fd0b
Add mesa3d
2011-02-09 17:01:49 -08:00
Anatol Pomazau
fcbcf47e81
am fff0e692: am b829a4ad: Add frameworks/support
...
* commit 'fff0e692d41d22d6b673275cb7ab652fd3ac27cc':
Add frameworks/support
2011-02-07 15:44:34 -08:00
Anatol Pomazau
fff0e692d4
am b829a4ad: Add frameworks/support
...
* commit 'b829a4add3c237b73d4ab0588fccbea5b74176a4':
Add frameworks/support
2011-02-07 15:42:20 -08:00
Anatol Pomazau
b829a4add3
Add frameworks/support
2011-02-07 15:40:24 -08:00
Anatol Pomazau
1369dc2cda
Add valgrind
2011-02-07 13:29:25 -08:00
Jean-Baptiste Queru
25cbc454cf
Add new location for s.a.c source code
2011-02-04 13:14:49 -08:00
Anatol Pomazau
1a3b81ce44
Add markdown project
2011-02-04 11:14:45 -08:00
Anatol Pomazau
089c77cc6b
Add collada and pcre projects
2011-02-03 12:38:06 -08:00
Anatol Pomazau
50ed7d791f
Add external/ping6 project
2011-02-03 11:33:26 -08:00
Anatol Pomazau
9e1d811de1
Add flac project
2011-02-03 11:25:46 -08:00
Anatol Pomazau
e4c8b5f3eb
Revert "Add flac project"
...
This reverts commit b9f7e08d10
2011-02-03 10:04:51 -08:00
Anatol Pomazau
b9f7e08d10
Add flac project
2011-02-03 09:38:36 -08:00
Jean-Baptiste Queru
417d123146
am 7d4cedc5: am 440137f7: am 80dbe3c4: Projects to support panda board
...
* commit '7d4cedc5b179b16cf1a10a492acf16f243786e03':
Projects to support panda board
2011-01-31 18:16:43 -08:00
Jean-Baptiste Queru
b95d7dd66e
am 8c0d3087: am d5f393ad: Projects to support panda board
...
* commit '8c0d308793ce3e9a20b688a258e6ff671ea7b5bb':
Projects to support panda board
2011-01-31 18:16:02 -08:00
Jean-Baptiste Queru
4e0e0b4641
am e6aa1ce6: (-s ours) Projects to support panda board
...
* commit 'e6aa1ce6375de1b58a20820bfb7903c133869d0a':
Projects to support panda board
2011-01-31 18:15:03 -08:00
Jean-Baptiste Queru
7d4cedc5b1
am 440137f7: am 80dbe3c4: Projects to support panda board
...
* commit '440137f7040ab79149469e50d2fc5291408ddf7c':
Projects to support panda board
2011-01-31 18:06:48 -08:00
Jean-Baptiste Queru
440137f704
am 80dbe3c4: Projects to support panda board
...
* commit '80dbe3c4a1b28a5e7ec42fd7dceefaedb62fe638':
Projects to support panda board
2011-01-31 18:04:35 -08:00
Jean-Baptiste Queru
8c0d308793
am d5f393ad: Projects to support panda board
...
* commit 'd5f393add46b57c2d47645f01a100b1b4cf2b21a':
Projects to support panda board
2011-01-31 17:53:52 -08:00
Jean-Baptiste Queru
80dbe3c4a1
Projects to support panda board
2011-01-31 17:46:34 -08:00
Jean-Baptiste Queru
d5f393add4
Projects to support panda board
2011-01-31 17:42:31 -08:00
Jean-Baptiste Queru
e6aa1ce637
Projects to support panda board
2011-01-31 17:37:50 -08:00
Jean-Baptiste Queru
8875719138
am a06b881c: am d7de377a: (-s ours) Add webkit-related projects
...
* commit 'a06b881cc3d236a625992e7408e4a5de3d0258c9':
Add webkit-related projects
2011-01-31 15:02:35 -08:00
Jason Chen
19aa0a5dcb
am f22b3873: am 15f27fc1: am c75343ff: Add Korean IME to the gingerbread manifest
...
* commit 'f22b3873fda47a8fe20493e94bf72b0dc0df8303':
Add Korean IME to the gingerbread manifest
2011-01-31 15:02:21 -08:00
Jean-Baptiste Queru
7c1667142f
am 73863b31: am 7a832bda: Merge branch \'gingerbread-plus-aosp\' of ssh://android-git:29418/platform/manifest into gingerbread-plus-aosp
...
* commit '73863b312b3b1792814d4fdb4ad5449ddc430e5d':
2011-01-31 15:02:18 -08:00
Jason Chen
c98172e25b
am 5c13d0d0: am bc608433: am 75fe4da1: Add Books to the gingerbread manifest
...
* commit '5c13d0d05a141ede2a375e0164179165ca93103f':
2011-01-31 15:02:16 -08:00
Jean-Baptiste Queru
a06b881cc3
am d7de377a: (-s ours) Add webkit-related projects
...
* commit 'd7de377a79cd6acb9fd6f5cf52438f36b279f42d':
Add webkit-related projects
2011-01-31 14:12:36 -08:00
Jason Chen
f22b3873fd
am 15f27fc1: am c75343ff: Add Korean IME to the gingerbread manifest
...
* commit '15f27fc1fda56b7f7462a8bd9eab9c56907bab12':
Add Korean IME to the gingerbread manifest
2011-01-31 14:09:09 -08:00
Jean-Baptiste Queru
73863b312b
am 7a832bda: Merge branch \'gingerbread-plus-aosp\' of ssh://android-git:29418/platform/manifest into gingerbread-plus-aosp
...
* commit '7a832bda6409bae564172fa2e18ce5f97195e0f8':
2011-01-31 14:09:07 -08:00
Jason Chen
5c13d0d05a
am bc608433: am 75fe4da1: Add Books to the gingerbread manifest
...
* commit 'bc60843394af3485b539afaf076f765eaac96c64':
2011-01-31 14:09:05 -08:00
Jean-Baptiste Queru
bff5a823f3
Add webkit-related projects to AOSP importer
2011-01-31 14:06:58 -08:00
Jean-Baptiste Queru
bf85d99e3b
new webkit-related projects
2011-01-31 14:00:14 -08:00
Jean-Baptiste Queru
d7de377a79
Add webkit-related projects
2011-01-31 13:54:26 -08:00
Jason Chen
15f27fc1fd
am c75343ff: Add Korean IME to the gingerbread manifest
...
* commit 'c75343fffbb2b724f0726d21baaabb0bdcd14f2e':
Add Korean IME to the gingerbread manifest
2011-01-30 16:50:59 -08:00
Jean-Baptiste Queru
7a832bda64
Merge branch 'gingerbread-plus-aosp' of ssh://android-git:29418/platform/manifest into gingerbread-plus-aosp
2011-01-30 16:50:58 -08:00
Jason Chen
c75343fffb
Add Korean IME to the gingerbread manifest
2011-01-30 16:27:14 -08:00
Jean-Baptiste Queru
048d955c41
Projects to support panda board
...
Change-Id: Ic67ad28ce19207e58fa8e0738075481a0d3183aa
2011-01-30 05:55:45 -08:00
Dmitry Shmidt
bc0e81a57b
Add wpa_supplicant_8 project
...
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2011-01-25 09:44:46 -08:00
shared_user android-merger-prebuild
1af60c164e
am 5f842b8d: skip merge 2ba60d67
...
* commit '5f842b8db95b5a8db830c12e48f22a724d1300a1':
Add Books to the gingerbread manifest
2011-01-22 08:53:02 -08:00
shared_user android-merger-prebuild
5f842b8db9
skip merge 2ba60d67
2011-01-22 08:45:52 -08:00
shared_user android-merger-prebuild
b48e39aec4
am cddd7625: am 4823aa41: Merge remote branch \'origin/gingerbread\' into default
...
* commit 'cddd7625df22d5a54216326ca1da81ab1bf66a96':
Add Books to the gingerbread manifest
2011-01-21 17:43:59 -08:00
shared_user android-merger-prebuild
cddd7625df
am 4823aa41: Merge remote branch \'origin/gingerbread\' into default
...
* commit '4823aa41aa40605f056b1fa05cdd336fd3d91c61':
Add Books to the gingerbread manifest
2011-01-21 17:41:28 -08:00
Jason Chen
2ba60d67bc
Add Books to the gingerbread manifest
2011-01-20 21:34:47 -08:00
shared_user android-merger-prebuild
4823aa41aa
Merge remote branch 'origin/gingerbread' into default
2011-01-20 21:34:22 -08:00
Jason Chen
bc60843394
am 75fe4da1: Add Books to the gingerbread manifest
...
* commit '75fe4da1ddfb3e588530e0f1c9ec4f2db05d2d5d':
Add Books to the gingerbread manifest
2011-01-20 18:19:26 -08:00
Anatol Pomozov
a62b96975c
Remove duplicated project
2011-01-20 17:55:47 -08:00
Jason Chen
8da94925d5
am 542cf86a: am 4da0b130: Add vendor/silvertree and vendor/trendy
...
* commit '542cf86a2c770286c3320730f5f0168d7fb91555':
Add vendor/silvertree and vendor/trendy
2011-01-20 17:12:30 -08:00
Jason Chen
542cf86a2c
am 4da0b130: Add vendor/silvertree and vendor/trendy
...
* commit '4da0b130d6f06c14b648198c19ad0d83160630ef':
Add vendor/silvertree and vendor/trendy
2011-01-20 17:05:35 -08:00
Jason Chen
75fe4da1dd
Add Books to the gingerbread manifest
2011-01-20 15:01:58 -08:00
Jason Chen
4da0b130d6
Add vendor/silvertree and vendor/trendy
2011-01-20 13:50:01 -08:00
Anatol Pomozov
04a0cd15ad
Add vendor/{trendy,silvertree} projects
2011-01-19 22:08:31 -08:00
Jean-Baptiste Queru
6ff213b06c
am 748b222d: (-s ours) am 0087aa77: Make honeycomb track the open-source SDK - do not merge
...
* commit '748b222d557c608f51e6d54cabad0da9cfb18eb2':
Make honeycomb track the open-source SDK - do not merge
2011-01-19 13:00:26 -08:00
Jean-Baptiste Queru
748b222d55
am 0087aa77: Make honeycomb track the open-source SDK - do not merge
...
* commit '0087aa77214b2733801037c8071e0e2e7e6d6072':
Make honeycomb track the open-source SDK - do not merge
2011-01-19 12:58:57 -08:00
Jean-Baptiste Queru
0087aa7721
Make honeycomb track the open-source SDK - do not merge
...
That way, if we make internal SDK changes for Honeycomb-MR1,
there's no risk of having them in Honeycomb by accident.
Also get rid of a Master-specific file to avoid duplication
and confusion.
2011-01-19 12:47:39 -08:00
Jean-Baptiste Queru
c212fe3e42
am 5403b342: am 179e58da: Remove AccountsAndSync, now in Settings
...
* commit '5403b342dcd21d6728b06ba221dc89f1a0954dd6':
Remove AccountsAndSync, now in Settings
2011-01-19 07:41:16 -08:00
Jean-Baptiste Queru
5403b342dc
am 179e58da: Remove AccountsAndSync, now in Settings
...
* commit '179e58daeefbd54f6fbc35bc079d482aa150eb1b':
Remove AccountsAndSync, now in Settings
2011-01-19 07:38:16 -08:00
Jean-Baptiste Queru
84bc7f5aa4
am 91ef62a9: am 220d03c0: Add video editor
...
* commit '91ef62a90170444e1c744a92828c603f07287475':
Add video editor
2011-01-18 21:54:45 -08:00
Jean-Baptiste Queru
91ef62a901
am 220d03c0: Add video editor
...
* commit '220d03c054ba2d1598ebada52c44f8a3f83616f8':
Add video editor
2011-01-18 15:10:25 -08:00
Jean-Baptiste Queru
179e58daee
Remove AccountsAndSync, now in Settings
2011-01-18 14:36:22 -08:00
Jean-Baptiste Queru
220d03c054
Add video editor
2011-01-18 14:36:08 -08:00
Jesse Wilson
28166cd72e
Merge "Use external/apache-xml instead of libcore/apache-xml"
2011-01-14 16:22:14 -08:00
Anatol Pomozov
b7e3d1c850
am 587154e2: am ac66688b: Add media/libvideoeditor
...
* commit '587154e2fb05609cc43b66e17da28f7b38e3f722':
Add media/libvideoeditor
2011-01-14 16:05:11 -08:00
Anatol Pomozov
587154e2fb
am ac66688b: Add media/libvideoeditor
...
* commit 'ac66688b08c5f36e3f2801e3a23407165bb435fd':
Add media/libvideoeditor
2011-01-14 16:03:25 -08:00
Anatol Pomozov
ac66688b08
Add media/libvideoeditor
2011-01-14 15:59:39 -08:00
Anatol Pomozov
4a67982085
Add media/libvideoeditor
2011-01-14 13:44:45 -08:00
Jesse Wilson
c1221d68ec
Use external/apache-xml instead of libcore/apache-xml
...
http://b/3351604
2011-01-13 17:26:47 -08:00
Anatol Pomozov
1325b419d5
Remove CryptKeeper project
2011-01-12 14:21:10 -08:00
Jean-Baptiste Queru
907a5595b9
am 116688e9: (-s ours) am f8dc51dc: Use the master devtools in honeycomb - DO NOT MERGE
...
* commit '116688e9a609a2f99a0100ac9f102da293556e9a':
Use the master devtools in honeycomb - DO NOT MERGE
2011-01-12 09:32:31 -08:00
Jean-Baptiste Queru
116688e9a6
am f8dc51dc: Use the master devtools in honeycomb - DO NOT MERGE
...
* commit 'f8dc51dc4bf7e6acdb91abf392097d84aa7460f5':
Use the master devtools in honeycomb - DO NOT MERGE
2011-01-12 09:30:59 -08:00
Jean-Baptiste Queru
f8dc51dc4b
Use the master devtools in honeycomb - DO NOT MERGE
2011-01-12 09:11:53 -08:00
Ed Heyl
73ad7ac5f6
yikes! branch name was wrong
2011-01-07 16:03:18 -08:00
Anatol Pomozov
ef5c1f8cb5
am 0dc09fff: Add pixelflinger project to honecomb branch
...
* commit '0dc09fffe072c0e385c7e59a166dba349e9c0d63':
Add pixelflinger project to honecomb branch
2011-01-07 13:56:52 -08:00
Anatol Pomozov
0dc09fffe0
Add pixelflinger project to honecomb branch
2011-01-07 11:07:53 -08:00
Ed Heyl
7f18f19bf3
set branch name
2011-01-06 13:10:54 -08:00
Ed Heyl
7b6586199d
create honeycomb branch
2011-01-04 23:28:54 -08:00
Anatol Pomozov
6ea951edd3
Add external/webp project
2011-01-04 17:10:17 -08:00
Anatol Pomozov
ed2728fe92
Add CryptKeeper project
2011-01-04 16:01:12 -08:00
Jean-Baptiste Queru
393705c590
am 875a0932: (-s ours) fine-tune to better match AOSP
...
* commit '875a0932f89f788c871f859dcb8f0a1d85eda664':
fine-tune to better match AOSP
2010-12-22 12:04:23 -08:00
Jean-Baptiste Queru
b092d9f956
Update readonly-korg-master
2010-12-22 07:41:23 -08:00
Jean-Baptiste Queru
875a0932f8
fine-tune to better match AOSP
2010-12-22 07:17:34 -08:00
Paul Milovanov
025ea4c5fa
Switch Market branch to market-myapps
...
For this weekend HC build, we'd like to go ahead and switch the
version of Market bundled with the system image to market-myapps.
We created the market-myapps branch this week to start work on
the headless version of the market that will not include any of
the browsing, purchasing, billing functionality that's now to be
handled by Finsky.
Testing for this version of Market shows that Finsky- and George-
initiated app purchases and downloads work, and licensing
functionality is preserved.
Bug: 3194829
2010-12-16 14:24:31 -08:00
Jean-Baptiste Queru
e4a3a78748
use the proper staging branch for tradefed
2010-12-09 08:59:38 -08:00
Jean-Baptiste Queru
b79a12bfa3
Manifest for stage-korg-master
2010-11-30 18:18:31 -08:00
Anatol Pomozov
e7f8e087a5
am 8a6e0adb: (-s ours) am 2209165b: am 60d998c4: (-s ours) DO NOT MERGE Revert "Switch to the new locations of CarHome"
...
* commit '8a6e0adb818da99a61b657f1c421693811f12b7b':
DO NOT MERGE Revert "Switch to the new locations of CarHome"
2010-11-24 16:27:07 -08:00
Anatol Pomozov
05b7bc81c8
resolved conflicts for merge of e4b37a98 to master
2010-11-24 16:25:09 -08:00
Anatol Pomozov
0c123e9930
resolved conflicts for merge of 0a3dfc72 to master
2010-11-24 16:18:17 -08:00
Jean-Baptiste Queru
3aeaf96564
am 7e27f875: am f0f53ef8: am 5ccb7858: Switch to the new locations of CarHome
...
* commit '7e27f8758b700b254744dd1fe456b79d7ec2843e':
Switch to the new locations of CarHome
2010-11-24 13:42:13 -08:00
Jean-Baptiste Queru
0c376999f2
ignore from gingerbread-plus-aosp and gingerbread-without-vendor
2010-11-24 13:06:17 -08:00
Jean-Baptiste Queru
91ea6014c9
ignore from gingerbread
2010-11-24 13:05:02 -08:00
Anatol Pomozov
8a6e0adb81
am 2209165b: am 60d998c4: (-s ours) DO NOT MERGE Revert "Switch to the new locations of CarHome"
...
* commit '2209165bddea4395c990a3ec635f77fdd691b641':
DO NOT MERGE Revert "Switch to the new locations of CarHome"
2010-11-24 12:59:02 -08:00
Anatol Pomozov
2209165bdd
am 60d998c4: (-s ours) DO NOT MERGE Revert "Switch to the new locations of CarHome"
...
* commit '60d998c48008f00487d285e63f05522e50bbe42a':
DO NOT MERGE Revert "Switch to the new locations of CarHome"
2010-11-24 12:56:29 -08:00
Anatol Pomozov
60d998c480
DO NOT MERGE Revert "Switch to the new locations of CarHome"
...
This reverts commit 5ccb78586a
2010-11-24 12:53:30 -08:00
Jean-Baptiste Queru
4d1200c851
ignore from gingerbread
2010-11-24 12:51:13 -08:00
Jean-Baptiste Queru
50a8481267
ignore from gingerbread
2010-11-24 12:47:30 -08:00
Anatol Pomozov
e4b37a9891
am 2cb14d09: Switch to the new locations of CarHome
...
* commit '2cb14d09acd6de39408a0b6d7bafba0636633401':
Switch to the new locations of CarHome
2010-11-24 12:45:42 -08:00
Anatol Pomozov
2cb14d09ac
Switch to the new locations of CarHome
...
This reverts commit 6bd852568e
2010-11-24 12:42:47 -08:00
Anatol Pomozov
0a3dfc72ed
am b7285eca: am 6bd85256: Revert "Switch to the new locations of CarHome"
...
* commit 'b7285eca40ee75d953bfcd934ecad419f858223e':
Revert "Switch to the new locations of CarHome"
2010-11-24 12:40:03 -08:00
Anatol Pomozov
b7285eca40
am 6bd85256: Revert "Switch to the new locations of CarHome"
...
* commit '6bd852568ee9d905edb75b126c058dc9238f2d77':
Revert "Switch to the new locations of CarHome"
2010-11-24 12:37:53 -08:00
Anatol Pomozov
6bd852568e
Revert "Switch to the new locations of CarHome"
...
This reverts commit 5ccb78586a
2010-11-24 12:35:33 -08:00
Jean-Baptiste Queru
7e27f8758b
am f0f53ef8: am 5ccb7858: Switch to the new locations of CarHome
...
* commit 'f0f53ef8417c55c3a5b7dad49ce7e2000430de97':
Switch to the new locations of CarHome
2010-11-24 11:57:16 -08:00
Jean-Baptiste Queru
f0f53ef841
am 5ccb7858: Switch to the new locations of CarHome
...
* commit '5ccb78586a3626c9463ffe537dc30d21b50d23b5':
Switch to the new locations of CarHome
2010-11-24 11:54:08 -08:00
Jean-Baptiste Queru
5ccb78586a
Switch to the new locations of CarHome
2010-11-24 11:40:29 -08:00
Anatol Pomozov
ef8f414065
Add widevine project
...
This is proprietary Widevine DRM plugin that is used by Youtube
for Stingray.
2010-11-23 10:50:19 -08:00
Jean-Baptiste Queru
7f00f98c3e
Stop importing framework/policies from AOSP
2010-11-19 10:37:03 -08:00
Ficus Kirkpatrick
00d2e0f362
Point master to market-frootloop.
2010-11-18 13:32:46 -08:00
Jason Chen
513d9cccae
Merge "Add Google Earth to the manifest for master"
2010-11-04 11:24:22 -07:00
Jason Chen
6e0be9c49a
Add Google Earth to the manifest for master
2010-11-04 11:04:03 -07:00
Jean-Baptiste Queru
b2b763aace
Merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-11-02 08:46:14 -07:00
Jean-Baptiste Queru
fc70ff1bca
Merge from gingerbread
2010-11-02 08:43:10 -07:00
Jason Chen
bbaa6e8118
am ff7bdc65: (-s ours) am e564e29d: Add Google Earth project to gingerbread
...
* commit 'ff7bdc6548bbeb728d41aec34c2c117279b27098':
Add Google Earth project to gingerbread
2010-11-01 17:55:56 -07:00
Jason Chen
ff7bdc6548
am e564e29d: Add Google Earth project to gingerbread
...
* commit 'e564e29daf814651f8501141db173864a63c0809':
Add Google Earth project to gingerbread
2010-11-01 17:50:03 -07:00
Jason Chen
e564e29daf
Add Google Earth project to gingerbread
2010-11-01 17:23:20 -07:00
Jean-Baptiste Queru
845a93bb67
Merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-10-29 09:49:49 -07:00
Jean-Baptiste Queru
6e69a3c850
Merge from gingerbread
2010-10-29 09:44:26 -07:00
Joe Onorato
99097eafd8
am 8b5706fa: resolved conflicts for merge of e0054087 to gingerbread-plus-aosp
...
* commit '8b5706fa92d9ea240803d910c91df8e8710000c9':
Add the microbes wallpaper
2010-10-28 16:08:44 -07:00
Joe Onorato
8b5706fa92
resolved conflicts for merge of e0054087 to gingerbread-plus-aosp
2010-10-28 16:05:42 -07:00
Joe Onorato
e005408711
Add the microbes wallpaper
2010-10-28 15:24:41 -07:00
Adam Lesinski
5c60900c09
Added the HoloSpiral wallpaper project path
2010-10-27 16:26:44 -07:00
Jean-Baptiste Queru
cc5daded02
Delete old stage-korg-master.
...
Now lives in plus-aosp-without-vendor branches.
2010-10-27 12:55:42 -07:00
Jean-Baptiste Queru
0393cac2bb
merge from gingerbread-without-vendor
2010-10-27 12:47:46 -07:00
Jean-Baptiste Queru
804417b708
Manifest to prepare the gingerbread open-source drop
2010-10-25 13:19:23 -07:00
Jean-Baptiste Queru
41ad4c8ded
Manifest to stage the gingerbread-related master push
2010-10-25 12:41:14 -07:00
Jean-Baptiste Queru
5899aded6d
am c81951f3: Slurp the gingerbread version of vendor/samsung/crespo
...
Merge commit 'c81951f3e64907ebcba850fe5b3091b9091afd93'
* commit 'c81951f3e64907ebcba850fe5b3091b9091afd93':
Slurp the gingerbread version of vendor/samsung/crespo
2010-10-21 17:13:51 -07:00
Jean-Baptiste Queru
6a78f66471
am 20eb7c89: (-s ours) whitespace cleanup
...
Merge commit '20eb7c89dcce7bc62d5c9dcca9096818c888a06e'
* commit '20eb7c89dcce7bc62d5c9dcca9096818c888a06e':
whitespace cleanup
2010-10-21 17:13:48 -07:00
Jean-Baptiste Queru
bbe434a123
merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-10-21 15:50:55 -07:00
Jean-Baptiste Queru
c81951f3e6
Slurp the gingerbread version of vendor/samsung/crespo
...
That project's special properties prevent it from getting
downmerged, but at the same time we need that project to
stay up-to-date downstream
2010-10-20 14:56:29 -07:00
Jean-Baptiste Queru
20eb7c89dc
whitespace cleanup
2010-10-20 14:40:53 -07:00
Jean-Baptiste Queru
ee1d5f836e
merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-10-20 14:36:38 -07:00
android-build SharedAccount
c767e581a2
Merge commit 'origin/gingerbread-plus-aosp'
2010-10-20 12:56:29 -07:00
android-build SharedAccount
c65f25d7d5
Merge commit 'origin/gingerbread' into default
2010-10-20 12:54:38 -07:00
Jean-Baptiste Queru
8337bcdae4
merge from gingerbread
2010-10-20 10:14:10 -07:00
Jason Chen
83f25fdff3
Remove trailing spaces in vendor/thinkfree entry
2010-10-20 06:38:08 -07:00
Ed Heyl
c0deea6b0d
am 44894cfd: added thinkfree
...
Merge commit '44894cfd990a7912bcc086dd3639f4aa3b55f2c2' into gingerbread-plus-aosp
* commit '44894cfd990a7912bcc086dd3639f4aa3b55f2c2':
added thinkfree
2010-10-20 01:00:41 -07:00
Ed Heyl
44894cfd99
added thinkfree
2010-10-20 00:56:43 -07:00
Jean-Baptiste Queru
eb62096705
remove HTC stuff from GB open-source
2010-10-19 13:55:20 -07:00
Jean-Baptiste Queru
7f9ae3b3c3
add tradefederation
2010-10-18 15:57:50 -07:00
Jean-Baptiste Queru
d1294f28da
Remove opencore from AOSP-imported projects
2010-10-18 09:48:51 -07:00
Jean-Baptiste Queru
1738898b2d
Merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-10-18 09:22:48 -07:00
Jean-Baptiste Queru
1f97086ee8
Merge a82aebd2 and 4581758a from gingerbread-plus-aosp
2010-10-18 09:07:48 -07:00
Jean-Baptiste Queru
523a8a53f8
Un-specialize system/wlan/ti
2010-10-18 08:04:09 -07:00
Jean-Baptiste Queru
4581758a5a
am 326ed714: Delete OpenCORE
...
Merge commit '326ed7147b4d69f5676706a37d6d5466acda799f' into gingerbread-plus-aosp
* commit '326ed7147b4d69f5676706a37d6d5466acda799f':
Delete OpenCORE
2010-10-15 18:40:28 -07:00
Jean-Baptiste Queru
887e2f1fe6
merge from gingerbread
2010-10-15 18:39:39 -07:00
Ed Heyl
a82aebd273
am 9d2792b5: added new Tag app
...
Merge commit '9d2792b53f2ae56f2eed5abb6cc114db60d3d3f6' into gingerbread-plus-aosp
* commit '9d2792b53f2ae56f2eed5abb6cc114db60d3d3f6':
added new Tag app
2010-10-15 18:25:39 -07:00
Sriram Raman
c3f6df4ccc
am 5395b616: (-s ours) am 37977950: switch gb manifest to point to market-elephant (not market-latest)
...
Merge commit '5395b616dd84316eb9fa15bfbf8e996b544605fb'
* commit '5395b616dd84316eb9fa15bfbf8e996b544605fb':
switch gb manifest to point to market-elephant (not market-latest)
2010-10-15 16:48:19 -07:00
Jean-Baptiste Queru
326ed7147b
Delete OpenCORE
...
Bug: 3101573
Change-Id: Ie8ab3396b24e0e24fb1a4d7ea0489ae6fefba811
2010-10-15 16:06:11 -07:00
Ed Heyl
8de425e17c
added new YouTube project
2010-10-15 15:35:59 -07:00
Ed Heyl
9d2792b53f
added new Tag app
2010-10-15 15:32:03 -07:00
Nick Pelly
c4007f7c12
am 6107ade5: am d8d1933f: Adding platform/packages/apps/Nfc to the manifest
...
Merge commit '6107ade5841dac680ca1b1d136d0e507b26b0426'
* commit '6107ade5841dac680ca1b1d136d0e507b26b0426':
Adding platform/packages/apps/Nfc to the manifest
2010-10-15 14:02:03 -07:00
Jean-Baptiste Queru
92c06bd072
remove passion from open-source-ish tree
2010-10-15 13:45:00 -07:00
Sriram Raman
5395b616dd
am 37977950: switch gb manifest to point to market-elephant (not market-latest)
...
Merge commit '379779504d5e7ffbb4c3b1b37f1dfa03b88fd4b8' into gingerbread-plus-aosp
* commit '379779504d5e7ffbb4c3b1b37f1dfa03b88fd4b8':
switch gb manifest to point to market-elephant (not market-latest)
2010-10-14 13:41:56 -07:00
Sriram Raman
4a79293455
switch master from market-latest to market-elephant
2010-10-14 16:15:17 -04:00
Sriram Raman
379779504d
switch gb manifest to point to market-elephant (not market-latest)
2010-10-14 16:04:12 -04:00
Nick Pelly
6107ade584
am d8d1933f: Adding platform/packages/apps/Nfc to the manifest
...
Merge commit 'd8d1933fb32c8c28cc76c79fb7c0c2b93fb1a5fe' into gingerbread-plus-aosp
* commit 'd8d1933fb32c8c28cc76c79fb7c0c2b93fb1a5fe':
Adding platform/packages/apps/Nfc to the manifest
2010-10-14 12:01:19 -07:00
Nick Pelly
d8d1933fb3
Adding platform/packages/apps/Nfc to the manifest
2010-10-14 10:35:48 -07:00
Jean-Baptiste Queru
f89510c3da
am e6e5b502: (-s ours) merge from gingerbread
...
Merge commit 'e6e5b5029741c4ca3703ce6071d05f8ca8cea41a'
* commit 'e6e5b5029741c4ca3703ce6071d05f8ca8cea41a':
Add protobuf.
2010-10-07 08:44:07 -07:00
Jean-Baptiste Queru
5af465e119
merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-10-05 13:24:41 -07:00
Jean-Baptiste Queru
2beaae9918
merge from gingerbread
2010-10-05 13:18:31 -07:00
Jean-Baptiste Queru
e6e5b50297
merge from gingerbread
2010-10-05 11:55:56 -07:00
Jean-Baptiste Queru
c97a54e201
Add protobuf.
...
Will be used for RIL testing.
Bug: 3064326
2010-10-05 11:10:28 -07:00
Omari Stephens
70c11d38a2
Map the HSQLDB external project
2010-09-29 15:09:23 -07:00
Jean-Baptiste Queru
5d48ac11f7
merge from gingerbread-plus-aosp
2010-09-28 06:31:12 -07:00
Jean-Baptiste Queru
2630e00f87
merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-09-27 19:25:22 -07:00
Jean-Baptiste Queru
89f3d037f4
merge from gingerbread
2010-09-27 19:19:51 -07:00
Jean-Baptiste Queru
3f4655b7c2
am 6f85b7d5: Switch to the new locations of CarHome
...
Merge commit '6f85b7d5ee5343f2599bbe2fdda21f865080f5c4' into gingerbread-plus-aosp
* commit '6f85b7d5ee5343f2599bbe2fdda21f865080f5c4':
Switch to the new locations of CarHome
2010-09-27 17:28:22 -07:00
Jean-Baptiste Queru
6f85b7d5ee
Switch to the new locations of CarHome
2010-09-27 17:12:55 -07:00
Jean-Baptiste Queru
e9f71cfe19
merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-09-23 13:38:02 -07:00
Jean-Baptiste Queru
0f525065ee
merge from gingerbread
2010-09-23 13:33:55 -07:00
Anatol Pomazau
2b1e604693
am f362e450: am ce4d622b: Rename nfc/libnxp to libnfc-nxp
...
Merge commit 'f362e450ab565f5a3f0b0b81364f4cd0dc5d0e18'
* commit 'f362e450ab565f5a3f0b0b81364f4cd0dc5d0e18':
Rename nfc/libnxp to libnfc-nxp
2010-09-23 13:25:27 -07:00
Anatol Pomazau
f362e450ab
am ce4d622b: Rename nfc/libnxp to libnfc-nxp
...
Merge commit 'ce4d622bbea2f56e3e0939b275b1a2c9873bd6a4' into gingerbread-plus-aosp
* commit 'ce4d622bbea2f56e3e0939b275b1a2c9873bd6a4':
Rename nfc/libnxp to libnfc-nxp
2010-09-23 13:21:09 -07:00
Anatol Pomazau
ce4d622bbe
Rename nfc/libnxp to libnfc-nxp
2010-09-23 13:10:02 -07:00
Sriram Raman
a90350fae1
am 2d0b6755: (-s ours) am 197d4573: am b66a6ebc: (-s ours) Do not merge add EmailGoogle project to froyo manifest
...
Merge commit '2d0b6755781e35f2439593a440770461db7441c6'
* commit '2d0b6755781e35f2439593a440770461db7441c6':
Do not merge
2010-09-15 19:49:27 -07:00
Jean-Baptiste Queru
fc6a43769f
merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-09-15 19:30:01 -07:00
Jean-Baptiste Queru
d6abb09603
merge from gingerbread
2010-09-15 19:25:14 -07:00
Sriram Raman
2d0b675578
am 197d4573: am b66a6ebc: (-s ours) Do not merge add EmailGoogle project to froyo manifest
...
Merge commit '197d4573b14718787c8603a91ab49ae2723b1b07' into gingerbread-plus-aosp
* commit '197d4573b14718787c8603a91ab49ae2723b1b07':
Do not merge
2010-09-15 17:33:27 -07:00
Sriram Raman
197d4573b1
am b66a6ebc: (-s ours) Do not merge add EmailGoogle project to froyo manifest
...
Merge commit 'b66a6ebcf2161eca6b789dc02cbebc28410da66f' into gingerbread
* commit 'b66a6ebcf2161eca6b789dc02cbebc28410da66f':
Do not merge
2010-09-15 17:24:02 -07:00
Sriram Raman
b66a6ebcf2
Do not merge
...
add EmailGoogle project to froyo manifest
2010-09-15 17:37:05 -04:00
Jean-Baptiste Queru
77d888c679
am 51b966ad: am 3be2139c: delete unused jstun
...
Merge commit '51b966ad42ee7cb93888a97e4446b3470b5ea5e9'
* commit '51b966ad42ee7cb93888a97e4446b3470b5ea5e9':
delete unused jstun
2010-09-15 07:08:27 -07:00
Jean-Baptiste Queru
224a9aef00
merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-09-14 10:02:24 -07:00
Jean-Baptiste Queru
dedf9ae2d3
merge from gingerbread
2010-09-14 09:57:34 -07:00
Jean-Baptiste Queru
51b966ad42
am 3be2139c: delete unused jstun
...
Merge commit '3be2139c78f1b4a48d98ea59187b89c91e938e72' into gingerbread-plus-aosp
* commit '3be2139c78f1b4a48d98ea59187b89c91e938e72':
delete unused jstun
2010-09-14 09:52:12 -07:00
Jean-Baptiste Queru
3be2139c78
delete unused jstun
2010-09-14 09:37:14 -07:00
Anatol Pomazau
704a2a583b
Remove tradefederation as it is developed on unbundled branch
2010-09-13 13:34:37 -07:00
Jean-Baptiste Queru
7e391fdc41
am 5fe0d6b7: am a8b1336c: remove unused apache-axis
...
Merge commit '5fe0d6b7cc4564b2e49f0b4827614b2cb5b90b24'
* commit '5fe0d6b7cc4564b2e49f0b4827614b2cb5b90b24':
remove unused apache-axis
2010-09-13 12:04:13 -07:00
Jean-Baptiste Queru
7c191271d3
am 18f7fe32: am af8ab56e: Remove leptonica and tesseract.
...
Merge commit '18f7fe326794ac25b226f5297fbfd68bf1fb2a5d'
* commit '18f7fe326794ac25b226f5297fbfd68bf1fb2a5d':
Remove leptonica and tesseract.
2010-09-13 12:04:11 -07:00
Jean-Baptiste Queru
990e9cca76
am 9fc18747: am fb780bb7: move compatibility to the vendor side where it belongs
...
Merge commit '9fc1874768ad03b28414f532b7ede1e42015db57'
* commit '9fc1874768ad03b28414f532b7ede1e42015db57':
move compatibility to the vendor side where it belongs
2010-09-13 12:04:07 -07:00
Jean-Baptiste Queru
bec82acc9a
am 75c52f61: am cf6da5e6: remove docs/source.android.com
...
Merge commit '75c52f6142df5766578510f9e9d025b9f0b51946'
* commit '75c52f6142df5766578510f9e9d025b9f0b51946':
remove docs/source.android.com
2010-09-13 12:04:05 -07:00
Jean-Baptiste Queru
5ecbde2cd2
am e4d49274: (-s ours) am a0029ace: remove unused vcard - do not merge
...
Merge commit 'e4d4927409fc8e6403acc2c88f24edd49904cac3'
* commit 'e4d4927409fc8e6403acc2c88f24edd49904cac3':
remove unused vcard - do not merge
2010-09-13 12:04:02 -07:00
Jean-Baptiste Queru
dff3a30a9e
am 39dbfe4f: am 997377b1: remove obsolete projects (policies/alarmclock)
...
Merge commit '39dbfe4fd89ee2e75106752bbf1057632e4306c0'
* commit '39dbfe4fd89ee2e75106752bbf1057632e4306c0':
remove obsolete projects (policies/alarmclock)
2010-09-13 12:03:55 -07:00
Jean-Baptiste Queru
f99aa5fdca
am 36b18568: am 4f98c463: remove kraken from manifest
...
Merge commit '36b1856884e248a6e2b157c921da14e440fdd2d5'
* commit '36b1856884e248a6e2b157c921da14e440fdd2d5':
remove kraken from manifest
2010-09-13 12:03:52 -07:00
Jean-Baptiste Queru
5fe0d6b7cc
am a8b1336c: remove unused apache-axis
...
Merge commit 'a8b1336ce5f22b5489be5d74a7a9f702cd2b1d26' into gingerbread-plus-aosp
* commit 'a8b1336ce5f22b5489be5d74a7a9f702cd2b1d26':
remove unused apache-axis
2010-09-13 11:44:09 -07:00
Jean-Baptiste Queru
18f7fe3267
am af8ab56e: Remove leptonica and tesseract.
...
Merge commit 'af8ab56e54a44aa00f302c8644738a8e1dd20b18' into gingerbread-plus-aosp
* commit 'af8ab56e54a44aa00f302c8644738a8e1dd20b18':
Remove leptonica and tesseract.
2010-09-13 11:44:05 -07:00
Jean-Baptiste Queru
9fc1874768
am fb780bb7: move compatibility to the vendor side where it belongs
...
Merge commit 'fb780bb7c4ce0345695aa1df45b3ab38c0cf004e' into gingerbread-plus-aosp
* commit 'fb780bb7c4ce0345695aa1df45b3ab38c0cf004e':
move compatibility to the vendor side where it belongs
2010-09-13 11:44:02 -07:00
Jean-Baptiste Queru
75c52f6142
am cf6da5e6: remove docs/source.android.com
...
Merge commit 'cf6da5e62d6b507c42023dbe50940f21df52fe79' into gingerbread-plus-aosp
* commit 'cf6da5e62d6b507c42023dbe50940f21df52fe79':
remove docs/source.android.com
2010-09-13 11:43:59 -07:00
Jean-Baptiste Queru
e4d4927409
am a0029ace: remove unused vcard - do not merge
...
Merge commit 'a0029ace607041b101dc163277ec194bcf2f39f2' into gingerbread-plus-aosp
* commit 'a0029ace607041b101dc163277ec194bcf2f39f2':
remove unused vcard - do not merge
2010-09-13 11:43:55 -07:00
Jean-Baptiste Queru
39dbfe4fd8
am 997377b1: remove obsolete projects (policies/alarmclock)
...
Merge commit '997377b10ba6640ef45b54765598953ef7efacfb' into gingerbread-plus-aosp
* commit '997377b10ba6640ef45b54765598953ef7efacfb':
remove obsolete projects (policies/alarmclock)
2010-09-13 11:43:51 -07:00
Jean-Baptiste Queru
36b1856884
am 4f98c463: remove kraken from manifest
...
Merge commit '4f98c46375090e4f8c2551adc861bd8cddc2f235' into gingerbread-plus-aosp
* commit '4f98c46375090e4f8c2551adc861bd8cddc2f235':
remove kraken from manifest
2010-09-13 11:43:44 -07:00
Anatol Pomazau
bb0c9326dd
Rename AndroidAdService to GoogleAdService
2010-09-13 11:28:10 -07:00
Jean-Baptiste Queru
a73435468b
merge from gingerbread-without-vendor
2010-09-13 10:31:51 -07:00
Jean-Baptiste Queru
a0767de607
merge from gingerbread
2010-09-13 10:01:15 -07:00
Jean-Baptiste Queru
a8b1336ce5
remove unused apache-axis
2010-09-12 18:41:21 -07:00
Jean-Baptiste Queru
af8ab56e54
Remove leptonica and tesseract.
...
They're not used anywhere and haven't changed for a year.
2010-09-12 18:26:30 -07:00
Jean-Baptiste Queru
fb780bb7c4
move compatibility to the vendor side where it belongs
2010-09-12 18:12:23 -07:00
Jean-Baptiste Queru
cf6da5e62d
remove docs/source.android.com
2010-09-12 18:04:54 -07:00
Jean-Baptiste Queru
a0029ace60
remove unused vcard - do not merge
2010-09-12 18:03:37 -07:00
Jean-Baptiste Queru
997377b10b
remove obsolete projects (policies/alarmclock)
2010-09-12 18:02:32 -07:00
Jean-Baptiste Queru
4f98c46375
remove kraken from manifest
2010-09-12 18:00:23 -07:00
Jean-Baptiste Queru
518148cd5c
merge from gingerbread-plus-aosp and gingerbread-without-vendor
2010-09-12 09:40:02 -07:00
Jean-Baptiste Queru
52169ffe93
merge from gingerbread
2010-09-12 09:35:21 -07:00
Anatol Pomazau
6de965a2cc
Revert "Remove unused vendor/google_tradefederation"
...
This project is still used in master
This reverts commit 5bea7ac9b7
2010-09-10 17:59:36 -07:00
Anatol Pomazau
9d83f34ec7
am 415446b6: am f0dfd460: am 5bea7ac9: Remove unused vendor/google_tradefederation
...
Merge commit '415446b6afa853c690e8f14afe23c78ff5a5ee36'
* commit '415446b6afa853c690e8f14afe23c78ff5a5ee36':
Remove unused vendor/google_tradefederation
2010-09-10 17:56:44 -07:00
Anatol Pomazau
9bc4fc14eb
am 06e5060b: am fe562225: Adding platform/external/libgsm to the manifest
...
Merge commit '06e5060b07ab2a7ba540e911407e271a0f20b9f0'
* commit '06e5060b07ab2a7ba540e911407e271a0f20b9f0':
Adding platform/external/libgsm to the manifest
2010-09-10 17:56:42 -07:00
Sriram Raman
a41ec77119
am 91ac0359: (-s ours) am a4e2edfc: am bf321762: (-s ours) do not merge revert Market.git to point to froyo version
...
Merge commit '91ac035971312001ec2e2623a80ebc89482c5998'
* commit '91ac035971312001ec2e2623a80ebc89482c5998':
do not merge
2010-09-10 17:56:39 -07:00
Anatol Pomazau
415446b6af
am f0dfd460: am 5bea7ac9: Remove unused vendor/google_tradefederation
...
Merge commit 'f0dfd46083312606ed60a7747d018b4254361c34' into gingerbread-plus-aosp
* commit 'f0dfd46083312606ed60a7747d018b4254361c34':
Remove unused vendor/google_tradefederation
2010-09-10 17:54:38 -07:00
Anatol Pomazau
f0dfd46083
am 5bea7ac9: Remove unused vendor/google_tradefederation
...
Merge commit '5bea7ac9b7bef4a01606cd12b36501993083b13a' into gingerbread
* commit '5bea7ac9b7bef4a01606cd12b36501993083b13a':
Remove unused vendor/google_tradefederation
2010-09-10 17:48:23 -07:00
Anatol Pomazau
5bea7ac9b7
Remove unused vendor/google_tradefederation
2010-09-10 16:34:29 -07:00
Jean-Baptiste Queru
7952303608
merge from gingerbread-plus-aosp and gingerbread-withtout-vendor
2010-09-08 16:00:20 -07:00
Jean-Baptiste Queru
cd7b8805be
merge from gingerbread
2010-09-08 15:54:55 -07:00
Anatol Pomazau
06e5060b07
am fe562225: Adding platform/external/libgsm to the manifest
...
Merge commit 'fe56222508bf05a3f5f0c1593ce7cf5883378e0c' into gingerbread-plus-aosp
* commit 'fe56222508bf05a3f5f0c1593ce7cf5883378e0c':
Adding platform/external/libgsm to the manifest
2010-09-08 14:14:21 -07:00
Sriram Raman
91ac035971
am a4e2edfc: am bf321762: (-s ours) do not merge revert Market.git to point to froyo version
...
Merge commit 'a4e2edfcf13a90ce5336ac72d048a35744d0feca' into gingerbread-plus-aosp
* commit 'a4e2edfcf13a90ce5336ac72d048a35744d0feca':
do not merge
2010-09-08 14:14:18 -07:00
Anatol Pomazau
fe56222508
Adding platform/external/libgsm to the manifest
2010-09-08 12:15:37 -07:00
Anatol Pomazau
f325d6a1ac
am 6ca85929: am f1a6d9cd: Remove llvm as it is not used in gingerbread
...
Merge commit '6ca859293d5afffb458ec1a2b36cb99d4f876279'
* commit '6ca859293d5afffb458ec1a2b36cb99d4f876279':
Remove llvm as it is not used in gingerbread
2010-09-08 11:53:26 -07:00
Anatol Pomazau
96a46b0672
am 958feba2: am 76fc7c04: Adding platform/external/nfc/libnxp to the manifest
...
Merge commit '958feba2b14b5a590c8d61884ae15d9b36920fcf'
* commit '958feba2b14b5a590c8d61884ae15d9b36920fcf':
Adding platform/external/nfc/libnxp to the manifest
2010-09-08 11:53:22 -07:00
Sriram Raman
7c4907359b
am 471d2e3d: am 7adda777: am 80300d20: (-s ours) point Market.git to market-latest
...
Merge commit '471d2e3dcabb16c4f050cbb351571f833d7533b9'
* commit '471d2e3dcabb16c4f050cbb351571f833d7533b9':
point Market.git to market-latest
2010-09-08 11:53:13 -07:00
Anatol Pomazau
762432646c
Merge commit 'dffda127'
2010-09-08 11:49:58 -07:00
Sriram Raman
a4e2edfcf1
am bf321762: (-s ours) do not merge revert Market.git to point to froyo version
...
Merge commit 'bf321762b51c74d0a50b9162d4d3fc5820ee3513' into gingerbread
* commit 'bf321762b51c74d0a50b9162d4d3fc5820ee3513':
do not merge
2010-09-08 11:47:42 -07:00
Anatol Pomazau
6ca859293d
am f1a6d9cd: Remove llvm as it is not used in gingerbread
...
Merge commit 'f1a6d9cd4fadfa3838c643fcd53e81ef9b52b8b1' into gingerbread-plus-aosp
* commit 'f1a6d9cd4fadfa3838c643fcd53e81ef9b52b8b1':
Remove llvm as it is not used in gingerbread
2010-09-08 11:32:41 -07:00
Anatol Pomazau
958feba2b1
am 76fc7c04: Adding platform/external/nfc/libnxp to the manifest
...
Merge commit '76fc7c046f16295446076c9ff1c04d40ff3b3854' into gingerbread-plus-aosp
* commit '76fc7c046f16295446076c9ff1c04d40ff3b3854':
Adding platform/external/nfc/libnxp to the manifest
2010-09-08 11:32:33 -07:00
Sriram Raman
471d2e3dca
am 7adda777: am 80300d20: (-s ours) point Market.git to market-latest
...
Merge commit '7adda777faf83b48faecc5b289ca83b575bdb198' into gingerbread-plus-aosp
* commit '7adda777faf83b48faecc5b289ca83b575bdb198':
point Market.git to market-latest
2010-09-08 11:32:31 -07:00
Jean-Baptiste Queru
d311781cf5
merge from gingerbread-without-vendor and gingerbread-plus-aosp
2010-09-08 10:56:54 -07:00
Jean-Baptiste Queru
c06590af95
merge from gingerbread
2010-09-08 10:30:39 -07:00
Anatol Pomazau
f4528abfb9
Remove llvm as it is not used in gingerbread
2010-09-08 00:09:51 -07:00
Anatol Pomazau
dffda127f8
Remove llvm as it is not used in gingerbread
2010-09-08 00:06:00 -07:00
Anatol Pomazau
bf5a53e2de
Remove llvm as it is not used in gingerbread
2010-09-08 00:03:21 -07:00
Anatol Pomazau
f1a6d9cd4f
Remove llvm as it is not used in gingerbread
2010-09-08 00:01:23 -07:00
Anatol Pomazau
76fc7c046f
Adding platform/external/nfc/libnxp to the manifest
2010-09-07 18:02:19 -07:00
Anatol Pomazau
bc8aa43ded
Break llvm into subprojects
2010-09-07 15:44:22 -07:00
Sriram Raman
bf321762b5
do not merge
...
revert Market.git to point to froyo version
2010-09-03 18:05:58 -04:00
Ficus Kirkpatrick
9d3297938f
Add Finsky project to master manifest.
2010-09-02 14:07:19 -07:00
Sriram Raman
07334c9cf2
am 5e75d015: am 7e92c103: point Market ub project to market-latest on GB
...
Merge commit '5e75d015197857ed62f1775b6a22748c874a84c9'
* commit '5e75d015197857ed62f1775b6a22748c874a84c9':
point Market ub project to market-latest on GB
2010-09-01 16:57:45 -07:00
Sriram Raman
7adda777fa
am 80300d20: (-s ours) point Market.git to market-latest
...
Merge commit '80300d20acbd463d9d88b6e599ef97a2b7d15f3d' into gingerbread
* commit '80300d20acbd463d9d88b6e599ef97a2b7d15f3d':
point Market.git to market-latest
2010-09-01 15:33:13 -07:00
Sriram Raman
5e75d01519
am 7e92c103: point Market ub project to market-latest on GB
...
Merge commit '7e92c103f52d782c7795c67b19dee3a80c96b52e' into gingerbread-plus-aosp
* commit '7e92c103f52d782c7795c67b19dee3a80c96b52e':
point Market ub project to market-latest on GB
2010-09-01 14:52:37 -07:00
Sriram Raman
7e92c103f5
point Market ub project to market-latest on GB
2010-09-01 17:12:05 -04:00
Sriram Raman
21635b1b0a
Point Market ub project to market-latest
2010-09-01 16:55:54 -04:00
Sriram Raman
80300d20ac
point Market.git to market-latest
2010-09-01 13:43:42 -04:00
Anatol Pomazau
d8ef2942db
Remove clearsilver as it is replaced with jsilver now
2010-08-24 18:28:42 -07:00
Jean-Baptiste Queru
4e6bb6a67a
merge from gingerbread-without-vendor and gingerbread-plus-aosp
2010-08-24 14:48:02 -07:00
Jean-Baptiste Queru
3825c94de7
merge from gingerbread
2010-08-23 13:13:44 -07:00
Anatol Pomazau
46eb2a60d6
Merge branch 'gingerbread-plus-aosp'
2010-08-20 18:45:32 -07:00
Anatol Pomazau
a4d4241289
Merge branch 'gingerbread' into gingerbread-plus-aosp
2010-08-20 18:44:28 -07:00
Anatol Pomazau
ec24a48a3d
Prepare manifest.git for automerger.
...
Unify manifests by removing all empty lines/sorting projects in alpabetical order.
2010-08-20 18:42:15 -07:00
Anatol Pomazau
1d7133ff7e
Prepare manifest.git for automerger.
...
Unify manifests by removing all empty lines/sorting projects in alpabetical order.
2010-08-20 18:36:57 -07:00
Anatol Pomazau
1a224bae02
Merge branch 'froyo' into gingerbread
2010-08-20 18:29:11 -07:00
Anatol Pomazau
43ea824f0b
Merge branch 'eclair' into froyo
2010-08-20 18:27:28 -07:00
Anatol Pomazau
0237cc9860
Prepare manifest.git for automerger.
...
Unify manifests by removing all empty lines/sorting projects in alpabetical order.
2010-08-20 15:46:11 -07:00
Anatol Pomazau
d6dae9f501
Prepare manifest.git for automerger.
...
Unify manifests by removing all empty lines/sorting projects in alpabetical order
2010-08-20 15:43:11 -07:00
Anatol Pomazau
46ecf0382e
Prepare manifest.git for automerger.
...
Unify manifests by removing all empty lines/sorting projects in alpabetical order.
2010-08-20 15:21:57 -07:00
Jean-Baptiste Queru
a35f0cea2e
stop importing dream/sapphire, they're now empty
2010-08-19 19:07:03 -07:00
Jean-Baptiste Queru
b333d880d7
merge from gingerbread-without-vendor and gingerbread-plus-aosp
2010-08-17 18:59:39 -07:00
Jean-Baptiste Queru
5aa2897bd8
merge from gingerbread
2010-08-17 18:02:22 -07:00
Anatol Pomazau
bebb24c257
Remove Dream & Sapphire devices from manifest as they are no supported anymore
...
Issue: bug 2927681
modified: default.xml
2010-08-17 16:56:49 -07:00
Anatol Pomazau
cd86362af9
Remove Dream & Sapphire devices from manifest as they are no supported anymore
...
Issue: bug 2927681
modified: default.xml
2010-08-17 16:49:10 -07:00
Anatol Pomazau
273bd3fda2
Remove Dream & Sapphire devices from manifest as they are no supported anymore
...
Issue: bug 2927681
modified: default.xml
2010-08-17 16:26:30 -07:00
Jean-Baptiste Queru
4d77b473c7
merge from gingerbread-without-vendor and gingerbread-plus-aosp
2010-08-17 14:07:03 -07:00
Jean-Baptiste Queru
991b8b02b1
merge from gingerbread
2010-08-17 14:03:17 -07:00
Anatol Pomazau
7be2bcae33
Adding platform/vendor/samsung/crespo to the manifest
2010-08-17 12:10:07 -07:00
Anatol Pomazau
34a9789621
Adding platform/vendor/samsung/crespo to the manifest
2010-08-17 12:10:00 -07:00
Anatol Pomazau
bc7024bd41
Adding platform/vendor/samsung/crespo to the manifest
2010-08-17 12:09:59 -07:00
Anatol Pomazau
39c941af03
Adding device/samsung/crespo to the manifest
2010-08-17 12:04:49 -07:00
Anatol Pomazau
0460fc9fb3
Adding device/samsung/crespo to the manifest
2010-08-17 12:04:47 -07:00
Anatol Pomazau
67b0bb0d13
Adding device/samsung/crespo to the manifest
2010-08-17 12:04:46 -07:00
Jean-Baptiste Queru
4bcfcd780e
merge from gingerbread-plus-aosp
2010-08-17 10:59:43 -07:00
Jean-Baptiste Queru
83faf8506c
add jsilver
2010-08-17 10:56:24 -07:00
Jean-Baptiste Queru
6ac21c54e0
add jsilver in AOSP mirror
2010-08-17 10:30:46 -07:00
Jean-Baptiste Queru
9e5b92ea8a
proper alpha-sorting
2010-08-16 07:31:59 -07:00
Jean-Baptiste Queru
2a26f759f0
merge from gingerbread-without-vendor and gingerbread-plus-aosp
2010-08-13 10:59:28 -07:00
Jean-Baptiste Queru
c611c344f1
merge from gingerbread
2010-08-13 10:49:11 -07:00
Anatol Pomazau
27eeffb89c
Adding platform/vendor/unbundled_google/packages/ChromeBookmarksSyncAdapter to the manifest
2010-08-12 12:48:34 -07:00
Anatol Pomazau
8bc09bdf96
Adding platform/external/jstun to the manifest
2010-08-12 12:31:22 -07:00
Anatol Pomazau
15d4463ec6
Adding platform/external/jstun to the manifest
2010-08-12 12:31:21 -07:00
Jean-Baptiste Queru
829d2781b6
merge from gingerbread-without-vendor and gingerbread-plus-aosp
2010-08-09 10:39:06 -07:00
Jean-Baptiste Queru
a262090e20
merge from gingerbread
2010-08-09 10:29:12 -07:00
Sriram Raman
49e08e9159
follow froyo-ub-music2 instead on jumper, music2 projects
2010-08-05 14:00:59 -04:00
Anatol Pomazau
68bd1ed2dd
Adding platform/vendor/unbundled_google/packages/AdDemos to the manifest
2010-08-04 12:03:39 -07:00
Anatol Pomazau
efca635ba6
Adding platform/vendor/unbundled_google/packages/AndroidAdService to the manifest
2010-08-04 12:02:31 -07:00
Anatol Pomazau
d8db9a7c79
Adding platform/external/jsilver to the manifest
2010-08-04 11:51:58 -07:00
Anatol Pomazau
7f6bd1e5fe
Adding platform/vendor/unbundled_google/packages/MusicGoogle to the manifest
2010-07-30 11:12:49 -07:00
Anatol Pomazau
2cc6663596
Adding platform/vendor/unbundled_google/packages/MusicGoogle to the manifest
2010-07-30 11:11:44 -07:00
Anatol Pomazau
8b738c9982
Adding platform/vendor/unbundled_google/packages/MusicGoogle to the manifest
2010-07-30 11:10:19 -07:00
Ying Wang
4676e48a68
Fix path for MusicGoogle.
...
Change-Id: Ib751e287524120641f056d22a014af6d37ee1f81
2010-07-29 15:51:01 -07:00
Anatol Pomazau
029a8190a2
Adding platform/unbundled_google/packages/MusicGoogle to the manifest
2010-07-29 15:23:31 -07:00
Anatol Pomozov
5535f16ef2
Adding platform/external/doclava to the manifest
2010-07-21 16:50:45 -07:00
Anatol Pomozov
64087f0c57
Adding platform/external/google-diff-match-patch to the manifest
2010-07-21 16:25:36 -07:00
Jean-Baptiste Queru
8ff9479e38
ignore from gingerbread-without-vendor
2010-07-19 14:17:08 -07:00
Jean-Baptiste Queru
1daa47a624
merge from gingerbread
2010-07-19 14:06:10 -07:00
Jean-Baptiste Queru
4680dae912
Use r7 dev tools in gingerbread
2010-07-19 12:59:39 -07:00
Ed Heyl
539d9b3bf3
added jstun
2010-07-14 07:34:23 -07:00
Ed Heyl
470e252998
add device/moto/common
2010-07-07 19:39:29 -07:00
Jean-Baptiste Queru
4e29773ef7
add markers for non-open-source section.
2010-06-30 14:39:15 -07:00
Jean-Baptiste Queru
4f5e86a5e6
merge from gingerbread-without-vendor and gingerbread-plus-aosp
2010-06-30 14:29:43 -07:00
Jean-Baptiste Queru
f934ce8491
merge from gingerbread
2010-06-30 14:02:35 -07:00
Jean-Baptiste Queru
ebbe97db0a
Proper alpha-sorting.
...
Also, markers around non-open-source section
2010-06-30 13:51:24 -07:00
Jean-Baptiste Queru
3d7d0afd30
Add markers for the block of closed-source projects.
...
Remove spurious blank line.
Change-Id: I2e04a4b57f9c4d21d01c794e24e267f3949964dd
2010-06-30 13:45:36 -07:00
Jean-Baptiste Queru
b23a6fd769
merge from gingerbread
2010-06-30 13:24:05 -07:00
Nico Sallembien
f36ebdac3a
Removing platform/vendor/android/z to the manifest
2010-06-29 15:22:03 -07:00
Nico Sallembien
78085522ea
Removing platform/vendor/android/z to the manifest
2010-06-29 15:22:00 -07:00
Nico Sallembien
3d75cac2b7
Removing platform/vendor/android/z to the manifest
2010-06-29 15:21:57 -07:00
Nico Sallembien
221dca9bbd
Removing platform/vendor/unbundled_google/packages/LatinIMEGoogle to the manifest
2010-06-29 15:02:19 -07:00
Nico Sallembien
9f509ff264
Removing platform/vendor/unbundled_google/packages/LatinIMEGoogle to the manifest
2010-06-29 15:02:16 -07:00
Nico Sallembien
e40183f585
Removing platform/vendor/unbundled_google/packages/LatinIMEGoogle to the manifest
2010-06-29 15:02:13 -07:00
Nico Sallembien
9fea9ed389
Removing platform/vendor/semc/z from the manifest
2010-06-29 11:42:14 -07:00
Nico Sallembien
0b1b37e19a
Removing platform/vendor/semc/z to the manifest
2010-06-29 11:41:00 -07:00
Nico Sallembien
cb80261f65
Removing platform/vendor/semc/z to the manifest
2010-06-29 11:40:59 -07:00
Nico Sallembien
c09d5255b4
Adding platform/vendor/semc/z to the manifest
2010-06-29 11:15:59 -07:00
Nico Sallembien
ed76cbe159
Adding platform/vendor/semc/z to the manifest
2010-06-29 11:15:53 -07:00
Nico Sallembien
d8d88f3718
Adding platform/vendor/semc/z to the manifest
2010-06-29 11:15:50 -07:00
The Android Open Source Project
857a9fedd2
Update manifests for master mirror and stage
2010-06-24 15:45:12 -07:00
Jean-Baptiste Queru
417670c9c4
add manifest for mirror of open-source froyo
2010-06-24 10:08:09 -07:00
Nico Sallembien
c7bfb30611
Adding platform/vendor/unbundled_google/packages/Print to the manifest
2010-06-23 15:05:35 -07:00
Nico Sallembien
c6abee1580
Adding platform/vendor/unbundled_google/packages/DeskClockGoogle to the manifest
2010-06-23 11:35:09 -07:00
Nico Sallembien
03d0394776
Adding platform/vendor/unbundled_google/packages/DeskClockGoogle to the manifest
2010-06-23 11:35:01 -07:00
Nico Sallembien
e4560d2b31
Adding platform/vendor/unbundled_google/packages/DeskClockGoogle to the manifest
2010-06-23 11:34:57 -07:00
Nico Sallembien
46e57ff9a7
Adding platform/vendor/unbundled_google/packages/DeskClockGoogle to the manifest
2010-06-23 11:34:50 -07:00
Nico Sallembien
1a21fce069
Adding platform/hardware/qcom/media to the manifest
2010-06-22 15:10:16 -07:00
Nico Sallembien
be63041265
Adding platform/hardware/qcom/media to the manifest
2010-06-22 15:10:14 -07:00
Nico Sallembien
f90e5f15cd
Adding platform/hardware/qcom/media to the manifest
2010-06-22 15:10:12 -07:00
android-build SharedAccount
8a01c1811e
add jumper project to music2
2010-06-22 14:36:30 -07:00
android-build SharedAccount
8218d6bc8a
Follow "froyo" instead of "froyo-release" since the release branch isn't up-to-date with prebuilts.
2010-06-22 11:35:11 -07:00
android-build SharedAccount
5543fd851d
Inital commit - unbundled Music2
2010-06-21 14:16:36 -07:00
Nico Sallembien
affb8b3b8d
Removing proprietary src project for nvidia
2010-06-16 15:42:34 -07:00
Nico Sallembien
b8f700c15f
Adding platform/vendor/nvidia/proprietary_src
2010-06-16 15:08:23 -07:00
Nico Sallembien
8598d3366d
Adding platform/vendor/unbundled_google/libraries to the manifest
2010-06-15 17:44:33 -07:00
Nico Sallembien
e5689796d8
Adding platform/vendor/unbundled_google/libraries to the manifest
2010-06-15 17:44:28 -07:00
Nico Sallembien
4283dff902
Adding platform/vendor/unbundled_google/libraries to the manifest
2010-06-15 17:44:27 -07:00
Nico Sallembien
e81bd27219
Removing libraries duplicate
2010-06-15 17:38:50 -07:00
Nico Sallembien
007aa9e3aa
Adding platform/vendor/unbundled_google/libraries to the manifest
2010-06-15 17:32:34 -07:00
Nico Sallembien
af3ae1ba00
Fixing bad manifest
2010-06-15 17:07:37 -07:00
Nico Sallembien
14b5b1fa35
Fixing bad manifest
2010-06-15 17:05:58 -07:00
Nico Sallembien
d450ad3b3c
Adding platform/frameworks/ex to the manifest
2010-06-15 17:00:35 -07:00
Nico Sallembien
1738aa702c
Adding platform/frameworks/ex to the manifest
2010-06-15 16:59:35 -07:00
Nico Sallembien
c4748adb8f
Adding frameworks/ex and unbundled_google/libraries
2010-06-15 10:52:49 -07:00
Jean-Baptiste Queru
6c7e612b81
merge from gingerbread-without-vendor and gingerbread-plus-aosp
2010-06-11 09:45:53 -07:00
Jean-Baptiste Queru
8cddc43f62
merge from gingerbread
2010-06-11 09:24:18 -07:00
Nico Sallembien
8113bdb3bb
Removing ext4_utils
2010-06-11 09:20:36 -07:00
Ed Heyl
adcca4c4fa
gingerbread name change
2010-06-10 20:34:14 -07:00
Ed Heyl
80a5d5e332
name the gingerbread branch
2010-06-10 20:24:46 -07:00
Nico Sallembien
62cc046a82
Adding ext4_utils
2010-06-10 17:21:40 -07:00
Nico Sallembien
3301be2c04
Adding a batch of unbundled apps
2010-06-10 17:13:16 -07:00
Jean-Baptiste Queru
ac1f0cece6
merge from kraken-without-vendor and kraken-plus-aosp
2010-06-09 12:39:31 -07:00
Jean-Baptiste Queru
c6b9a367de
merge from kraken
2010-06-09 12:37:54 -07:00
Ed Heyl
7fefcc6a83
added frameworks/ex as per joeo
2010-06-08 18:28:09 -07:00
Ed Heyl
5c04d7ab09
added frameworks/ex as per joeo
2010-06-08 18:24:37 -07:00
Ed Heyl
7c8bc4d774
added frameworks/ex as per joeo
2010-06-08 18:22:38 -07:00
Jean-Baptiste Queru
4dc70eabbd
Switch to post-kraken branches
...
Opencore and wlan/TI are special and need a custom branching scheme,
this implements that scheme for kraken
2010-06-07 12:05:32 -07:00
The Android Open Source Project
28217c21f7
Remove bluez from the open-source mirror
...
The version we're using insternally is too far from the
open-source version to be able to merge changes in.
2010-06-07 11:33:54 -07:00
Jean-Baptiste Queru
a924d82245
merge from kraken-without-vendor and kraken-plus-aosp
2010-06-04 14:16:49 -07:00
Jean-Baptiste Queru
c5a3338656
merge from kraken
2010-06-04 14:04:45 -07:00
Nico Sallembien
80471b8490
Adding CloudPrint project
2010-06-04 11:43:56 -07:00
Nico Sallembien
8c6ac1e802
Adding new qcom vendor projects
2010-06-04 11:13:20 -07:00
Nico Sallembien
9303c2635c
Adding new qcom vendor projects
2010-06-04 11:11:00 -07:00
Nico Sallembien
8a80a8a9d0
Adding new qcom vendor projects
2010-06-04 11:07:42 -07:00
Jean-Baptiste Queru
0fc01d65b8
merge from kraken-without-vendor and kraken-plus-aosp
2010-06-03 16:01:20 -07:00
Jean-Baptiste Queru
70504ca698
merge from froyo-plus-aosp-without-vendor and kraken
2010-06-03 15:57:39 -07:00
Jean-Baptiste Queru
4efc37f9ea
merge from froyo-plus-aosp
2010-06-03 15:52:50 -07:00
Nico Sallembien
2b1e69ebcb
Adding frameworks/opt/vcard
2010-06-03 14:34:24 -07:00
Nico Sallembien
b4dc6034be
Adding frameworks/opt/vcard
2010-06-03 14:32:13 -07:00
Nico Sallembien
5b33888746
Adding frameworks/opt/vcard
2010-06-03 14:30:59 -07:00
Nico Sallembien
ee8ee42324
Removing dead code
2010-06-03 13:55:23 -07:00
Nico Sallembien
6bbcf8c194
Removing dead code
2010-06-03 13:54:45 -07:00
Nico Sallembien
4b130b26e0
Removing dead code
2010-06-03 13:54:06 -07:00
Nico Sallembien
e14b9271f2
Removing dead code
2010-06-03 13:52:49 -07:00
Jean-Baptiste Queru
e1fcae2332
merge from kraken-without-vendor and kraken-plus-aosp
2010-06-03 13:50:37 -07:00
Jean-Baptiste Queru
b5e8ba6202
merge from kraken
2010-06-03 13:45:51 -07:00
Nico Sallembien
f3d1c6dccc
Adding bouncycastle
2010-06-03 13:25:55 -07:00
Nico Sallembien
3dbc04dc5f
Adding bouncycastle
2010-06-03 13:24:52 -07:00
Nico Sallembien
fc2c0b59e0
Adding bouncycastle
2010-06-03 13:23:46 -07:00
Jean-Baptiste Queru
facf6c318a
Merge from kraken-plus-aosp and kraken-without-vendor
2010-06-03 08:04:49 -07:00
Jean-Baptiste Queru
2b128846c9
Merge from kraken
2010-06-03 08:00:40 -07:00
Nico Sallembien
e075b30a6d
Adding new stringray projects
2010-06-01 13:30:06 -07:00
Nico Sallembien
491e4bee2c
Adding broadcom vendor repo
2010-05-28 14:43:00 -07:00
Nico Sallembien
fb2242d86d
Adding broadcom vendor repo
2010-05-28 14:42:22 -07:00
Nico Sallembien
c72d88bc95
Adding broadcom vendor repo
2010-05-28 14:41:15 -07:00
Nico Sallembien
7cc9bd2fbc
Adding protobuf
2010-05-27 16:39:15 -07:00
Nico Sallembien
3f69f8670e
Adding hyphenation
2010-05-27 09:57:41 -07:00
Ed Heyl
8c24eefe72
new libvpx project
2010-05-25 11:15:38 -07:00
Ed Heyl
99819948a4
new libvpx project
2010-05-25 11:14:13 -07:00
Ed Heyl
89d5065fc8
new libvpx project
2010-05-25 11:11:59 -07:00
Jean-Baptiste Queru
52ad459d11
merge from kraken-without-vendor
2010-05-14 16:16:34 -07:00
Jean-Baptiste Queru
760038e9c6
merge from froyo-plus-aosp-without-vendor
2010-05-14 16:13:58 -07:00
Jean-Baptiste Queru
9421d89802
merge from froyo-without-vendor
2010-05-14 16:11:08 -07:00
Jean-Baptiste Queru
5dddd98d3b
remove passionc
2010-05-14 16:09:07 -07:00
Nico Sallembien
dcff2819bd
Adding curl library to manifest
2010-05-10 10:44:59 -07:00
Jean-Baptiste Queru
2ecaea04fa
merge from kraken-plus-aosp and kraken-without-vendor
2010-05-03 17:37:21 -07:00
Jean-Baptiste Queru
a07e219080
merge from kraken and froyo-plus-aosp-without-vendor
2010-05-03 17:31:58 -07:00
Jean-Baptiste Queru
d8fa9e6edb
merge from froyo-plus-aosp and froyo-without-vendor
2010-05-03 17:28:36 -07:00
Jean-Baptiste Queru
bc2cdb577a
merge from froyo
2010-05-03 17:25:16 -07:00
Nico Sallembien
40cd73d6a1
Adding device and vendor projects for kraken
2010-05-03 14:35:26 -07:00
Nico Sallembien
59266afa19
Adding device and vendor projects for kraken
2010-05-03 11:48:44 -07:00
Nico Sallembien
e1121497c3
Merge branch 'master' of ssh://android-git:29418/platform/manifest
2010-05-03 11:45:40 -07:00
Nico Sallembien
0d3ea4076c
Adding device and vendor projects for kraken
2010-05-03 11:45:27 -07:00
Jean-Baptiste Queru
9cbcee018c
Add libcore in korg mirror manifest
2010-05-03 11:06:11 -07:00
Nico Sallembien
28e756d84a
Fixing build
2010-05-03 10:40:09 -07:00
Nico Sallembien
8c7af64b6d
Adding Twitter package source code
2010-05-03 09:46:49 -07:00
Jean-Baptiste Queru
fd733597c1
Add libcore
2010-04-30 13:25:59 -07:00
Jean-Baptiste Queru
17dc30b648
Add libcore
2010-04-30 08:55:25 -07:00
Jean-Baptiste Queru
1d6955c759
Add libcore
2010-04-30 08:54:13 -07:00
Jean-Baptiste Queru
924ae1d74d
Add libcore
2010-04-30 08:52:53 -07:00
Jean-Baptiste Queru
d9403fb694
Add libcore
2010-04-30 08:51:43 -07:00
Nico Sallembien
2e84daacd0
Removing obsolete Twitter package
2010-04-29 10:52:08 -07:00
Nico Sallembien
ecb2092914
Removing obsolete Twitter package
2010-04-29 10:51:17 -07:00
Nico Sallembien
5ce53f0574
Removing obsolete Twitter package
2010-04-29 10:50:41 -07:00
Nico Sallembien
7e96c2c9f8
Removing obsolete Twitter package
2010-04-29 10:50:07 -07:00
Nico Sallembien
10a25dfe12
Removing obsolete Twitter package
2010-04-29 10:48:36 -07:00
Nico Sallembien
23bf776fee
Adding Twitter prebuilt project
2010-04-28 21:31:56 -07:00
Nico Sallembien
ff81320ea9
Adding Twitter prebuilt project
2010-04-28 21:25:53 -07:00
Nico Sallembien
ce27dbf58e
Adding Twitter prebuilt project
2010-04-28 17:52:46 -07:00
Nico Sallembien
b165dfd1ed
Adding Twitter prebuilt project
2010-04-28 17:51:22 -07:00
Nico Sallembien
45262ea4e8
Adding Twitter prebuilt project
2010-04-28 17:50:12 -07:00
Nico Sallembien
36e2833915
Adding media
2010-04-26 15:23:28 -07:00
Nico Sallembien
5b65d3bb52
Adding media
2010-04-26 15:22:44 -07:00
Nico Sallembien
f3203acd61
Adding media
2010-04-26 15:21:47 -07:00
Jean-Baptiste Queru
3c08dfa113
merge from kraken-without-vendor
2010-04-23 09:59:16 -07:00
Jean-Baptiste Queru
1be0771594
merge from froyo-plus-aosp-without-vendor
2010-04-23 09:56:38 -07:00
Jean-Baptiste Queru
da2e4012e0
Use a separate branch for system/wlan/ti
...
This way, we can merge our changes into theirs without merging
theirs into ours, whatever that means.
2010-04-23 09:50:23 -07:00
Jean-Baptiste Queru
a15b7c360f
Add system/wlan/ti back (won't be auto-merged to our code)
2010-04-23 09:39:15 -07:00
Jean-Baptiste Queru
0cdd3591d9
Merge "remove system/wlan/ti from the mirror"
2010-04-21 14:56:10 -07:00
Jean-Baptiste Queru
5c05d484e9
remove system/wlan/ti from the mirror
2010-04-21 14:55:45 -07:00
Jean-Baptiste Queru
1ad596bd23
merge from kraken-plus-aosp and kraken-without-vendor
2010-04-21 14:47:58 -07:00
Jean-Baptiste Queru
a16a4bee9b
merge from kraken
2010-04-21 14:45:26 -07:00
Nico Sallembien
3ef0ce24bd
Adding manifest-server tag for smart sync
2010-04-20 15:39:09 -07:00
Nico Sallembien
f937c6fb23
Adding manifest-server tag for smart sync
2010-04-20 15:37:57 -07:00
Nico Sallembien
b107220e44
Adding manifest-server tag for smart sync
2010-04-20 15:34:09 -07:00
Nico Sallembien
2cf5127ce6
Removing obsolete compatibility project
2010-04-20 12:12:45 -07:00
Jean-Baptiste Queru
6793247390
Merge "Don't import AlarmClock any more, it's dead code in kraken"
2010-04-20 11:08:18 -07:00
Jean-Baptiste Queru
fbaa0ff625
Don't import AlarmClock any more, it's dead code in kraken
2010-04-20 11:07:02 -07:00
Nico Sallembien
d7dc4634fc
Adding libxslt
2010-04-20 10:30:59 -07:00
Nico Sallembien
3617202e77
Adding vendor/android/compatibility
2010-04-15 15:50:18 -07:00
Nico Sallembien
c072b9ed1b
Adding libphonenumber
2010-04-14 10:11:14 -07:00
Jean-Baptiste Queru
fb875034c5
remove policies/base from the AOSP mirror
2010-04-13 15:02:14 -07:00
Nico Sallembien
52cc670286
Adding external/harfbuzz
2010-04-12 10:58:52 -07:00
Jean-Baptiste Queru
daab8b900a
Add NDK in mirror
2010-04-09 14:05:45 -07:00
Jean-Baptiste Queru
1d9ac9f0d6
merge from kraken-without-vendor and kraken-plus-aosp
2010-04-07 09:44:54 -07:00
Jean-Baptiste Queru
d3635e2418
merge from froyo-plus-aosp-without-vendor and kraken
2010-04-07 09:43:11 -07:00
Jean-Baptiste Queru
cf6656b5f1
merge from froyo-without-vendor and froyo-plus-aosp
2010-04-07 09:40:50 -07:00
Jean-Baptiste Queru
fe65054d0e
merge from froyo
2010-04-07 09:39:12 -07:00
Nico Sallembien
aafe009e1c
Adding iproute2 and Protips
2010-04-07 09:28:12 -07:00
Nico Sallembien
e6dddd6931
Adding iproute2 and Protips
2010-04-07 09:27:07 -07:00
Nico Sallembien
3b479e0f45
Adding iproute2 and Protips
2010-04-07 09:25:39 -07:00
Nico Sallembien
5705f37bc3
Adding iproute2 and Protips
2010-04-07 09:23:56 -07:00
Nico Sallembien
06fe50bfba
Adding iproute2 and Protips
2010-04-07 09:20:45 -07:00
Jean-Baptiste Queru
bde40b5208
Merge "Remove files that are specific to master" into kraken-plus-aosp
2010-04-05 09:54:22 -07:00
Jean-Baptiste Queru
86b823dfb1
Merge "Remove files that are specific to master" into kraken
2010-04-05 09:54:17 -07:00
Jean-Baptiste Queru
0d8932de7b
Merge "Remove files that are specific to master" into froyo-plus-aosp
2010-04-05 09:54:13 -07:00
Jean-Baptiste Queru
6e799e8057
Remove files that are specific to master
...
Bug: 2548667
2010-04-05 09:33:17 -07:00
Jean-Baptiste Queru
0b0b027fc5
Remove files that are specific to master
...
Bug: 2548667
2010-04-05 09:32:55 -07:00
Jean-Baptiste Queru
2e998f02e9
Remove files that are specific to master
...
Bug: 2548667
2010-04-05 09:31:55 -07:00
Jean-Baptiste Queru
5df8cdc4fc
Remove files that are specific to master
...
Bug: 2548667
2010-04-05 09:28:52 -07:00
Nico Sallembien
533c59ba73
Adding moto/olympus and moto/stingray
2010-04-02 12:37:45 -07:00
Jean-Baptiste Queru
db3f0e5135
merge from kraken-plus-aosp and kraken-without-vendor
2010-04-02 06:22:35 -07:00
Jean-Baptiste Queru
fef102a62b
merge from kraken and froyo-plus-aosp-without-vendor
2010-04-02 06:19:25 -07:00
Jean-Baptiste Queru
424b9266d2
merge from froyo-plus-aosp and froyo-without-vendor
2010-04-02 06:14:36 -07:00
Jean-Baptiste Queru
58cbd8da48
merge from froyo
2010-04-02 06:10:19 -07:00
Ed Heyl
c991acdeaf
added WebdriveMusic
2010-04-01 23:59:38 -07:00
Nico Sallembien
19dc6fa90c
Adding packages/experimental
2010-04-01 15:30:58 -07:00
Nico Sallembien
8758dd4656
Adding packages/experimental
2010-04-01 15:29:42 -07:00
Nico Sallembien
009e9f663b
Adding packages/experimental
2010-04-01 15:27:06 -07:00
Nico Sallembien
b9dc9483c3
Adding packages/experimental
2010-04-01 15:25:48 -07:00
Nico Sallembien
cdbc2b77d6
Adding packages/experimental
2010-04-01 15:23:24 -07:00
Jean-Baptiste Queru
d306c2c754
separate OpenCORE for additional staging
2010-04-01 08:28:18 -07:00
Jean-Baptiste Queru
dea8dcc272
separate OpenCORE for additional staging
2010-04-01 08:13:55 -07:00
Jean-Baptiste Queru
2205447de0
use AOSP OpenCORE
2010-03-31 16:36:53 -07:00
Jean-Baptiste Queru
9fd97218b5
empty merge
2010-03-31 16:33:47 -07:00
Jean-Baptiste Queru
f8d7ad024c
use AOSP OpenCORE
2010-03-31 16:11:35 -07:00
Jean-Baptiste Queru
da94d3324c
better match the external manifest
2010-03-31 13:07:48 -07:00
The Android Open Source Project
1439744fe0
Add manifest for stage-korg-eclair-passion-release
2010-03-30 14:52:01 -07:00
Nico Sallembien
7371c09c20
Remove non-froyo projects from the froyo and froyo-release manifests
2010-03-30 13:56:39 -07:00
Nico Sallembien
5114747f60
Remove non-froyo projects from the froyo and froyo-release manifests
2010-03-30 13:54:03 -07:00
The Android Open Source Project
3f98a30c8d
Manifest for stage-korg-eclair-sholes-release2
2010-03-30 13:13:50 -07:00
Ed Heyl
f392a8096f
set qemu and sdk to specific revision (master)
2010-03-29 15:14:00 -07:00
Ed Heyl
005016297e
set qemu and sdk to specific revision (master)
2010-03-29 14:52:29 -07:00
Ed Heyl
51da3ad6e4
set qemu and sdk to specific revision (master)
2010-03-29 14:51:18 -07:00
Ed Heyl
145e231915
set qemu and sdk to specific revision
2010-03-29 14:49:16 -07:00
Ed Heyl
371868ad95
set qemu and sdk to specific revision
2010-03-29 14:46:32 -07:00
Jean-Baptiste Queru
3f24b8d6f1
merge kraken-without-vendor and kraken-plus-aosp
2010-03-29 14:05:44 -07:00
Jean-Baptiste Queru
d8929177ea
merge froyo-plus-aosp-without-vendor
2010-03-29 14:04:02 -07:00
Jean-Baptiste Queru
958c9fb99e
merge froyo-without-vendor and froyo-plus-aosp
2010-03-29 14:01:47 -07:00
Jean-Baptiste Queru
912035cbed
manifest for kraken-plus-aosp-without-vendor
2010-03-29 13:32:06 -07:00
Jean-Baptiste Queru
734cc51579
manifest for froyo-plus-aosp-without-vendor
2010-03-29 13:28:44 -07:00
Jean-Baptiste Queru
5880b6b854
Merge from kraken and froyo-without-release
2010-03-29 10:07:36 -07:00
Jean-Baptiste Queru
cf9bca2497
Merge from froyo
2010-03-29 10:05:40 -07:00
Nico Sallembien
e6076cb45e
Removing Launcher
2010-03-26 16:04:09 -07:00
Nico Sallembien
7039e4aeab
Removing Launcher
2010-03-26 16:02:07 -07:00
Nico Sallembien
d8a088d0aa
Removing Launcher
2010-03-26 15:52:58 -07:00
Nico Sallembien
2e53b09123
Removing Launcher
2010-03-26 15:51:58 -07:00
Nico Sallembien
08d419a390
Removing Launcher
2010-03-26 15:41:09 -07:00
Jean-Baptiste Queru
6ec04d88cb
Manifest for kraken-without-vendor
...
Merged from froyo-without-vendor
2010-03-26 13:15:00 -07:00
Jean-Baptiste Queru
4b5d3b082f
Manifest for froyo-without-vendor
2010-03-26 12:59:00 -07:00
Ed Heyl
28fdb748ac
kraken-plus-aosp
2010-03-26 01:58:08 -07:00
Ed Heyl
2353a0197a
froyo-plus-aosp
2010-03-26 01:56:53 -07:00
Ed Heyl
83bdcc6bf0
kraken branch is born
2010-03-25 23:39:23 -07:00
Ed Heyl
cd26ad409c
froyo branch
2010-03-25 17:05:59 -07:00
Nico Sallembien
ac03724aae
Moving Twitter
2010-03-25 10:59:14 -07:00
Nico Sallembien
6cec36f7bc
Adding ndk
2010-03-25 10:07:47 -07:00
Nico Sallembien
cd0ef8c6c1
Adding CarHomeGoogle
2010-03-25 08:34:58 -07:00
Jean-Baptiste Queru
2dddfbf3bf
Remove irrelevant projects from the mirror.
...
Those aren't useful any more, as we're not going to accept any change
from them into our master tree.
2010-03-23 12:28:52 -07:00
Ed Heyl
06cd680d61
new projects moved out of vendor google
2010-03-21 23:32:23 -07:00
Ed Heyl
31fa15591b
Move unbundled_google/apps to unbundled_google/packages
2010-03-21 15:25:56 -07:00
Jean-Baptiste Queru
a2d1f07bf3
Update manifest for aosp mirror:
...
-add device/ projects
-remove ImProvider
2010-03-19 14:06:41 -07:00
Nico Sallembien
c6bed1c88e
Switching Goggles back to fix the build
2010-03-19 11:22:46 -07:00
Nico Sallembien
286ebe4c13
Moving Goggles to new directory
2010-03-19 11:02:19 -07:00
Nico Sallembien
dc8d17b78d
Moving Twitter app
2010-03-19 08:47:06 -07:00
Nico Sallembien
53e362df38
Last manifest update before Froyo branching
...
- Add device/htc/dream-sapphire and platform/vendor/htc/dream-sapphire
- Rename GoogleSubscribedFeedProvider to AccountsAndSyncSettings
- Delete platform/packages/apps/Music2
2010-03-16 13:23:00 -07:00
Nico Sallembien
47cd9d14a4
Moving vendor/sample into device/sample
2010-03-12 12:08:08 -08:00
Jean-Baptiste Queru
0a36da61ad
use the real passion device projects
2010-03-12 11:40:17 -08:00
Nico Sallembien
10cc358b1b
Adding device/common project
2010-03-12 11:02:22 -08:00
Nico Sallembien
71c3ec65ec
Better alpha-sorting of the projects in the manifest.
...
This should make JBQ's life easier, by properly separating the open
source projects from the non open sourced ones.
While I was at it, I also sorted the projects alphabetically using
their path, so as to make finding a project easier.
2010-03-11 13:34:16 -08:00
Nico Sallembien
37f6f994c1
Removing empty projects from master
2010-03-10 10:40:04 -08:00
Ed Heyl
8ae95f5ecb
two new projects; nxp and unbundled Music2
2010-03-05 09:59:15 -08:00
Ed Heyl
2dec530667
added SpeechRecorder
2010-03-03 11:44:00 -08:00
Ed Heyl
d751974fc3
added platform/vendor/nvidia/harmony
2010-03-03 10:44:45 -08:00
Nico Sallembien
6896d673ae
Adding Twitter
2010-02-17 16:21:55 -08:00
Nico Sallembien
8ec0a45074
Adding htc device library projects
2010-02-17 13:19:07 -08:00
Nico Sallembien
f43f9cfff8
Adding adobe vendor project
2010-02-17 11:27:30 -08:00
Jean-Baptiste Queru
9cabeadb7b
Don't stage projects that we don't use internally
...
Also delete an unused manifest
2010-02-11 14:09:45 -08:00
Jean-Baptiste Queru
89f26fd8c1
remove from open-source stage the projects we don't use internally
2010-02-11 13:26:14 -08:00
Jean-Baptiste Queru
c523d61e2c
update aosp-related branches
2010-02-11 10:26:37 -08:00
Nico Sallembien
c12c9ecc66
Adding llvm project
2010-02-09 10:57:40 -08:00
Nico Sallembien
e03cc15336
Adding NewsWeather project
2010-02-08 15:44:41 -08:00
Jean-Baptiste Queru
0ca568b4bc
Manifest for eclair-release mirror
2010-02-08 13:27:06 -08:00
Nico Sallembien
68f586a54c
Adding CarHome projects
2010-02-08 13:09:39 -08:00
Nico Sallembien
e828106aeb
Adding tremolo
2010-02-03 15:56:26 -08:00
Nico Sallembien
8990704f30
Adding new projects
2010-02-03 12:07:41 -08:00
Nico Sallembien
fc555fe4ac
Adding easymock 3rd party
2010-02-02 15:13:54 -08:00
Jean-Baptiste Queru
95c9069908
manifest for eclair-sholes-release push (ESD56)
2010-02-02 13:39:16 -08:00
Jean-Baptiste Queru
8233027cf4
manifest for eclair-sholes-release push (ESD20)
2010-01-29 15:39:50 -08:00
Jean-Baptiste Queru
6366015103
manifest for eclair-release staging area
2010-01-29 08:41:56 -08:00
Nico Sallembien
f7d01ab008
Fixing typo in tradefederation project
2010-01-27 08:50:46 -08:00
Nico Sallembien
2b41ea966e
Adding oauth.net project
2010-01-26 17:01:39 -08:00
Nico Sallembien
ae4ab3aec4
Adding tradefederation project
2010-01-22 10:39:01 -08:00
Nico Sallembien
5f97685778
Adding new passion specific open source projects
2010-01-21 14:33:20 -08:00
Nico Sallembien
e1f83b37d9
Adding qcom/gps
2010-01-20 11:32:59 -08:00
Nico Sallembien
47f23b3928
Adding surf7x30
2010-01-19 16:18:00 -08:00
Nico Sallembien
3063cfc5d5
Adding dnsmasq project to manifest
2010-01-19 15:07:04 -08:00
Nico Sallembien
562522c02c
Adding Music2
2010-01-19 13:36:31 -08:00
Nico Sallembien
bfa671c0c4
Adding Goggles project
2010-01-14 13:20:46 -08:00
Nico Sallembien
753b81de77
Adding Goggles project
2010-01-14 13:11:27 -08:00
Nico Sallembien
c2cbb87afb
Adding netd project
2010-01-13 10:48:56 -08:00
Jean-Baptiste Queru
264cbfa9f1
Update eclair staging area with all projects
2010-01-12 15:39:06 -08:00
Jean-Baptiste Queru
542603b918
Manifest for the uncensored version of the 2.1 snapshot
2010-01-12 14:04:31 -08:00
Jean-Baptiste Queru
c9e1328b44
Update mirror manifest
...
Also clean up some whitespace
2010-01-12 12:04:20 -08:00
Jean-Baptiste Queru
b009c8cb95
Update mirror manifest
...
Minor whitespace cleanup
2010-01-12 11:15:45 -08:00
Nico Sallembien
5fe204bc5a
Adding vendor/omron project
2010-01-07 15:01:03 -08:00
Nico Sallembien
1dacd300ab
Adding docs project for source.android.com
2010-01-06 14:22:20 -08:00
Nico Sallembien
cde4f6a9f8
new compatibility repository
2010-01-06 14:10:58 -08:00
Nico Sallembien
6e815cac2d
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/manifest
2009-12-22 13:10:02 -08:00
Nico Sallembien
5063e948e5
New project for stlport
2009-12-22 13:08:18 -08:00
Jean-Baptiste Queru
7799e0ed2a
Add Provision app
2009-12-16 16:03:52 -08:00
Nico Sallembien
9ca25511e9
New passion vendor projects
2009-12-16 14:06:41 -08:00
Nico Sallembien
f2192d2d9b
New passion vendor projects
2009-12-16 13:54:19 -08:00
Nico Sallembien
176f12f5da
Adding a new project to separate the QuickOffice prebuilt
2009-12-16 09:49:39 -08:00
Nico Sallembien
f3e335cb09
Adding guava and jsr305 external dependencies
2009-12-10 16:50:34 -08:00
Nico Sallembien
c692582221
Adding external/caliper to the manifest.
2009-12-08 11:00:13 -08:00
Nico Sallembien
aaa1d4b0a3
Adding system/vold project to the manifest.
2009-12-08 10:48:33 -08:00
android-build SharedAccount
b4d0d49ade
new project: packages/apps/QuickSearchBox
2009-12-01 10:39:27 -08:00
android-build SharedAccount
804979d379
white space change only
2009-11-21 11:45:05 -08:00
android-build SharedAccount
767e4ab1c8
white space change only
2009-11-21 11:44:36 -08:00
android-build SharedAccount
10f58577e5
rename vendor project
2009-11-20 14:07:37 -08:00
android-build SharedAccount
49fd7e4dad
rename vendor project
2009-11-20 14:04:54 -08:00
android-build SharedAccount
c076bfa41d
added new vendor project
2009-11-19 17:00:42 -08:00
android-build SharedAccount
e6e282cd4f
added new vendor project
2009-11-19 16:58:43 -08:00
Android (Google) Code Review
8afa7ac27d
Merge change Ib42340f0 into eclair
...
* changes:
manifest for eclair mirror
2009-11-19 12:18:03 -08:00
Jean-Baptiste Queru
fd4d84cc2f
manifest for eclair mirror
2009-11-19 12:17:39 -08:00
android-build SharedAccount
26c1aba3ce
add sdk project (spun off from development)
2009-11-18 17:57:05 -08:00
android-build SharedAccount
92d097e6ac
add sdk project (spun off from development)
2009-11-18 17:21:15 -08:00
Jean-Baptiste Queru
cef700a5df
manifest for master staging area
2009-11-15 12:11:01 -08:00
Android (Google) Code Review
fb47d10baf
Merge change I49c4cdfc
...
* changes:
manifest for post-eclair AOSP master
2009-11-15 10:52:42 -08:00
Jean-Baptiste Queru
49c4cdfc7f
manifest for post-eclair AOSP master
2009-11-15 08:38:16 -08:00
Jean-Baptiste Queru
a1e6771301
remove projects that aren't in eclair
2009-11-15 07:58:59 -08:00
Jean-Baptiste Queru
a84e2cde9e
remove dosfstools
2009-11-13 15:03:24 -08:00
Jean-Baptiste Queru
0e2f8f48d6
remove ImProvider, prepare manifest for snapshot branch
2009-11-13 10:33:49 -08:00
Jean-Baptiste Queru
5ca57a8b3c
remove ImProvider
2009-11-13 09:49:20 -08:00
Jean-Baptiste Queru
c5f058e3dd
manifest for the snapshot-based eclair code drop
2009-11-12 18:24:29 -08:00
Jean-Baptiste Queru
6376c49cd9
Remove tesseract
2009-11-12 18:14:38 -08:00
Jean-Baptiste Queru
dc6af323f7
remove Provision app
2009-11-12 15:12:05 -08:00
Jean-Baptiste Queru
47f2c1f6cb
staging area for eclair drop
2009-11-12 14:56:28 -08:00
Jean-Baptiste Queru
fbfa293fb3
Manifest for the staging branch for eclair code drop
2009-11-11 09:04:19 -08:00
Jean-Baptiste Queru
d784d81f42
Manifest for eclair open-sourcing process
2009-11-10 18:43:12 -08:00
android-build SharedAccount
cf4b6fb720
Merge branch 'eclair-mr2-plus-aosp'
2009-11-10 00:09:16 -08:00
android-build SharedAccount
4dd16e22ed
Merge branch 'eclair-mr2' into eclair-mr2-plus-aosp
2009-11-10 00:07:41 -08:00
android-build SharedAccount
feafb7c574
Merge branch 'eclair' into eclair-mr2
2009-11-10 00:06:01 -08:00
android-build SharedAccount
98a2f91c6c
added new project: MagicSmoke
2009-11-09 23:51:19 -08:00
Jean-Baptiste Queru
655fb6c376
merge from eclair-mr2-plus-aosp
2009-11-02 10:27:52 -08:00
Jean-Baptiste Queru
61f1f40cd2
merge from eclair-mr2
2009-11-02 10:06:52 -08:00
Jean-Baptiste Queru
ca152dec4a
Merge from eclair
...
(no-op re-ordering)
2009-11-02 09:01:49 -08:00
Jean-Baptiste Queru
0451f79e40
proper manifest sorting
2009-10-30 16:14:58 -07:00
Jean-Baptiste Queru
205f3f3278
Merge from donut, to have everything alpha-sorted
2009-10-30 15:22:47 -07:00
Jean-Baptiste Queru
364b2d2f0e
clean up whitespace
2009-10-30 15:07:52 -07:00
Jean-Baptiste Queru
9dd71c5cb8
merge from eclair-mr2
2009-10-28 15:48:50 -07:00
android-build SharedAccount
d4abd12e29
added external/v8
2009-10-28 15:41:52 -07:00
android-build SharedAccount
f0d5ba714f
added external/v8 project
2009-10-28 14:56:45 -07:00
android-build SharedAccount
84f9f2228b
new projects: external/v8 and external/apache-axis
2009-10-28 14:52:32 -07:00
Jean-Baptiste Queru
630f9f3dfb
Revert "Transition manifest to deal with internal and external tree layouts"
...
This reverts commit 49f35ed16b
2009-10-16 15:17:28 -07:00
Jean-Baptiste Queru
49f35ed16b
Transition manifest to deal with internal and external tree layouts
2009-10-16 14:54:28 -07:00
android-build SharedAccount
54d974d055
added DeskClock
2009-10-16 10:13:15 -07:00
android-build SharedAccount
67ba21fc20
added DeskClock
2009-10-16 10:11:09 -07:00
android-build SharedAccount
3b6b8378c8
added DeskClock
2009-10-16 10:05:55 -07:00
android-build SharedAccount
fd3a083564
added DeskClock
2009-10-16 10:04:48 -07:00
Jean-Baptiste Queru
cdc578e0e9
merge from eclair-mr2-plus-aosp
2009-10-16 08:35:35 -07:00
Jean-Baptiste Queru
1e63b8479b
merge from eclair-mr2
2009-10-16 08:25:34 -07:00
Jean-Baptiste Queru
b5edd620e4
Proper alpha-sorting
2009-10-16 08:11:35 -07:00
Jean-Baptiste Queru
1afa84625c
Proper alpha-sorting
2009-10-16 07:51:23 -07:00
android-build SharedAccount
32caf72d68
another new project
2009-10-15 17:30:35 -07:00
android-build SharedAccount
1ada3a0e7a
another new project
2009-10-15 17:30:35 -07:00
android-build SharedAccount
2c93ea2b61
another new project
2009-10-15 17:30:33 -07:00
android-build SharedAccount
f9e3e0e04d
another new project
2009-10-15 17:29:19 -07:00
android-build SharedAccount
67c1d0e7ed
new project
2009-10-15 13:29:41 -07:00
android-build SharedAccount
d54b220cde
new project
2009-10-15 13:29:41 -07:00
android-build SharedAccount
d608ed8033
new project
2009-10-15 13:29:40 -07:00
android-build SharedAccount
57aa64c8e6
new project
2009-10-15 13:24:44 -07:00
android-build SharedAccount
7bf8802f6a
added Gallery and Gallery3D
2009-10-14 11:58:05 -07:00
android-build SharedAccount
3446c7837b
added Gallery and Gallery3D
2009-10-14 11:57:53 -07:00
android-build SharedAccount
ed6667fb09
added Gallery and Gallery3D
2009-10-14 11:57:40 -07:00
android-build SharedAccount
7ec75b92ad
added Gallery and Gallery3D
2009-10-14 11:53:38 -07:00
Jean-Baptiste Queru
4e90db76da
Update to match the external manifest
2009-10-13 16:47:59 -07:00
Jean-Baptiste Queru
5672cf1d5d
Add kernel-headers as a separate project
2009-10-13 15:00:54 -07:00
Jean-Baptiste Queru
01bc9b9e48
Add kernel-headers as a separate project
2009-10-13 14:57:59 -07:00
Jean-Baptiste Queru
5379b3f3c1
Add kernel-headers as a separate project
2009-10-13 14:12:43 -07:00
Jean-Baptiste Queru
ddd27abb96
Add kernel-headers as a separate project
2009-10-13 13:01:15 -07:00
Jean-Baptiste Queru
869bbdd9fd
Update mirror from state of open-source tree
2009-10-13 11:51:28 -07:00
android-build SharedAccount
30ed48ebc9
set branch name
2009-10-02 09:33:11 -07:00
android-build SharedAccount
6a687e0f0d
add xmlwriter project
2009-10-02 08:52:33 -07:00
android-build SharedAccount
f786bb840a
fix branch name
2009-10-01 16:48:32 -07:00
mike ritter
c12ca0b9a6
adding xmlwriter project
2009-09-30 17:54:26 -07:00
mike ritter
a4e6eddb9a
adding xmlwriter project
2009-09-30 17:50:50 -07:00
android-build SharedAccount
f00c73279c
new project: external/xmlwriter
2009-09-22 09:29:28 -07:00
android-build SharedAccount
07ff668472
added external/leptonica
2009-09-18 18:00:44 -07:00
android-build SharedAccount
c46e1d4bc5
added packages/apps/CertInstaller
2009-09-14 08:35:27 -07:00
android-build SharedAccount
68fd45084a
added packages/apps/CertInstaller
2009-09-14 08:35:14 -07:00
Android (Google) Code Review
175b807a07
Merge change 24757 into eclair
...
* changes:
Tweak eclair staging manifest
2009-09-11 17:11:04 -04:00
Jean-Baptiste Queru
47b7587854
Tweak eclair staging manifest
...
Use a common subset of external donut and internal eclair to
be able to compute diffs between them
2009-09-11 14:05:09 -07:00
Jean-Baptiste Queru
8609ae016e
Delete useless manifests for the eclair pseudo-mirror
2009-09-11 13:25:10 -07:00
android-build SharedAccount
fd12b51b1b
added packages/apps/CertInstaller
2009-09-09 09:49:06 -07:00
android-build SharedAccount
cc01320352
new project: platform/external/proguard.git
2009-08-31 09:46:56 -07:00
android-build SharedAccount
55fb530985
new project: platform/external/proguard.git
2009-08-31 09:45:54 -07:00
android-build SharedAccount
f3d8636db4
new project: platform/external/proguard.git
2009-08-31 09:32:54 -07:00
android-build SharedAccount
5888623fc7
reconcile difference between eclair and eclair-release manifests.
2009-08-21 14:09:00 -07:00
android-build SharedAccount
12263a782c
added new project: platform/external/wpa_supplicant_6
2009-08-21 11:13:59 -07:00
Jean-Baptiste Queru
5d568fb74c
Remove spurious whitespace
2009-08-20 10:47:41 -07:00
Jean-Baptiste Queru
b2c12d3ef4
Remove spurious whitespace
2009-08-19 14:41:25 -07:00
Jean-Baptiste Queru
83a9499c44
Manifest for eclair mirror + proprietary files
2009-08-19 14:04:58 -07:00
Jean-Baptiste Queru
f14e3ad56a
Manifest for pseudo-mirror of eclair
2009-08-19 12:03:16 -07:00
Jean-Baptiste Queru
5c8441fccd
Manifest to stage an eclair push
...
Also remove outdated manifests.
2009-08-18 10:21:37 -07:00
Jean-Baptiste Queru
10b038a749
Add manifest for donut-release staging area
2009-08-17 13:30:48 -07:00
android-build
27ffa37b62
update branch name
2009-08-12 23:48:23 -07:00
android-build SharedAccount
4c074316a5
new project
2009-08-12 09:23:23 -07:00
android-build SharedAccount
c7b90c4d91
new project
2009-08-12 09:22:57 -07:00
Jean-Baptiste Queru
8e4ab9bdc5
update mirrors with tesseract
2009-08-07 09:38:25 -07:00
Jean-Baptiste Queru
31523cd680
Update staging manifest to match current open-source tree
2009-08-06 09:22:13 -07:00
Jean-Baptiste Queru
4a4380c667
update mirror manifest
2009-08-04 10:30:32 -07:00
Jean-Baptiste Queru
371e6823f6
update mirror manifest
2009-08-04 10:25:25 -07:00
Jean-Baptiste Queru
ea4f55586c
Update mirror manifest
2009-08-04 07:58:01 -07:00
Jean-Baptiste Queru
e378defcb6
Update mirror manifest
2009-08-04 07:56:04 -07:00
Jean-Baptiste Queru
ba67dc0369
Stage svox
2009-07-31 17:32:41 -07:00
Jean-Baptiste Queru
f3910fae9a
stage additional projects for DRC31 push
2009-07-31 14:01:35 -07:00
Jean-Baptiste Queru
e23f470233
Add launcher2, tesseract
2009-07-30 14:00:47 -07:00
Jean-Baptiste Queru
a9858f0b51
Add vendor/sample to the master staging area
2009-07-28 13:56:17 -07:00
Jean-Baptiste Queru
83c275c87f
Add dream-open to the donut staging area
2009-07-28 13:50:19 -07:00
Jean-Baptiste Queru
4940c99eac
Add vendor/sample for next donut push
2009-07-28 13:44:20 -07:00
Jean-Baptiste Queru
2e57517468
Add msm7k to donut staging area
2009-07-28 10:04:13 -07:00
Jean-Baptiste Queru
7f304cfa85
Remove obsolete manifest
2009-07-28 09:53:51 -07:00
Jean-Baptiste Queru
fc91f92033
Add msm7k to drc22 staged stuff
2009-07-28 09:32:16 -07:00
Android Git Automerger
74f1cba24a
new vendor project
2009-07-28 09:17:09 -07:00
Android Git Automerger
06271b1241
new vendor project
2009-07-28 09:16:39 -07:00
Jean-Baptiste Queru
734ac7b8c9
Mirror the latest master after donut merge
2009-07-26 21:43:16 -07:00
Jean-Baptiste Queru
78ae93875a
add projects recently added to donut
2009-07-25 15:03:26 -07:00
Jean-Baptiste Queru
cfd7fb49ea
Reflect state of open-source tree
2009-07-25 14:30:45 -07:00
Jean-Baptiste Queru
6b897fdc24
Staging area for master pushes, currently based on the state of donut
2009-07-24 15:08:43 -07:00
Jean-Baptiste Queru
9a9a69ccc6
Manifest for open-source mirror + proprietary files
2009-07-23 16:56:44 -07:00
Jean-Baptiste Queru
1aed898fe8
Add dream-related projects to match outside changes
2009-07-23 16:52:17 -07:00
Jean-Baptiste Queru
b8770824c9
Manifest for open-source mirror + proprietary files
2009-07-23 16:42:42 -07:00
Jean-Baptiste Queru
c5c6aba22c
Add dream-related projects to match outside changes
2009-07-23 16:35:16 -07:00
Jean-Baptiste Queru
e62d111ba0
Add stageahead manifest
2009-07-22 14:34:28 -07:00
Jean-Baptiste Queru
e4d2811c5d
Use the same ordering as in master, for easier comparisons
2009-07-22 05:30:12 -07:00
Jean-Baptiste Queru
055226bda5
whitespace cleanup, alphabetical sorting
2009-07-21 16:40:02 -07:00
Jean-Baptiste Queru
f0059ab9e2
Add PinyinIME to match (fixed) external manifest
2009-07-21 15:17:57 -07:00
Android (Google) Code Review
9e02529077
Merge change 7333
...
* changes:
added platform/hardware/broadcom/wlan
2009-07-14 17:16:56 -07:00
Jean-Baptiste Queru
6b12921ab2
Mirror the kernel.org master manifest
2009-07-13 17:26:16 -07:00
Ed Heyl
e68ccdbd0e
added platform/hardware/broadcom/wlan
2009-07-13 15:29:34 -07:00
Jean-Baptiste Queru
8b30be90e0
Add junit
2009-07-13 13:28:17 -07:00
Android (Google) Code Review
bf9486d789
Merge change 6870 into donut
...
* changes:
Add manifest for the donut staging area
2009-07-13 10:26:56 -07:00
Jean-Baptiste Queru
27077d25b2
Add manifest for the donut staging area
2009-07-10 18:02:23 -07:00
Jean-Baptiste Queru
a4c7080f2b
Add clone of the open-source manifest
2009-07-10 16:53:52 -07:00
Jean-Baptiste Queru
ea86f2138e
Remove whitespace to match open-source manifest
2009-07-10 16:50:50 -07:00
The Android Open Source Project
361f00fffc
added packages/apps/Bluetooth
2009-07-10 16:45:42 -07:00
The Android Open Source Project
193db5641d
added packages/apps/Bluetooth
2009-07-10 16:45:11 -07:00
The Android Open Source Project
27f347da46
new project
2009-07-09 21:55:47 -07:00
The Android Open Source Project
ea3fef0226
new project
2009-07-09 21:55:26 -07:00
The Android Open Source Project
6bba9f5e7e
new project
2009-07-09 21:51:43 -07:00
The Android Open Source Project
211973eee7
added packages/providers/ManagementProvider and packages/services/LockAndWipe
2009-07-01 10:01:29 -07:00
The Android Open Source Project
48a1b77d9c
added packages/providers/ManagementProvider and packages/services/LockAndWipe
2009-07-01 10:01:29 -07:00
The Android Open Source Project
9146fdd32e
added packages/providers/ManagementProvider and packages/services/LockAndWipe
2009-07-01 09:58:44 -07:00
The Android Open Source Project
9910c0163d
added external/fsck_msdos
2009-06-25 00:44:01 -07:00
The Android Open Source Project
096257a8d2
added external/fsck_msdos
2009-06-25 00:44:01 -07:00
The Android Open Source Project
f48d3983e8
added external/fsck_msdos
2009-06-25 00:39:11 -07:00
The Android Open Source Project
4990c871fe
added new vendor project
2009-06-22 16:17:40 -07:00
The Android Open Source Project
56ff4a7de6
added new vendor project
2009-06-22 16:17:21 -07:00
The Android Open Source Project
07fc117078
added 2 new vendor projects
2009-06-19 15:10:08 -07:00
The Android Open Source Project
de458c8291
added 2 new vendor projects
2009-06-19 15:09:33 -07:00
The Android Open Source Project
f552c07093
added 4 new projects
2009-06-17 11:09:12 -07:00
The Android Open Source Project
d87eb2df74
added 4 new projects
2009-06-17 11:08:51 -07:00
The Android Open Source Project
bf7302a082
added 4 new projects
2009-06-17 11:06:04 -07:00
The Android Open Source Project
6100040171
added openvpn
2009-06-11 14:37:34 -07:00
The Android Open Source Project
f594f29aa7
added openvpn
2009-06-11 14:37:32 -07:00
The Android Open Source Project
a76316adcd
added openvpn
2009-06-11 14:36:58 -07:00
The Android Open Source Project
1a730a3bd8
moved several exteral projects
2009-06-09 21:51:31 -07:00
The Android Open Source Project
980861e2ec
moved several exteral projects
2009-06-09 21:50:40 -07:00
The Android Open Source Project
268d975318
new project packages/apps/GlobalSearch
2009-06-05 12:32:02 -07:00
The Android Open Source Project
f47231a8b6
new project packages/apps/GlobalSearch
2009-06-05 12:32:02 -07:00
The Android Open Source Project
9363b72ff0
new project packages/apps/GlobalSearch
2009-06-05 12:31:29 -07:00
The Android Open Source Project
d064727f86
new project services/EasService
2009-06-04 17:59:26 -07:00
The Android Open Source Project
a1ac51d3fe
new project services/EasService
2009-06-04 17:58:58 -07:00
The Android Open Source Project
cff56cced8
new project: external/blktrace
2009-06-03 14:01:59 -07:00
The Android Open Source Project
3aee7265a9
new project: external/blktrace
2009-06-03 14:01:59 -07:00
The Android Open Source Project
c4388d884d
new project: external/blktrace
2009-06-03 13:59:14 -07:00
The Android Open Source Project
82250a76a4
add new vendor project
...
Signed-off-by: The Android Open Source Project <initial-contribution@android.com >
2009-06-02 17:52:34 -07:00
The Android Open Source Project
ca5e24ebfd
add new vendor project
2009-06-02 17:52:07 -07:00
The Android Open Source Project
5afb4324d7
add external/ipsec-tools
2009-06-01 11:01:46 -07:00
The Android Open Source Project
0be0e9f95f
add external/ipsec-tools
2009-06-01 11:01:26 -07:00
The Android Open Source Project
482937ef73
add external/ipsec-tools
2009-06-01 11:00:54 -07:00
The Android Open Source Project
7c767bd41a
add external/svox
2009-05-29 10:12:39 -07:00
The Android Open Source Project
6d27a54c8c
add external/svox
2009-05-29 10:12:19 -07:00
The Android Open Source Project
c01a7d26e1
add external/svox
2009-05-29 10:11:18 -07:00
The Android Open Source Project
97b1f32fc8
add new project
2009-05-27 10:23:20 -07:00
The Android Open Source Project
024768037e
add new project
2009-05-27 10:22:46 -07:00
The Android Open Source Project
394ad61f95
add new project
2009-05-27 10:22:17 -07:00
The Android Open Source Project
9d863ff661
new projects
2009-05-22 13:22:41 -07:00
The Android Open Source Project
ed135dee6e
added new project
2009-05-22 08:56:39 -07:00
The Android Open Source Project
b025859bea
new project
2009-05-20 17:19:02 -07:00
The Android Open Source Project
c122554862
new project
2009-05-20 17:16:57 -07:00
The Android Open Source Project
db24681e02
new project
2009-05-20 16:53:51 -07:00
The Android Open Source Project
c957652ad6
add new packages, fix branch name
2009-05-15 15:25:20 -07:00
The Android Open Source Project
027912f442
new projects
2009-05-12 18:22:38 -07:00
The Android Open Source Project
599516e283
new projects
2009-05-12 18:20:22 -07:00
The Android Open Source Project
8dbb7363cc
added new project
2009-05-07 17:09:15 -07:00
The Android Open Source Project
18b8c94059
added new project
2009-05-07 17:08:54 -07:00
The Android Open Source Project
6de919ea42
added mtpd
2009-05-07 16:37:42 -07:00
The Android Open Source Project
8f5d5a6f1a
added mtpd
2009-05-07 16:37:19 -07:00
The Android Open Source Project
78ef62eb33
new projects
2009-05-01 14:41:50 -07:00
The Android Open Source Project
8c6d287e29
new projects
2009-05-01 14:37:48 -07:00
The Android Open Source Project
95c1f32267
new proj
2009-04-28 17:10:32 -07:00
The Android Open Source Project
ccffc17916
new proj
2009-04-28 17:00:54 -07:00
The Android Open Source Project
dac3c93268
new projects
2009-04-28 14:30:32 -07:00
The Android Open Source Project
cefd2acc07
new projects
2009-04-28 14:23:57 -07:00
Shawn O. Pearce
cf70ea7481
Always use FQDN for android-git
...
Using the FQDN matches what we tell people to use when they invoke
'repo init -u ...', so individual projects will use the same URL
as the manifest uses. This means that repo can reuse the same
SSH connection for both the manifest and the projects, slightly
improving our sync times.
2009-04-21 19:32:23 -07:00
Shawn O. Pearce
9d45fa0cd7
Always use FQDN for android-git
2009-04-21 18:46:16 -07:00
android-build SharedAccount
54ab1c22ae
added new projects
2009-04-20 10:36:25 -07:00
Jean-Baptiste Queru
a2de8fc083
Add astl
...
Merge commit 'origin/donut' into default
Conflicts:
default.xml
2009-04-16 11:11:15 -07:00
Jean-Baptiste Queru
8e8d6db590
Add astl
2009-04-16 10:37:52 -07:00
Jean-Baptiste Queru
6199394b64
Add ImProvider
2009-04-08 14:21:40 -07:00
The Android Open Source Project
895a4aa9b9
update branch name
2009-04-02 00:46:26 -07:00
The Android Open Source Project
6b38dce4fb
missed old pinyin
2009-03-29 21:12:39 -07:00
The Android Open Source Project
d3fcaab668
fixed Pinyin
2009-03-29 19:02:23 -07:00
The Android Open Source Project
9613f2160a
fixed Pinyin
2009-03-29 19:00:50 -07:00
android-build SharedAccount
b2ee992116
typo
2009-03-27 10:39:49 -07:00
android-build SharedAccount
7de7a554da
typo
2009-03-27 10:38:24 -07:00
The Android Open Source Project
114848f28b
Merge branch 'cupcake' into donutburger
2009-03-26 01:32:51 -07:00
The Android Open Source Project
efed0e744d
added pinyin
2009-03-26 01:28:45 -07:00
The Android Open Source Project
bba71bd948
added pinyin
2009-03-26 01:27:44 -07:00
The Android Open Source Project
172be01954
new branch
2009-03-18 18:19:10 -07:00
The Android Open Source Project
92be8a3e0f
new projects, no kernel, internal git changes
2009-03-17 10:18:51 -07:00
The Android Open Source Project
fc7e52b50e
removed prebuilts
2009-03-15 21:56:37 -07:00
The Android Open Source Project
c6ca637cd0
added 2 stragler project sooner, OpenWnn
2009-03-15 21:46:18 -07:00
The Android Open Source Project
5c42b6c203
fixed typo
2009-03-15 20:12:00 -07:00
The Android Open Source Project
7312a9983d
added new project (internal only, removed kernel from standard manifest
2009-03-15 18:36:07 -07:00
The Android Open Source Project
c98b478c1f
add UserDictionaryProvider
2009-03-14 00:26:08 -07:00
The Android Open Source Project
32879fdc3a
add LatinIME
2009-03-13 15:37:07 -07:00
The Android Open Source Project
9f7327d99e
add emoji
2009-03-13 13:22:28 -07:00
The Android Open Source Project
12ab65f5e7
fix kernel url
2009-03-13 12:00:21 -07:00
The Android Open Source Project
e5d61c5a06
fixed internal kernel project info
2009-03-13 11:51:21 -07:00
The Android Open Source Project
1c3730fdac
added msm7k
2009-03-12 11:10:06 -07:00
The Android Open Source Project
5528a7eae3
add vendor dirs back in
2009-03-11 11:19:18 -07:00
The Android Open Source Project
dfb0e1c7a2
fixed git url
2009-03-06 18:26:48 -08:00
The Android Open Source Project
5441728c51
fixed remote name
2009-03-06 18:18:34 -08:00
The Android Open Source Project
414c8f420e
make the remote name 'goog'
2009-03-06 14:31:59 -08:00
The Android Open Source Project
e6aac0cbc6
android-git-ified
2009-03-06 11:50:05 -08:00
Android Partner
4dbed4910b
added vendor projects
2009-02-27 13:58:36 -08:00
mike ritter
3c837aa94e
added vendor projects
2009-02-27 13:41:39 -08:00
mike ritter
afdd3f875e
remove vendor dirs
2009-02-26 14:45:37 -08:00
mike ritter
f2912e6361
added vendor projects (htc/dream and qcom/surf)
2009-02-24 16:43:42 -08:00
The Android Open Source Project
15686212df
fix the branch name in xml file
2009-01-28 15:46:56 -08:00
Ed Heyl
334653a4fc
auto import from //branches/cupcake/...@126645
2009-01-15 17:40:42 -08:00
Jean-Baptiste Queru
d4c797a3b9
Merge from cupcake, manifest suitable for master after cupcake gets merged in
2008-12-19 12:22:57 -08:00
The Android Open Source Project
4ce247c9c8
Code drop from //branches/cupcake/...@124589
2008-12-17 18:08:14 -08:00
Shawn O. Pearce
bcf40054e1
Merge branch 'master' into release-1.0
...
* master:
Remove now-defunct <snapshot> entries from the manifest
Remove hardcoded branch constant
Conflicts:
default.xml
2008-11-06 08:34:42 -08:00
Shawn O. Pearce
ecca0c759d
Remove now-defunct <snapshot> entries from the manifest
...
Since repo 1.0.7, repo prefers to download over git://, as it turns
out to be a much faster transport than tarball over HTTP. As the
<import> elements are no longer recognized as keywords by repo we
may as well remove them from the primary manifest.
Signed-off-by: Shawn O. Pearce <sop@google.com >
2008-11-06 08:27:38 -08:00
Shawn O. Pearce
eec13c0126
Remove hardcoded branch constant
...
repo 1.1 and later do not use this attribute anymore,
and instead base their decision off the upstream branch
name that the manifest was cloned from.
Signed-off-by: Shawn O. Pearce <sop@google.com >
2008-11-06 08:27:31 -08:00
Shawn O. Pearce
8b2cdbed47
Merge branch 'master' into release-1.0
2008-10-21 16:52:57 -07:00
Shawn O. Pearce
1c8a393dfe
Move from git.webkit.org to a nightly WebKit tarball
2008-10-21 16:01:38 -07:00
Shawn O. Pearce
1f0176ca89
Merge branch 'master' into release-1.0
2008-10-21 12:12:15 -07:00
Shawn O. Pearce
b468df4b5b
Change main korg URL to android.git.kernel.org
...
Made by special request of the kernel.org administrators.
2008-10-21 12:11:26 -07:00
Shawn O. Pearce
9b2e2cf37a
Change libpcap, tcpdump to match known good tars
2008-10-21 10:00:26 -07:00
Shawn O. Pearce
fd8b112f12
Change iptables checksum to match a known good tar
2008-10-21 09:04:05 -07:00
Dave Bort
b53c0e63ad
Use the mirrors
2008-10-21 07:32:40 -07:00
The Android Open Source Project
a6e8163af2
Android 1.0
2008-10-21 07:00:00 -07:00
The Android Open Source Project
771763e2d7
Initial Contribution
2008-10-21 07:00:00 -07:00
