drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,807 Commits 1 Branch 0 Tags
Commit Graph

63807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
97824b706d am aa1bd6de: am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit 'aa1bd6dec676ab81e14ca428427d2b8c627c83fa':
  Add empty libmedia_native in old location
 2012-03-16 10:03:54 -07:00
Glenn Kasten
aa1bd6dec6 am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit 'd8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
  Add empty libmedia_native in old location
 2012-03-16 10:01:28 -07:00
Glenn Kasten
d8cc14211a am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit '42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
  Add empty libmedia_native in old location
 2012-03-15 22:09:38 -07:00
Glenn Kasten
42c6d163aa Merge "Add empty libmedia_native in old location" 2012-03-15 16:02:46 -07:00
Scott Main
66c36b886d am 886603da: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit '886603da73526eb992dfb4bc5afc89c7a17294d8':
 2012-03-15 16:00:40 -07:00
Scott Main
af2827ba96 am 714d655c: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit '714d655ccfcc0d465a1a8c190d407e3d97261d76':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:59:37 -07:00
Scott Main
714d655ccf am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit 'eb1d42e4faa34c2acf76200913920fd5ca46a39e':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:56:12 -07:00
Scott Main
886603da73 am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit 'eb1d42e4faa34c2acf76200913920fd5ca46a39e':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:56:05 -07:00
Scott Main
eb1d42e4fa Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 2012-03-15 15:52:56 -07:00
Glenn Kasten
e6aa25bb8e Add empty libmedia_native in old location 
Submitting this first, in the old location, will allow early testing of
the build for all the dependent projects.  Then those projects will not
need to be updated atomically when libmedia_native is moved.

Change-Id: I31ab315e53970986d18a4e3b1673e31460f6a3f1
 2012-03-15 15:32:20 -07:00
Dianne Hackborn
f0cbb03ad2 am 42ef93fc: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 
* commit '42ef93fcc455b9194a7603fed439e8d4490d634f':
 2012-03-15 11:33:34 -07:00
Dianne Hackborn
b99b7f51b0 am 4d85c98d: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 
* commit '4d85c98d833f6fed01b4bb84427a4b7514f95978':
  Remove fade animations from framework drawables.
 2012-03-15 11:32:41 -07:00
Dianne Hackborn
4d85c98d83 am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 
* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.
 2012-03-15 11:29:22 -07:00
Dianne Hackborn
42ef93fcc4 am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 
* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.
 2012-03-15 11:29:22 -07:00
Dianne Hackborn
33ace979a4 Merge "Remove fade animations from framework drawables." into ics-mr1 2012-03-15 11:27:43 -07:00
Android Git Automerger
bf324a1c28 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-15 10:38:42 -07:00
Scott Main
8fc949ebb1 am 1fbc85d3: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1 
* commit '1fbc85d32ddd8a764d522ba56cae10ca0d6c5f93':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
 2012-03-15 10:25:56 -07:00
Scott Main
40b4f04ac3 am 15010776: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1 
* commit '150107763d1b5ced8e70992268d7d6fc1888f7dd':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
 2012-03-15 10:25:31 -07:00
Scott Main
1fbc85d32d am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1 
* commit 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
 2012-03-15 10:22:35 -07:00
Scott Main
150107763d am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1 
* commit 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
 2012-03-15 10:22:33 -07:00
Scott Main
f32ab91414 Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary" into ics-mr1 2012-03-15 10:21:00 -07:00
Android Git Automerger
f197d6a8d2 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-14 17:10:53 -07:00
Robert Ly
75bb459452 am af3701f4: am 957f716c: docs: fix toc in search au class 
* commit 'af3701f41382250912e7adb656a1b820d06c59eb':
  docs: fix toc in search au class
 2012-03-14 16:59:38 -07:00
Robert Ly
c600323c59 am da04da21: am 957f716c: docs: fix toc in search au class 
* commit 'da04da21cede129282cd31367a242ed41b9a2f9a':
  docs: fix toc in search au class
 2012-03-14 16:59:06 -07:00
Robert Ly
da04da21ce am 957f716c: docs: fix toc in search au class 
* commit '957f716cf1686145ba4c06ca8669eaa2e22f54e8':
  docs: fix toc in search au class
 2012-03-14 16:55:25 -07:00
Robert Ly
af3701f413 am 957f716c: docs: fix toc in search au class 
* commit '957f716cf1686145ba4c06ca8669eaa2e22f54e8':
  docs: fix toc in search au class
 2012-03-14 16:54:59 -07:00
