ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
41,057 Commits 2 Branches 0 Tags 54 MiB
3e458eabf4
Commit Graph

41057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Owen Lin
bbcf8d3948 am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 
* commit '8bb56180d208b9264e5a56b49fe06b8471ccaced':
  Fix 5654631. It forgot to consider the year in formatDateRange.
 2011-11-22 17:46:35 -08:00
Owen Lin
0f644e5257 Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 2011-11-22 17:44:52 -08:00
The Android Open Source Project
4273a3e0c3 am 1889bb49: Reconcile with ics-mr0-release 
* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
 2011-11-22 15:26:16 -08:00
The Android Open Source Project
0922394b74 Reconcile with ics-mr0-release 
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
 2011-11-22 15:24:04 -08:00
The Android Open Source Project
82ac0ee5bc am 27239099: Reconcile with ics-mr0-release 
* commit '2723909903b68db016666a13ec897581a8915636':
 2011-11-22 15:16:08 -08:00
The Android Open Source Project
46dbb9b634 Reconcile with ics-mr0-release 
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
 2011-11-22 15:14:10 -08:00
The Android Automerger
5ac81863de merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 14:28:06 -08:00
dujin.cha
f47588cbb7 am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue 
* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue
 2011-11-22 13:20:09 -08:00
dujin.cha
94b093c607 am fe464a76: [Prime K] Fix gabage character issue 
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
  [Prime K] Fix gabage character issue
 2011-11-22 13:18:27 -08:00
Jean-Baptiste Queru
b420ff334a am eff6ed0f: Ignore e36657e5 
* commit 'eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f':
  Do not merge. Fix a memory leak of a Binder in SpellCheckerService
 2011-11-22 13:18:05 -08:00
Jean-Baptiste Queru
502a9c95c8 Ignore e36657e5 
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
 2011-11-22 13:15:31 -08:00
Romain Guy
ad7e6ffdad am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 
* commit '303a0695b8fa0b8f0095c437145a28633a7a8d92':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
 2011-11-22 12:35:25 -08:00
Romain Guy
4b557dd2ec am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1 
* commit '26dd54f87c1daaa369576d9abea823c8105bd702':
  Ensure we have an EGL context when building layers Bug #5638421
 2011-11-22 12:35:18 -08:00
Romain Guy
a67d4d23e5 Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 2011-11-22 12:33:17 -08:00
Romain Guy
b1c3730a26 Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1 2011-11-22 12:33:04 -08:00
Amith Yamasani
7ecd42facf am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 
* commit '227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
  Fix an NPE on overflow in BatteryStats history.
 2011-11-22 11:04:58 -08:00
Amith Yamasani
6ff0e8a106 Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 2011-11-22 11:02:49 -08:00
Teng-Hui Zhu
9174795018 am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1 
* commit '7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
  HTML5 Video runs into super full screen mode
 2011-11-22 08:57:02 -08:00
Teng-Hui Zhu
05e688ad9d Merge "HTML5 Video runs into super full screen mode" into ics-mr1 2011-11-22 08:54:59 -08:00
Andreas Huber
54bccc2cfc am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 
* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
  Report a runtime error instead of asserting on malformed avc configuration data.
 2011-11-22 08:41:04 -08:00
Andreas Huber
2389af0dc6 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 2011-11-22 08:39:11 -08:00
Daniel Sandler
fde159f6fb am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1 
* commit '631885746868cbf03f89e655a6f4fac96449e8a4':
  Dismiss system windows when screen savers start.
 2011-11-22 07:16:47 -08:00
Daniel Sandler
9f96a44b20 Merge "Dismiss system windows when screen savers start." into ics-mr1 2011-11-22 07:15:29 -08:00
Mangesh Ghiware
47aa84dc62 am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 
* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
  Update zoom (aka display) density from WebView thread.
 2011-11-21 23:16:06 -08:00
