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

41973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
a421bf78ac am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing 
* commit '4143781cdea0741ce6e87967c4ab903288c3e4c3':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
 2012-03-02 16:40:00 -08:00
The Android Open Source Project
0a6fc120aa Reconcile with ics-mr1-release 
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
 2012-03-02 16:32:56 -08:00
The Android Automerger
94083a1398 merge in ics-mr1-release history after reset to ics-mr1 2012-03-02 11:51:23 -08:00
Robert Ly
4b8c531487 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
81c173f348 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
Dianne Hackborn
1ba5d3119f am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:22 -08:00
Dianne Hackborn
b534fb5266 Merge "Make ResolverActivity update dynamically." into ics-mr1 2012-03-02 08:30:36 -08:00
Adam Powell
12c1f3f2c7 am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '637c50db476d9a6cec13551920f7c163fef02ab8':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:49:46 -08:00
Adam Powell
31e1de1d35 am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit 'c7e5a2fe3042014f78667228a92e41d0a19547fd':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:46:26 -08:00
Tsu Chiang Chuang
d3cb1c2f89 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
b1b58c7e01 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Adam Powell
1ef7b6ead9 Merge "Fix dividers for LinearLayout (TabWidget)" 2012-03-01 16:26:04 -08:00
Robert Ly
2723562129 am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:10:46 -08:00
Robert Ly
55383fdaa7 Merge "fix bug 5942522" into ics-mr1 2012-03-01 14:08:40 -08:00
Robert Ly
88e35b82c0 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
671c6de30c Merge "docs: fix bug 5878445" into ics-mr1 2012-03-01 12:42:24 -08:00
The Android Open Source Project
9407583c70 Reconcile with ics-mr1-release 
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
 2012-03-01 10:11:48 -08:00
Yu Shan Emily Lau
c26ce0c14a 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
Jean-Baptiste Queru
26c9ac4bd1 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
7052bf3fca 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
005ec1bd8f 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
c284057bd4 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
6a0321714b 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
ec5b77b8cc 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
1674e9d2ad 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
2a54535c51 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
82c3852fd5 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
c9b107f365 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
c31e9aa9cf Merge "DRM framwork bug fix: add an API to release resources" 2012-02-29 15:12:48 -08:00
Jean-Baptiste Queru
d02344babf Merge "Set width of spinner's dropdown to fit on device" 2012-02-29 15:09:17 -08:00
Jean-Baptiste Queru
1f26fe2497 Merge "Adds documentation for ContentResolver notifyChange()" 2012-02-29 14:38:59 -08:00
Jean-Baptiste Queru
35d19b4773 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
f49cfe3daa Merge "stagefright aacenc: Safeguard against overwriting bits" 2012-02-29 14:23:38 -08:00
Eric Fischer
3441f34a79 am fb393f8b: Mark configuration strings as not translatable. 
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
 2012-02-29 13:26:13 -08:00
Roman Nurik
9553ec0540 am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.
 2012-02-29 12:42:39 -08:00
Robert Ly
5cecb55714 am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
 2012-02-28 15:39:39 -08:00
Robert Ly
b39e385b97 Merge "fix bug 5911175" into ics-mr1 2012-02-28 15:37:21 -08:00
The Android Automerger
bd026f32e1 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:14:55 -08:00
Dianne Hackborn
173e455381 am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:03:18 -08:00
Dianne Hackborn
0003f917f0 Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00
felipeal
3c1468cfbf am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:04:20 -08:00
Jean-Baptiste Queru
3d29dab960 am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'f418738c64413b818e2dc507c912c2678876632f':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:33:44 -08:00
Jean-Baptiste Queru
84c7c01ea7 am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'd7fa7deef9bc0cf22bf450fdb062327697c087c4':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:30:39 -08:00
Jason Noguchi
d53894e015 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:50:14 -08:00
Jason Noguchi
e81927cf9a Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 2012-02-28 11:47:46 -08:00
Svetoslav Ganov
6948e13a34 am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:35:43 -08:00
Jean-Baptiste Queru
c28371d138 Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 2012-02-28 07:28:52 -08:00
Jean-Baptiste Queru
476df7e91b am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit 'f016dc1bd7f9a67adac13b0b564692dab8723392':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 16:59:59 -08:00
Jean-Baptiste Queru
5316ab3c34 am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 16:57:06 -08:00
Jean-Baptiste Queru
5d46260664 Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 2012-02-27 16:23:19 -08:00