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

63605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsu Chiang Chuang
6053b195bc am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:10:23 -08:00
Tsu Chiang Chuang
bb69bde593 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:25 -08:00
Tsu Chiang Chuang
3e70127021 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Robert Ly
37f9360a21 am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '3c78e101ec3ad427bf0341e3134659346fa06cc0':
 2012-03-01 14:15:03 -08:00
Robert Ly
ca7d7541c4 am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit 'd70eaff41ce4e033656eeebb5eb7153b49d2ac5a':
  fix bug 5942522
 2012-03-01 14:13:15 -08:00
Robert Ly
3c78e101ec am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:11:05 -08:00
Robert Ly
d70eaff41c am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:10:46 -08:00
Robert Ly
941ff38d05 Merge "fix bug 5942522" into ics-mr1 2012-03-01 14:08:40 -08:00
Robert Ly
a231071249 am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit '9d36dcc0f29d7afc7656d9320dd3a5edfb980989':
 2012-03-01 12:48:42 -08:00
Robert Ly
b4afb9a89e am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit '8125b0b4343b7f480196ce73103ca00cdf64f9e5':
  docs: fix bug 5878445
 2012-03-01 12:47:44 -08:00
Robert Ly
8125b0b434 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
 2012-03-01 12:44:36 -08:00
Robert Ly
9d36dcc0f2 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
 2012-03-01 12:44:35 -08:00
Robert Ly
dcc910ea6e Merge "docs: fix bug 5878445" into ics-mr1 2012-03-01 12:42:24 -08:00
Tsu Chiang Chuang
4b1afab106 extend timeout to allow for more time for the device to connect. 
Change-Id: If3929ca69a5025c7048d57276813c270229a76db
 2012-03-01 12:28:14 -08:00
The Android Open Source Project
efa4943952 am 4f306bec: Reconcile with ics-mr1-release 
* commit '4f306becef17ea986522202cc8c90b0e32e2ded1':
 2012-03-01 10:46:52 -08:00
The Android Open Source Project
4f306becef Reconcile with ics-mr1-release 
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
 2012-03-01 10:40:13 -08:00
The Android Open Source Project
956abc304f am f8e58c8b: Reconcile with ics-mr1-release 
* commit 'f8e58c8b4e8e2ef84e7213401ab595ce084f5612':
 2012-03-01 10:14:27 -08:00
The Android Open Source Project
f8e58c8b4e Reconcile with ics-mr1-release 
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
 2012-03-01 10:11:48 -08:00
Android Git Automerger
55fbbce495 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-01 07:35:22 -08:00
Yu Shan Emily Lau
da0c4a3ea6 am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'd12347b2b4dba77b9b0b7cc33ea32f8b5a54b388':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:04:11 -08:00
Yu Shan Emily Lau
353b61a87d am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit '0ddfe24a19882bb355313b6c5c14dcb0c6608365':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:03:40 -08:00
Yu Shan Emily Lau
0ddfe24a19 am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:00:08 -08:00
Yu Shan Emily Lau
d12347b2b4 am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:00:00 -08:00
Yu Shan Emily Lau
eb4f3256b7 Set the video encoding bit rate for the media 
recorder stress test.

Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
 2012-02-29 15:57:21 -08:00
Jean-Baptiste Queru
f73222a39e am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" 
* commit '964955e0bd98166c16f705811ce46d0151924cc8':
  DRM framwork bug fix: add an API to release resources
 2012-02-29 15:51:30 -08:00
Jean-Baptiste Queru
f09c0c7f31 am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" 
* commit '93920d79b7fa57ad941f5dbf33cf15ead6cd7318':
  Set width of spinner's dropdown to fit on device
 2012-02-29 15:51:28 -08:00
Jean-Baptiste Queru
dbc591e276 am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" 
* commit 'c69d61343913848b467022ef63f2c84cbc5ec34b':
  Adds documentation for ContentResolver notifyChange()
 2012-02-29 15:51:25 -08:00
Jean-Baptiste Queru
9de7793b42 am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '4f9063622415ea083bbd639af06e98065ce7176d':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 15:51:23 -08:00
Jean-Baptiste Queru
715c78b933 am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit '225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525':
  stagefright aacenc: Safeguard against overwriting bits
 2012-02-29 15:51:19 -08:00