Mangesh Ghiware
2b7f7eb1fa Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 2011-11-21 23:14:05 -08:00
Romain Guy
96e41aaca4 am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1 
* commit '723218b4f428944bdb11b25d0b30ece56283f696':
  Hide ManagedEGLContext until we are sure this is the correct API.
 2011-11-21 21:20:57 -08:00
Romain Guy
14986f7cb5 Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1 2011-11-21 21:18:51 -08:00
James Dong
9056b5656c am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 
* commit '02740dc49df86fc94c872454aa9db98737d5e8c8':
  Fix log spamming during time lapse video recording
 2011-11-21 20:29:59 -08:00
James Dong
ef94a3fb02 Merge "Fix log spamming during time lapse video recording" into ics-mr1 2011-11-21 20:28:27 -08:00
Romain Guy
f178f8e1e5 am 1766b0e2: Fix the build 
* commit '1766b0e25de5a66f9d0f6e73a2c342272fcadc71':
  Fix the build
 2011-11-21 18:31:29 -08:00
Wu-cheng Li
01dcd424f6 am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 
* commit 'e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
  Move Camera.Sound to a stand-alone class CameraSound.
 2011-11-21 18:13:06 -08:00
Wu-cheng Li
92bc62e00b Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 2011-11-21 18:10:52 -08:00
Mathias Agopian
82ac31f9fa am 07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1 
* commit '07a2d831903774e07c1c6b6dd5c7c06bf8ca176a':
  don't report an error when disconnecting from an abandoned surfacetexture
 2011-11-21 18:00:52 -08:00
Mathias Agopian
4869991f74 am 8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 
* commit '8646cd42df5edc5f5b9c52d6ab5309821e875656':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
 2011-11-21 17:58:42 -08:00
Romain Guy
33a771f7da am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 
* commit '8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
  Notify views when EGL resources are about to be destroyed Bug #5639899
 2011-11-21 17:58:40 -08:00
Mathias Agopian
7723773df3 Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1 2011-11-21 17:57:31 -08:00
Mathias Agopian
75cf5a7480 Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 2011-11-21 17:57:20 -08:00
Romain Guy
7e7fa2543d Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 2011-11-21 17:57:05 -08:00
Jamie Gennis
b7d87c40ef SurfaceMediaSource: use the vid enc usage bit 
This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.

Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
 2011-11-21 17:48:19 -08:00
Adam Powell
07281fa255 am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 
* commit 'fb0784da5f602bf6410ef914d625c3cedfa11e9f':
  Fix bug 5521467 - Monkeys and ActionBar custom tab views
 2011-11-21 17:36:20 -08:00
Adam Powell
a9273339c2 Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 2011-11-21 17:34:57 -08:00
Nick Pelly
f3e284a1e0 am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 
* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
 2011-11-21 16:05:30 -08:00
Nick Pelly
33733ed06b Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:40 -08:00
Jamie Gennis
a3677781d0 am b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 
* commit 'b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54':
  EGL: Use cache sizes defined in the BoardConfig
 2011-11-21 15:56:12 -08:00
Jamie Gennis
f59fa92c30 am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1 
* commit '53cf20202a3848a6c61b5229814268180a3d2f16':
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
 2011-11-21 15:56:11 -08:00
Jamie Gennis
e011aa2b0f Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 2011-11-21 15:54:54 -08:00
Jamie Gennis
b440acd1c8 Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1 
* changes:
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
 2011-11-21 15:54:40 -08:00
Eric Fischer
092ecfb373 am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '68f0d47e8ee045dffb5f59c67cc77f38598472c5':
  Import revised translations. DO NOT MERGE
 2011-11-21 15:31:36 -08:00
Eric Fischer
c4411803fb Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:29:06 -08:00
Chia-chi Yeh
09839e416e am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1 
* commit 'bfd85f9aca13aba2b954ddf3d8c6f6eb26e35f25':
  SIP: turn off verbose logs.
 2011-11-21 15:22:00 -08:00