Commit Graph

42172 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
dd5d00f854 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
965306a3df 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
34f184af06 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
d49960f16b 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
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
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
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
1d58e77773 am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.
* commit 'd31da0a670a60722339faa18e1147adb9c14532d':
2012-02-29 13:30:51 -08:00
Eric Fischer
4cd9be547f 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
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
Eric Fischer
2d31bdb4b8 am fb393f8b: Mark configuration strings as not translatable.
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
2012-02-29 13:26:08 -08:00
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