Jean-Baptiste Queru
964955e0bd am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" 
* commit '8a9b14d80530eccf801fa794bacf287813b5978f':
  DRM framwork bug fix: add an API to release resources
 2012-02-29 15:47:45 -08:00
Jean-Baptiste Queru
93920d79b7 am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" 
* commit 'a66be970999c5eec1c8efb46e196f19ae563fc9b':
  Set width of spinner's dropdown to fit on device
 2012-02-29 15:47:42 -08:00
Jean-Baptiste Queru
c69d613439 am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" 
* commit '6ae4fe945b41d4bcb3ba7d931e34d6ef184b8b45':
  Adds documentation for ContentResolver notifyChange()
 2012-02-29 15:47:38 -08:00
Jean-Baptiste Queru
4f90636224 am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '9734843102c074c56ac72e221db0f51ae2fa79ec':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 15:47:35 -08:00
Jean-Baptiste Queru
225eec8d2a am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
  stagefright aacenc: Safeguard against overwriting bits
 2012-02-29 15:47:32 -08:00
Jean-Baptiste Queru
8a9b14d805 am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" 
* commit '5aeb85877a95cc12c0784757a9842983b04e8600':
  DRM framwork bug fix: add an API to release resources
 2012-02-29 15:44:41 -08:00
Jean-Baptiste Queru
a66be97099 am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" 
* commit '11aa4cc38b646f62eb22842d7510415b61c2ef84':
  Set width of spinner's dropdown to fit on device
 2012-02-29 15:44:38 -08:00
Jean-Baptiste Queru
6ae4fe945b am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" 
* commit '9303919d7d837dedf16f09ace0013e62670568e7':
  Adds documentation for ContentResolver notifyChange()
 2012-02-29 15:44:34 -08:00
Jean-Baptiste Queru
9734843102 am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '704131cb7e4f9cc682ea57ed569375f9f289368e':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 15:44:31 -08:00
Jean-Baptiste Queru
f9d4ba77f4 am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit '69aae36e900cf7114c5895618747906951a11730':
  stagefright aacenc: Safeguard against overwriting bits
 2012-02-29 15:44:28 -08:00
Jean-Baptiste Queru
5aeb85877a Merge "DRM framwork bug fix: add an API to release resources" 2012-02-29 15:12:48 -08:00
Jean-Baptiste Queru
11aa4cc38b Merge "Set width of spinner's dropdown to fit on device" 2012-02-29 15:09:17 -08:00
Jean-Baptiste Queru
9303919d7d Merge "Adds documentation for ContentResolver notifyChange()" 2012-02-29 14:38:59 -08:00
Jean-Baptiste Queru
704131cb7e Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* changes:
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 14:24:52 -08:00
Jean-Baptiste Queru
69aae36e90 Merge "stagefright aacenc: Safeguard against overwriting bits" 2012-02-29 14:23:38 -08:00
Eric Fischer
4917bc104d am d31da0a6: am fb393f8b: Mark configuration strings as not translatable. 
* commit 'd31da0a670a60722339faa18e1147adb9c14532d':
 2012-02-29 13:30:51 -08:00
Eric Fischer
b145e363ff am ba62da99: am fb393f8b: Mark configuration strings as not translatable. 
* commit 'ba62da99666c9ca590cde49ff00c06d3d50ca0a7':
  Mark configuration strings as not translatable.
 2012-02-29 13:28:52 -08:00
Eric Fischer
ba62da9966 am fb393f8b: Mark configuration strings as not translatable. 
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
 2012-02-29 13:26:13 -08:00
Eric Fischer
d31da0a670 am fb393f8b: Mark configuration strings as not translatable. 
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
 2012-02-29 13:26:08 -08:00
Eric Fischer
fb393f8bd7 Mark configuration strings as not translatable. 
Change-Id: I041a6a951dfe70881a095d7ef085b0246a9d4c3b
 2012-02-29 13:19:58 -08:00
Roman Nurik
62b4e4a83e am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit '86ca108c65c3f8400e750d639b71d6a3cef5b600':
 2012-02-29 12:49:31 -08:00