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

82484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Lucas
d15a81487b am 18a91725: am cef72019: am 320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev 
* commit '18a917250d4d595759a054e354c99c4c1e633768':
  Initial commit of wireless connectivity/discovery class.
 2012-07-31 11:46:16 -07:00
Alexander Lucas
18a917250d am cef72019: am 320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev 
* commit 'cef720192aa615a08b36e282b8ae24197131f18b':
  Initial commit of wireless connectivity/discovery class.
 2012-07-31 11:45:05 -07:00
Alexander Lucas
cef720192a am 320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev 
* commit '320b3ec21eff971827a9032f1fb1ee7c866e4303':
  Initial commit of wireless connectivity/discovery class.
 2012-07-31 11:42:59 -07:00
Alexander Lucas
320b3ec21e Merge "Initial commit of wireless connectivity/discovery class." into jb-dev 2012-07-31 11:39:53 -07:00
Adam Powell
6cbfa6896e am 4b941f00: Merge "Fix bug 6906134" into jb-mr1-dev 
* commit '4b941f00cd832663a42c8cf0ddb0f97365bfe252':
  Fix bug 6906134
 2012-07-31 11:37:02 -07:00
Romain Guy
1b913c5c2a am 9f52da21: Merge "Fix android.opengl.Matrix frustum\'s generation" into jb-mr1-dev 
* commit '9f52da21d7d87c36e075432615c85c20bfa5d180':
  Fix android.opengl.Matrix frustum's generation
 2012-07-31 11:35:15 -07:00
Adam Powell
4b941f00cd Merge "Fix bug 6906134" into jb-mr1-dev 2012-07-31 11:34:51 -07:00
Romain Guy
9f52da21d7 Merge "Fix android.opengl.Matrix frustum's generation" into jb-mr1-dev 2012-07-31 11:33:29 -07:00
Adam Powell
c1eea136ea Fix bug 6906134 
Change-Id: I47dfa1e503e502fe348a350dad960fbb112435e7
 2012-07-31 11:27:19 -07:00
Kenny Root
a8e770991e am e23ae144: am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'e23ae144cc1b6487a7c0e7a33d3016431c81850c':
  Delay AccountManagerService initialization
 2012-07-31 11:21:16 -07:00
Kenny Root
e23ae144cc am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'fa74f7e04fcad1258a1b85515547dba0466086d8':
  Delay AccountManagerService initialization
 2012-07-31 11:19:40 -07:00
Kenny Root
fa74f7e04f am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'bba948dc9e95baab9e6fb728927aada4a00d93de':
  Delay AccountManagerService initialization
 2012-07-31 11:17:11 -07:00
Kenny Root
bba948dc9e Merge "Delay AccountManagerService initialization" into jb-dev 2012-07-31 11:14:02 -07:00
Alexander Lucas
969c243f17 Initial commit of wireless connectivity/discovery class. 
Change-Id: Ifbcbb8f5021a749ddb131d678ee1117835168598
 2012-07-31 10:23:01 -07:00
Peter Ng
4cc5de51c9 am 4fcaa382: am bed43546: am 971c05a0: Merge "removing recents icon in tabs ss" into jb-dev 
* commit '4fcaa382b79e5f7395ae75dc4687a2f3f3df3f23':
  removing recents icon in tabs ss
 2012-07-31 10:19:28 -07:00
Peter Ng
4fcaa382b7 am bed43546: am 971c05a0: Merge "removing recents icon in tabs ss" into jb-dev 
* commit 'bed43546760180f967f0ee0538afbf1f5ef0d649':
  removing recents icon in tabs ss
 2012-07-31 10:17:55 -07:00
Peter Ng
bed4354676 am 971c05a0: Merge "removing recents icon in tabs ss" into jb-dev 
* commit '971c05a07b42018fa994d0f48d559838de7ed1a0':
  removing recents icon in tabs ss
 2012-07-31 10:16:00 -07:00
Peter Ng
971c05a07b Merge "removing recents icon in tabs ss" into jb-dev 2012-07-31 10:13:39 -07:00
Brian Carlstrom
b6982bf759 am 1dc426c2: am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 
* commit '1dc426c29b3c922b7f2fa6ed8be8e846190cbea6':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
 2012-07-31 10:00:19 -07:00
Brian Carlstrom
1dc426c29b am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 
* commit '400918b02d6939da5f939ec12bf07d6bd92bf829':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
 2012-07-31 09:57:36 -07:00
Brian Carlstrom
400918b02d am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 
* commit '4881d8d3f12efc9bdb3b4c71d117a2c53919d258':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
 2012-07-31 09:55:30 -07:00
Brian Carlstrom
4881d8d3f1 Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 2012-07-31 09:53:28 -07:00
Peter Ng
073f2d9f4f am 65558d5d: am 0af60dfc: am 682077d1: Merge "help image updates" into jb-dev 
* commit '65558d5d33c89454745239ee2eef84dcffe626ba':
  help image updates
 2012-07-31 09:44:51 -07:00
Peter Ng
c542959e99 am 8dda8194: am f42bd744: am 5e466ae4: Merge "new accessibility section" into jb-dev 
* commit '8dda8194e1d5d5e90bdb5f6e6c6e454195a72613':
  new accessibility section
 2012-07-31 09:43:08 -07:00
