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

42152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
cb372fd8db am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit '86ca108c65c3f8400e750d639b71d6a3cef5b600':
 2012-02-29 12:49:31 -08:00
Roman Nurik
4750f8c706 am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'c47369d7c5d3a588d7b0c655878f0bc7dd2ffedc':
  docs: Android Design downloads section, linkable H2s.
 2012-02-29 12:45:16 -08:00
Roman Nurik
9ab9e59b85 am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.
 2012-02-29 12:43:29 -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
8d0932dba0 am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'edfc6a0d709afdf75284ecfc1e680c27fda8b9a9':
 2012-02-28 15:43:52 -08:00
Robert Ly
05e2153a00 am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit '40226da7aeb705fb823517f74739bf2f25fa86f3':
  fix bug 5911175
 2012-02-28 15:42:32 -08:00
Robert Ly
b8dea50c14 am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
 2012-02-28 15:39:55 -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
Dianne Hackborn
da2e9896ee am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit 'c221d6ec2fbaa73f82cd219e2d5ab078697070ab':
 2012-02-28 15:16:20 -08:00
Dianne Hackborn
731757ccbe am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit 'a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:07:43 -08:00
Dianne Hackborn
a196c9116e 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:28 -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
e239bd87b2 am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit '4bcc910817c694c8d8b20e39a5ff42c584af1d49':
 2012-02-28 14:09:43 -08:00
felipeal
35ef14c5e4 am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'fa73815e1d953e67c635877440e717dc84465d97':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:07:26 -08:00
felipeal
258bab7ce6 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:05:23 -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
5f52a39038 am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'e939edb5b4e991998ae8219b03d75c10cdc765cb':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:53:17 -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
e2f8d497ce am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'eac4b187d357eac61475c4dc6f673656e08e75a9':
 2012-02-28 11:53:49 -08:00
Jason Noguchi
f46bc318a2 am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit '743aceec4289508a8c514dae7319659cf7f278c4':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:52:56 -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
51e749a0fd 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:49:30 -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
Android Git Automerger
20801d679f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-28 10:49:07 -08:00
Svetoslav Ganov
c502f3b6de am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'c78f121716ff7d4cbf8a70519a266ae030942751':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:39:17 -08:00
Svetoslav Ganov
c1a5853a7c am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit '0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:38:39 -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
Svetoslav Ganov
3191d487f7 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:18 -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
962ccb6d93 am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit '7b6b81f89538d34415869710cbf464ba7c28bf9b':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 17:02:15 -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
Jean-Baptiste Queru
da12204605 am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" 
* commit '84dd87d992d88d1f407796a41bc8baa27dc97a81':
  Add stubs for better compatibility
 2012-02-27 16:03:41 -08:00
Jean-Baptiste Queru
2d0b5dad97 am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" 
* commit '015a248e631dc10fd6b52ae8773c0a3e0cf752af':
  Add stubs for better compatibility
 2012-02-27 16:01:31 -08:00
Jean-Baptiste Queru
6a22ed0a4b am 93df415c: Merge "Add stubs for better compatibility" 
* commit '93df415c1e0b4c99f274adb3629ce19abf1d0f53':
  Add stubs for better compatibility
 2012-02-27 15:58:50 -08:00
Jean-Baptiste Queru
47e81bd44d Merge "Add stubs for better compatibility" 2012-02-27 15:36:22 -08:00
Jean-Baptiste Queru
385062256f am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 
* commit 'bf8269238be1c5bde9f82a986fb128d9a80f250b':
  stagefright aacenc: Add prototypes for arm specific implementations of functions
 2012-02-27 13:12:42 -08:00
Jean-Baptiste Queru
669bca5e98 am b7913f70: am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 
* commit 'b7913f709b443df8d55ac2f6e080ab0ae38bcadf':
  stagefright amrwb: Make local const arrays static
 2012-02-27 13:12:39 -08:00
Jean-Baptiste Queru
13a48cd127 am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 
* commit '040c5b2ca716bef082506065606cb9708d051625':
  stagefright amrwb: Change a C++ style cast into a C style cast
 2012-02-27 13:12:37 -08:00
Jean-Baptiste Queru
aa4d424a89 am 50ee92e9: am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* commit '50ee92e972cf8a4cc56e95f44625eed649cc8196':
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
 2012-02-27 13:12:34 -08:00
Jean-Baptiste Queru
ec72265fdf am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" 
* commit 'a887ff9ae61f6cb925feb6e08643716ac28e35db':
  stagefright aacenc: Simplify the definition of __inline
 2012-02-27 13:12:32 -08:00
Jean-Baptiste Queru
d2905f09e8 am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit 'f7210cf55cafef55cca8cca65e1749b1dd088e77':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:12:29 -08:00
Jean-Baptiste Queru
237209c56d am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" 
* commit '3e61e413435ed745336c44d63fb6ffa6378e393b':
  stagefright aacenc: Remove a stray semicolon
 2012-02-27 13:12:26 -08:00
Jean-Baptiste Queru
0385a49c50 am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" 
* commit '4bcdeb86965d25697e2439a53f791cd140c8fe6b':
  stagefright amrwb: Make a global const array static
 2012-02-27 13:12:24 -08:00
Jean-Baptiste Queru
b8397d485d am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit 'bf5c5e5b03fda1b6397e95fa621ed9b0649a5360':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:12:21 -08:00
Jean-Baptiste Queru
89c93eb127 am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" 
* commit '18643e705a50f6c1c865e56e75d8403422a76d65':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
 2012-02-27 13:12:19 -08:00