Dianne Hackborn
6fdab076b7 Remove fade animations from framework drawables. 
Change-Id: Ic4115ba779e88a405b5d2cd927db99c43def3704
 2012-03-14 16:46:59 -07:00
Robert Ly
957f716cf1 docs: fix toc in search au class 
Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
 2012-03-14 16:24:25 -07:00
Scott Main
1657080a0c docs: update various SDK and AVD Manager screenshots 
and remove one from the licensing doc that's not necessary

Change-Id: I4b07446a8fd57449dfd9b605019143f543be5e14
 2012-03-14 16:16:18 -07:00
Robert Ly
9c0ce08e6e am 363d178f: am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit '363d178fac6392edfe9981b6b80a8e1ba724f0ac':
 2012-03-14 15:52:15 -07:00
Robert Ly
d01ec4c9af am c3b24faa: am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit 'c3b24faa078a8f0fc4817dc06b3ababa7503afda':
  docs: android u search class
 2012-03-14 15:50:08 -07:00
Robert Ly
363d178fac am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit 'b285125d4bad1c76e95cd24956711deb9908c4a8':
  docs: android u search class
 2012-03-14 15:46:17 -07:00
Robert Ly
c3b24faa07 am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit 'b285125d4bad1c76e95cd24956711deb9908c4a8':
  docs: android u search class
 2012-03-14 15:46:10 -07:00
Robert Ly
b285125d4b Merge "docs: android u search class" into ics-mr1 2012-03-14 15:41:02 -07:00
Scott Main
0b4ec63cd1 am 6513bceb: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '6513bceb8e647efd9039e2dd23eaa5c302b11d93':
 2012-03-13 23:17:08 -07:00
Scott Main
fb058ddb8b am 82916294: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '82916294a326e829cd1487ccb56a3ee5346ea8ac':
  docs: remove link from GP logo
 2012-03-13 23:15:52 -07:00
Scott Main
82916294a3 am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
  docs: remove link from GP logo
 2012-03-13 23:12:18 -07:00
Scott Main
6513bceb8e am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
  docs: remove link from GP logo
 2012-03-13 23:12:09 -07:00
Scott Main
7f94977867 Merge "docs: remove link from GP logo" into ics-mr1 2012-03-13 23:09:09 -07:00
Junichi Monma
896a638b34 am 41d72c86: Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop 
* commit '41d72c86032d2b1d1744049caa3746947ac58b3f':
  DO NOT MERGE : New version of DroidSansFallback font
 2012-03-13 22:52:57 -07:00
Junichi Monma
41d72c8603 Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop 2012-03-13 22:48:38 -07:00
Robert Ly
055e3f25ba docs: android u search class 
Change-Id: I433cb5b82426c942af8f357180aeb7c947f2d9e1
 2012-03-13 18:14:02 -07:00
Daniel Lehmann
bdac8bb4a2 am aac03528: am 0e873700: Remove the country detector logging 
* commit 'aac0352871071bc88eda1f017f928644f55dab25':
 2012-03-12 18:28:19 -07:00
Daniel Lehmann
8f30d2191e am f0533f94: am 0e873700: Remove the country detector logging 
* commit 'f0533f9462275eff04491a1a27ee4cb1f4afd581':
  Remove the country detector logging
 2012-03-12 18:27:33 -07:00
Daniel Lehmann
f0533f9462 am 0e873700: Remove the country detector logging 
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
  Remove the country detector logging
 2012-03-12 18:24:41 -07:00
Daniel Lehmann
aac0352871 am 0e873700: Remove the country detector logging 
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
  Remove the country detector logging
 2012-03-12 18:24:41 -07:00
Daniel Lehmann
0e87370077 Remove the country detector logging 
Bug:6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
 2012-03-12 17:04:17 -07:00
Andrew Flynn
b0a07985b9 am 4326da7e: Merge "DO NOT MERGE Fix back button state issue" into ics-scoop 
* commit '4326da7e0d5d63bad718e9848294405971f8f9ab':
  DO NOT MERGE Fix back button state issue
 2012-03-12 16:04:15 -07:00
Andrew Flynn
a443d3520a am 53935258: Merge "DO NOT MERGE" into ics-scoop 
* commit '5393525809115fcf5027f292a243ebe34cfbfb7c':
  DO NOT MERGE
 2012-03-12 16:04:12 -07:00
Andrew Flynn
4326da7e0d Merge "DO NOT MERGE Fix back button state issue" into ics-scoop 2012-03-12 16:00:44 -07:00