Peter Ng
65558d5d33 am 0af60dfc: am 682077d1: Merge "help image updates" into jb-dev 
* commit '0af60dfc69e9cc11b8f8111a7ce657a74a0a4322':
  help image updates
 2012-07-31 09:43:06 -07:00
Peter Ng
be13fa0b7a removing recents icon in tabs ss 
Change-Id: I3a8b3b33c9c90bb8a0ee28e502bbdbe3e72e62be
 2012-07-31 09:41:57 -07:00
Peter Ng
8dda8194e1 am f42bd744: am 5e466ae4: Merge "new accessibility section" into jb-dev 
* commit 'f42bd7441e41587e19c0855711a38a361a4bd7fa':
  new accessibility section
 2012-07-31 09:41:12 -07:00
Peter Ng
0af60dfc69 am 682077d1: Merge "help image updates" into jb-dev 
* commit '682077d188e8c9e7d353138401a731b9e11ebd09':
  help image updates
 2012-07-31 09:41:09 -07:00
Peter Ng
f42bd7441e am 5e466ae4: Merge "new accessibility section" into jb-dev 
* commit '5e466ae4fa100cfc723472b9b402b4b1dde36ce0':
  new accessibility section
 2012-07-31 09:39:19 -07:00
Kenny Root
df8c22481d am 00efe449: am b3e4b46d: am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev 
* commit '00efe44923af27094cfc201064ed920f93b0bde0':
  Explicitly set lib dir permissions during unlink
 2012-07-31 09:38:39 -07:00
Peter Ng
682077d188 Merge "help image updates" into jb-dev 2012-07-31 09:38:36 -07:00
Peter Ng
5e466ae4fa Merge "new accessibility section" into jb-dev 2012-07-31 09:36:25 -07:00
Kenny Root
00efe44923 am b3e4b46d: am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev 
* commit 'b3e4b46db028c35d6d12c5f8f25b0463833fb51d':
  Explicitly set lib dir permissions during unlink
 2012-07-31 09:36:17 -07:00
Kenny Root
b3e4b46db0 am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev 
* commit 'e583bcf13c13957bdf20f8bc5e23258b083b2f51':
  Explicitly set lib dir permissions during unlink
 2012-07-31 09:34:26 -07:00
Robert Greenwalt
9e94a834fb am 36b536be: Merge "Reduce log spam." into jb-mr1-dev 
* commit '36b536be60b48ba119c85d7c4a1bed41a30fb4b1':
  Reduce log spam.
 2012-07-31 09:32:17 -07:00
Kenny Root
e583bcf13c Merge "Explicitly set lib dir permissions during unlink" into jb-dev 2012-07-31 09:31:41 -07:00
Robert Greenwalt
36b536be60 Merge "Reduce log spam." into jb-mr1-dev 2012-07-31 09:29:27 -07:00
Nick Pelly
f63c7565fc am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '90f5158961a8b3bf364273b7d91cb73a4d172c88':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:24:53 -07:00
Nick Pelly
90f5158961 am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '5dcbe638ee063201fb476ef475d2beb347f02097':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:22:46 -07:00
Nick Pelly
5dcbe638ee am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:20:25 -07:00
Nick Pelly
1af5ac1b68 Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 2012-07-31 09:17:54 -07:00
The Android Open Source Project
d8d0e2f2b5 Sync with jb-mr1-dev 
Change-Id: Ic6ab2992650b6cbe446236c73e6380d20dab003e
 2012-07-31 07:51:39 -07:00
James Dong
d9e72eaece am 5eaa5d18: Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev 
* commit '5eaa5d18bd0442596d05f6707e4f325c57dfbddc':
  Fix a typo (dependant => dependent)
 2012-07-30 22:25:32 -07:00
Satoshi Kataoka
3185869c65 Merge " Tentertively enable notification ime switcher" into jb-mr1-dev 2012-07-30 20:14:59 -07:00
Satoshi Kataoka
5e445c2e2c Tentertively enable notification ime switcher 
Bug: 6883389

Change-Id: I90d216e0081c5c5b089ab7fe1396ace91f8b4434
 2012-07-31 11:39:51 +09:00
Brian Carlstrom
5b1f037829 Change KeyStore to use Modified UTF-8 to match NativeCrypto 
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
 2012-07-30 18:54:18 -07:00
Peter Ng
1edd4ae5c4 help image updates 
Change-Id: I4357879eb365f5584efb838139132fd9f7a6e1be
 2012-07-30 18:49:45 -07:00
Peter Ng
0aa01367a0 am 66f13d75: am 28b452fd: Merge "dialog example update" into jb-dev 
* commit '66f13d75107fac3e1f251b65229e6d99d212e380':
  dialog example update
 2012-07-30 18:44:46 -07:00
Peter Ng
a23cd3a3e0 am 581784b3: am a5d92968: Merge "actionbar and tabs image updates" into jb-dev 
* commit '581784b3428b86501533582556772c11efbd6612':
  actionbar and tabs image updates
 2012-07-30 18:44:42 -07:00
Peter Ng
66f13d7510 am 28b452fd: Merge "dialog example update" into jb-dev 
* commit '28b452fddf85de27ad88b2b5de884c8428e74f1e':
  dialog example update
 2012-07-30 18:42:19 -07:00