LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,728 Commits 2 Branches 0 Tags
226c2059523b4a60845476244b3879e5ca13c41b
Commit Graph

8728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
226c205952 am 02a3315f: am 9114b85e: Reconcile with ics-mr1-release 
* commit '02a3315f9e357d40b6af51b0401f6773e032a2ca':
 2012-02-01 09:11:19 -08:00
The Android Open Source Project
02a3315f9e am 9114b85e: Reconcile with ics-mr1-release 
* commit '9114b85e63f464cfe5dda62bb430e1200dcbe73e':
 2012-02-01 09:09:12 -08:00
The Android Open Source Project
9114b85e63 Reconcile with ics-mr1-release 
Change-Id: I9edbfba9b4c69b550b60723b903bae30580a149b
 2012-02-01 08:42:39 -08:00
Xavier Ducrohet
21c9c54218 am 145dca00: am ae8a6098: am e11b2d6c: Update api version file with stripped generics info. 
* commit '145dca00f153eacff36eb2518869b7633ddee1fc':
  Update api version file with stripped generics info.
 2012-02-01 00:20:04 -08:00
Xavier Ducrohet
145dca00f1 am ae8a6098: am e11b2d6c: Update api version file with stripped generics info. 
* commit 'ae8a60985b7335a651af037b17d7c870a5409ed3':
  Update api version file with stripped generics info.
 2012-02-01 00:18:04 -08:00
Xavier Ducrohet
ae8a60985b am e11b2d6c: Update api version file with stripped generics info. 
* commit 'e11b2d6c9f479528092a56bfe94054798e3e4831':
  Update api version file with stripped generics info.
 2012-01-31 15:49:41 -08:00
Xavier Ducrohet
e11b2d6c9f Update api version file with stripped generics info. 
Change-Id: Iac38c14115757cbfa75808ce5e476912da80543d
 2012-01-31 15:44:27 -08:00
The Android Automerger
1c33479a7c merge in ics-mr1-release history after reset to ics-mr1 2012-01-31 15:41:33 -08:00
Andy Stadler
9ddaf0c9ec am 101aa2a0: Merge "Put Email back into eclipse .classpath" 
* commit '101aa2a09bc8791fc814134ea40f97b0d9bacf25':
  Put Email back into eclipse .classpath
 2012-01-31 09:31:55 -08:00
Andy Stadler
101aa2a09b Merge "Put Email back into eclipse .classpath" 2012-01-31 09:30:10 -08:00
The Android Automerger
672a32cc9c merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:27 -08:00
Andy Stadler
d174a02615 Put Email back into eclipse .classpath 
Enabled by
  https://android-git.corp.google.com/g/#/c/161302/
  https://android-git.corp.google.com/g/#/c/161303/

Thanks, Mindy!

bug: 5932475
Change-Id: I92307db44c1663d3afd2466bc5e9dee12f5fd822
 2012-01-30 15:03:45 -08:00
The Android Open Source Project
36f18b1df0 am fc7031fc: am 068436ed: Reconcile with ics-mr1-release 
* commit 'fc7031fcb463593d0f799ec057f6da4e47fe0185':
 2012-01-30 13:40:51 -08:00
The Android Open Source Project
fc7031fcb4 am 068436ed: Reconcile with ics-mr1-release 
* commit '068436ed63787281b9f390da0e3363c46f252077':
 2012-01-30 13:38:37 -08:00
The Android Open Source Project
068436ed63 Reconcile with ics-mr1-release 
Change-Id: Ibff0a60a4654253950e08e68cafddfe7c9219734
 2012-01-30 13:36:26 -08:00
The Android Automerger
9771093ab8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:22:25 -08:00
Dianne Hackborn
5a4535eb92 am a93566ac: am cafd05f0: am 97d0a1db: Merge "Fix bug in the new notification sample." into ics-mr1 
* commit 'a93566ac87263ce4a2798e6060a753c46abb1d7d':
  Fix bug in the new notification sample.
 2012-01-30 13:01:14 -08:00
