LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,621 Commits 2 Branches 0 Tags
80df85f0c10b5e61b88b599e2840a7084d84d10c
Commit Graph

8621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
80df85f0c1 am f97ce5b3: am b8504b0a: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit 'f97ce5b3cb44f47abde6ab8b6c651c0abb2aa5f1':
 2012-02-03 15:06:53 -08:00
Trevor Johns
3c0c2cba1c am 39107cac: am 7b8f2c59: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit '39107cac7bf24aa9e206e66d5eaccef7f9267cc5':
  Adding Android Developers Google+ redirect
 2012-02-03 15:06:52 -08:00
Trevor Johns
18865c5401 am c5b0ae26: am 87f81a89: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit 'c5b0ae26c9f5353658ff2d6d5143127e6bf50947':
 2012-02-03 15:06:51 -08:00
Trevor Johns
a40ba9aaa7 am b0d9d375: am 23195b75: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit 'b0d9d37520899b8eb305b55dde83f1a85d79bc6b':
  Adding manual redirect support to developer.android.com.
 2012-02-03 15:06:50 -08:00
Trevor Johns
f97ce5b3cb am b8504b0a: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit 'b8504b0a0e18575c38fa849c210e22b2dcc18097':
 2012-02-03 13:13:15 -08:00
Trevor Johns
39107cac7b am 7b8f2c59: am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit '7b8f2c59cd04521951c431228b765840dbb334dc':
  Adding Android Developers Google+ redirect
 2012-02-03 13:12:39 -08:00
Trevor Johns
c5b0ae26c9 am 87f81a89: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit '87f81a89f4b1912715aef02e70bc0af10b34909b':
 2012-02-03 13:12:38 -08:00
Trevor Johns
b8504b0a0e am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
  Adding Android Developers Google+ redirect
 2012-02-03 13:11:31 -08:00
Trevor Johns
b0d9d37520 am 23195b75: am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit '23195b75a42cf192867fa03de5160f357b7a87ad':
  Adding manual redirect support to developer.android.com.
 2012-02-03 13:11:29 -08:00
Trevor Johns
7b8f2c59cd am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
  Adding Android Developers Google+ redirect
 2012-02-03 13:10:20 -08:00
Trevor Johns
87f81a89f4 am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
  Adding manual redirect support to developer.android.com.
 2012-02-03 13:10:20 -08:00
Trevor Johns
23195b75a4 am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
  Adding manual redirect support to developer.android.com.
 2012-02-03 13:09:43 -08:00
Trevor Johns
47365074a0 Merge "Adding Android Developers Google+ redirect" into ics-mr1 2012-02-03 13:08:46 -08:00
Trevor Johns
7a94a9dc49 Merge "Adding manual redirect support to developer.android.com." into ics-mr1 2012-02-03 13:08:23 -08:00
Trevor Johns
22f4efaa12 Adding Android Developers Google+ redirect 
Redirect developer.android.com/+ to Google+ page for Android Developers.

Issue: 5933956

Change-Id: I0ed2b076386058f1ac81ea4376aea15fee6b24aa
 2012-02-03 12:32:10 -08:00
Xavier Ducrohet
3782f330aa am a6ebde03: am eea4e8e8: am df458cb8: Fix api version file with proper data enum. 
* commit 'a6ebde03230e919083f3a0792d236304c9e92784':
 2012-02-01 13:59:21 -08:00
Xavier Ducrohet
a6ebde0323 am eea4e8e8: am df458cb8: Fix api version file with proper data enum. 
* commit 'eea4e8e803aeb2a0719f6614f02211a45dd7820c':
 2012-02-01 13:57:02 -08:00
Xavier Ducrohet
eea4e8e803 am df458cb8: Fix api version file with proper data enum. 
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
  Fix api version file with proper data enum.
 2012-02-01 13:52:22 -08:00
Xavier Ducrohet
dadcdf59ce am 8a01c6a2: am c90d4c8a: am df458cb8: Fix api version file with proper data enum. 
* commit '8a01c6a2675d2c5364935be64a8cf78d8bfb6487':
  Fix api version file with proper data enum.
 2012-02-01 13:51:45 -08:00
Xavier Ducrohet
8a01c6a267 am c90d4c8a: am df458cb8: Fix api version file with proper data enum. 
* commit 'c90d4c8a09637fd05a9e06d0676ef8c8855afb6c':
  Fix api version file with proper data enum.
 2012-02-01 13:49:26 -08:00
Xavier Ducrohet
c90d4c8a09 am df458cb8: Fix api version file with proper data enum. 
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
  Fix api version file with proper data enum.
 2012-02-01 13:47:16 -08:00
Svetoslav Ganov
6848f33575 Merge "Updating the monkey to use a dedicated UI test bridge." 2012-02-01 13:45:42 -08:00
The Android Open Source Project
8dba10791e am 054a457c: am dff907ec: Reconcile with ics-mr1-release 
* commit '054a457c105dfc7d2c9e0af5576f7e480c7c83e0':
 2012-02-01 10:03:14 -08:00
The Android Open Source Project
054a457c10 am dff907ec: Reconcile with ics-mr1-release 
* commit 'dff907ecf5225402f3c2e3930ae8cbb292b22858':
 2012-02-01 10:00:25 -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
dff907ecf5 Reconcile with ics-mr1-release 
Change-Id: I74de9b8f1c59bb309cecda20c9181c69958c296c
 2012-02-01 08:49:29 -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
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
df458cb832 Fix api version file with proper data enum. 
The generator tool was broken during the generics fix.

Change-Id: I7e375000ac52fba27af7992ffebb5858baf20b3a
 2012-01-31 19:18:06 -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
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
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
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
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
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
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
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