Dianne Hackborn
a93566ac87 am cafd05f0: am 97d0a1db: Merge "Fix bug in the new notification sample." into ics-mr1 
* commit 'cafd05f0c99f9f758b55bf0efee71e8b402de495':
  Fix bug in the new notification sample.
 2012-01-30 12:58:59 -08:00
Dianne Hackborn
cafd05f0c9 am 97d0a1db: Merge "Fix bug in the new notification sample." into ics-mr1 
* commit '97d0a1db24c5c46089e5fa6c18b0fb1a49140125':
  Fix bug in the new notification sample.
 2012-01-30 12:56:10 -08:00
Dianne Hackborn
97d0a1db24 Merge "Fix bug in the new notification sample." into ics-mr1 2012-01-30 12:52:26 -08:00
Andy Stadler
6813f20d74 am ecb59176: Merge "Classpath cleanup" 
* commit 'ecb591762646cee7bf8c88631ec2b2ec1fb8d5f3':
  Classpath cleanup
 2012-01-30 11:44:30 -08:00
Dianne Hackborn
376e000436 Fix bug in the new notification sample. 
Change-Id: I021c5f374857d1affdddd8be37c0f441aaf14c95
 2012-01-30 11:44:05 -08:00
Andy Stadler
ecb5917626 Merge "Classpath cleanup" 2012-01-30 11:42:27 -08:00
Yu Shan Emily Lau
880876ed2f am c44d7a83: am 075783dc: am 979806b0: Regular monkey should not write script log. 
* commit 'c44d7a83593fd00bb053fbdc08dbca0e43230d61':
  Regular monkey should not write script log.
 2012-01-30 11:30:33 -08:00
Yu Shan Emily Lau
c44d7a8359 am 075783dc: am 979806b0: Regular monkey should not write script log. 
* commit '075783dcd8b07c8e1e0994f1ec5d909f3977eef5':
  Regular monkey should not write script log.
 2012-01-30 11:28:02 -08:00
Yu Shan Emily Lau
075783dcd8 am 979806b0: Regular monkey should not write script log. 
* commit '979806b0a8998654f0b491478360782c0df49498':
  Regular monkey should not write script log.
 2012-01-30 11:26:48 -08:00
Yu Shan Emily Lau
979806b0a8 Regular monkey should not write script log. 
Change-Id: I225cb01d3fb81478ea0e13cc4a6546d71d16d251
 2012-01-30 11:08:53 -08:00
Trevor Johns
fcea8e6e6d am efab6c55: am 8d2e2b91: am e12dad21: Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 
* commit 'efab6c55cc8fee0c9e551fdc5776fb06cbf92ff7':
  Generate a valid main.py for use with developer.android.com.
 2012-01-30 10:33:09 -08:00
Trevor Johns
efab6c55cc am 8d2e2b91: am e12dad21: Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 
* commit '8d2e2b91b7cb499be12dceef8f15104b4f2cc98f':
  Generate a valid main.py for use with developer.android.com.
 2012-01-30 10:30:53 -08:00
Trevor Johns
8d2e2b91b7 am e12dad21: Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 
* commit 'e12dad21f0733c3dad7dc099fc896af86e54f90e':
  Generate a valid main.py for use with developer.android.com.
 2012-01-30 10:28:39 -08:00
Trevor Johns
e12dad21f0 Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 2012-01-30 10:27:05 -08:00
Xavier Ducrohet
0f3fd4b4cb am f9f02241: am 54ee466c: am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 
* commit 'f9f0224103c189fec3b3f3099ed90f4a1584c1fa':
  Move api.xml from tools/ to platform-tools/
 2012-01-27 21:12:09 -08:00
Robert Ly
6236d559fd am 656efe66: am a0def2c3: am 5d1dd1c6: Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 
* commit '656efe66fbabb446b8f2a285d7f21d32b7f91bcd':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-27 21:12:07 -08:00
Xavier Ducrohet
f9f0224103 am 54ee466c: am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 
* commit '54ee466c5389e0e9326258364a063e57e106ef5b':
  Move api.xml from tools/ to platform-tools/
 2012-01-27 21:09:13 -08:00
Robert Ly
656efe66fb am a0def2c3: am 5d1dd1c6: Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 
* commit 'a0def2c375bc73f9815cabf55eceead652922b0e':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-27 21:09:09 -08:00
Trevor Johns
e52271aff9 Generate a valid main.py for use with developer.android.com. 
This fixes bugs in divide_and_compress_constants.py that caused a corrupt
main.py file to be generated for developer.android.com. Specifically,
extra quotes are no longer added, __main__ is now in quotes, and
webapp.WSGIApplication() parameters are now correct.

Also moved the call to memcache_zipserve.create_handler() to a seperate
line for readability.

Change-Id: I8906c54e70b2889389a95b92d4fbcf05a6c3e22d
 2012-01-27 20:08:25 -08:00
Jeff Brown
cf4682bde9 am e250d46c: Merge "Organize imports to resolve ambiguous type errors." 
* commit 'e250d46cc48a34a58b17eadf99dbcb7f57896fbc':
  Organize imports to resolve ambiguous type errors.
 2012-01-27 17:38:51 -08:00
Jeff Brown
e250d46cc4 Merge "Organize imports to resolve ambiguous type errors." 2012-01-27 17:37:12 -08:00
Marco Nelissen
3bd580e1dd am 936e648c: Fix findunusedresources to handle package name different from path 
* commit '936e648ce98cb468ac02dc7e6ef9f7df897f03ff':
  Fix findunusedresources to handle package name different from path
 2012-01-27 16:18:56 -08:00
Marco Nelissen
936e648ce9 Fix findunusedresources to handle package name different from path 
Change-Id: Ia010d0f71e3e7141f762fc83ff34d3426bac85a0
 2012-01-27 16:07:59 -08:00
Andy Stadler
3f733fd9d2 Classpath cleanup 
1. Remove camera & gallery2 pending http://b/issue?id=5584451
2. Remove Email until apache duplication in UnifiedEmail can be
    resolved.  http://b/issue?id=5932475
3. Added frameworks/support/v13/ics & frameworks/support/v13/ics-mr1

Change-Id: I71bc9adac98bf280e9498c68fada43215971a714
 2012-01-27 14:28:19 -08:00
Xavier Ducrohet
54ee466c53 am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 
* commit 'd4f9372a4dc45bafb7c962046459cc22f18e5098':
  Move api.xml from tools/ to platform-tools/
 2012-01-27 12:02:42 -08:00
Xavier Ducrohet
d4f9372a4d Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 2012-01-27 12:00:38 -08:00
Tor Norbye
82374f6d8d Move api.xml from tools/ to platform-tools/ 
The API database was generated with code in sdk/apicheck/.

Change-Id: I42559fb47716f8ea2ee2d836375b523644dfe41c
 2012-01-27 11:59:10 -08:00
Robert Ly
a0def2c375 am 5d1dd1c6: Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 
* commit '5d1dd1c68f1cefd22a67736677ab19f3fddc0033':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-27 09:06:29 -08:00
Robert Ly
5d1dd1c68f Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 2012-01-27 09:04:48 -08:00
Raphael Moll
1df367352a am 2b53ba58: Projects whitelisted for Windows SDK compilation. 
* commit '2b53ba58976db5696d65e95ce5c1968263976a71':
  Projects whitelisted for Windows SDK compilation.
 2012-01-26 16:05:00 -08:00
Raphael Moll
2b53ba5897 Projects whitelisted for Windows SDK compilation. 
This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae

Change-Id: Ie6f728bee2caea203865c4f861b657323f9f4c9c
 2012-01-26 15:27:13 -08:00
Jeff Brown
8e78aabf3a Organize imports to resolve ambiguous type errors. 
Fixes an ambiguous import involving OperationCanceledException.

Change-Id: Ie96b1225b44342eabb70e25ce6e43dc027b65489
 2012-01-26 12:38:18 -08:00
Nick Pelly
70e35a6b28 am a983c2a1: Update NFC samples. 
* commit 'a983c2a1a39cd4829594f19fd9d0d2070cd0cc71':
  Update NFC samples.
 2012-01-25 13:32:23 -08:00