Commit Graph

10474 Commits

Author SHA1 Message Date
Andrew Hsieh
61dd5c3a6c am d4f07cf5: am ec4fa913: am 87485cd8: am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit 'd4f07cf5f30ea5eae0cfe25a13c9375f33a0eb12':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:24:54 -07:00
Andrew Hsieh
d4f07cf5f3 am ec4fa913: am 87485cd8: am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit 'ec4fa91327ed785809418cbf2c42560011bd8cab':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:22:53 -07:00
Andrew Hsieh
ec4fa91327 am 87485cd8: am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit '87485cd82216de50dd0ff945ef70d8016a61d45e':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:19:45 -07:00
Andrew Hsieh
87485cd822 am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit 'fcc2452b5102b412ba300243e0e9d26c827515cf':
  Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:17:32 -07:00
Andrew Hsieh
fcc2452b51 Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S." 2012-08-28 23:08:56 -07:00
Eino-Ville Talvala
c296774352 am 9aaa620b: Merge "EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size." into jb-mr1-dev
* commit '9aaa620bdbb43b34d16ef81595ad1ffbcb3a863c':
  EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size.
2012-08-28 16:57:20 -07:00
Eino-Ville Talvala
9aaa620bdb Merge "EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size." into jb-mr1-dev 2012-08-28 16:55:45 -07:00
Andy Stadler
92841986ea am 00814d01: Fix .classpath
* commit '00814d01e44b8a04d3f46f5455d5644ee378e915':
  Fix .classpath
2012-08-28 15:08:52 -07:00
Andy Stadler
00814d01e4 Fix .classpath
Change-Id: Id897c83e926069b667d9f1d048f89bbe84445aeb
2012-08-28 14:59:13 -07:00
Eino-Ville Talvala
eb502a31bc EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size.
Change-Id: I5aa01501c36076a6260d47d2ae4bdc0365b49a8c
2012-08-28 13:40:46 -07:00
Chao-Ying Fu
75f8d8217e Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
Change-Id: I9b2d28c7c189d0f3a2ded694fadd0380cfd8e6e5
2012-08-28 13:21:42 -07:00
Adam Koch
a332dd45bd am 1e0f4c13: am f4db935d: am a4877aed: Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copie
* commit '1e0f4c136f45936217348c9ddfe34aed6bb215ec':
  Updating code sample for "displaying bitmaps efficiently" training class. Changes:  -Use updated versions of ImageWorker & ImageCache from I/O 2012 app  -Use copied DiskLruCache from system (rather than custom)  -Use copied AsyncTask from system (to keep behavior consistent)  -Ensure no strict mode violations or lint errors  -Other misc bug fixes  -Move single-use static methods in Utils to corresponding class
2012-08-28 07:49:13 -07:00
Adam Koch
1e0f4c136f am f4db935d: am a4877aed: Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copied AsyncTask f
* commit 'f4db935d3a104cfc828c888d4eb53a22c5b70424':
  Updating code sample for "displaying bitmaps efficiently" training class. Changes:  -Use updated versions of ImageWorker & ImageCache from I/O 2012 app  -Use copied DiskLruCache from system (rather than custom)  -Use copied AsyncTask from system (to keep behavior consistent)  -Ensure no strict mode violations or lint errors  -Other misc bug fixes  -Move single-use static methods in Utils to corresponding class
2012-08-28 07:47:06 -07:00
Adam Koch
f4db935d3a am a4877aed: Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copied AsyncTask from system (t
* commit 'a4877aed7654e8bc7f531593f75c1ae05ef3411c':
  Updating code sample for "displaying bitmaps efficiently" training class. Changes:  -Use updated versions of ImageWorker & ImageCache from I/O 2012 app  -Use copied DiskLruCache from system (rather than custom)  -Use copied AsyncTask from system (to keep behavior consistent)  -Ensure no strict mode violations or lint errors  -Other misc bug fixes  -Move single-use static methods in Utils to corresponding class
2012-08-28 07:45:17 -07:00
Adam Koch
a4877aed76 Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copied AsyncTask from system (to keep behavior consistent) -Ensure no strict mode violations or lint errors -Other misc bug fixes -Move single-use static methods in Utils to corresponding class" into jb-dev 2012-08-28 07:42:11 -07:00
The Android Open Source Project
ed5b5d4030 am 74cddad9: am 0c8806a4: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '74cddad9dfe6777a4ae047e070cf42ff6f0ace81':
2012-08-27 15:17:13 -07:00
The Android Open Source Project
74cddad9df am 0c8806a4: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '0c8806a484d6d78099d9af2782b76f495e4b3c05':
2012-08-27 15:13:21 -07:00
The Android Open Source Project
0c8806a484 Reconcile with jb-mr0-release - do not merge
Change-Id: Iaa7372f223059e828c2f256c83b8d6e7d39bd74a
2012-08-27 14:11:00 -07:00
The Android Automerger
bda8a3659a merge in jb-mr0-release history after reset to jb-dev 2012-08-23 21:30:13 -07:00
Andrew Hsieh
407c348153 am 121d1955: am 82043724: am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
* commit '121d1955f72918b2ad0b70f2e437252c268381fd':
  Support asm/sockios.h for MIPS.
2012-08-23 15:55:25 -07:00
Andrew Hsieh
121d1955f7 am 82043724: am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
* commit '82043724c4fea5bf063e6ed5b341816b3543b955':
  Support asm/sockios.h for MIPS.
2012-08-23 15:53:56 -07:00
Roman Nurik
b2ac2d803b am a5e5a459: am e7df2e3f: am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
* commit 'a5e5a459c06c4897dc61a508ba63e3ba239c7c3b':
  Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-23 14:14:10 -07:00
Roman Nurik
a5e5a459c0 am e7df2e3f: am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
* commit 'e7df2e3f6eb1f847cc362f70b062fc76e7825d30':
  Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-23 14:11:40 -07:00
Adam Koch
03ceb37f79 Updating code sample for "displaying bitmaps efficiently" training class.
Changes:
 -Use updated versions of ImageWorker & ImageCache from I/O 2012 app
 -Use copied DiskLruCache from system (rather than custom)
 -Use copied AsyncTask from system (to keep behavior consistent)
 -Ensure no strict mode violations or lint errors
 -Other misc bug fixes
 -Move single-use static methods in Utils to corresponding class

Change-Id: If21e045db1e1a80391169f3c9c9258d48345ab6b
2012-08-23 16:41:05 -04:00
Andy Stadler
3e2e762f64 am a770685d: Quick fixes for .classpath (eclipse happiness)
* commit 'a770685d55a6709a1c73f5937aeeed6227dae7df':
  Quick fixes for .classpath (eclipse happiness)
2012-08-23 12:00:58 -07:00
Andy Stadler
a770685d55 Quick fixes for .classpath (eclipse happiness)
Change-Id: Ibbef12b7b253bf07abdfcb1dc0ae141baf7a9315
2012-08-23 11:29:03 -07:00
Andrew Hsieh
82043724c4 am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
* commit '9cf4d01b7c46401ba632db2efa471bb262bc30aa':
  Support asm/sockios.h for MIPS.
2012-08-22 16:52:58 -07:00
Andrew Hsieh
9cf4d01b7c am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
* commit '51f72cc1bdd6f2624d5d625716ca3767cd3c3a63':
  Support asm/sockios.h for MIPS.
2012-08-22 16:51:01 -07:00
Andrew Hsieh
51f72cc1bd Merge "Support asm/sockios.h for MIPS." 2012-08-22 16:38:02 -07:00
Roman Nurik
e7df2e3f6e am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
* commit 'f6457d0548f499f77c996d13cc43115e448aa437':
  Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-22 16:21:36 -07:00
The Android Open Source Project
5c947e5b32 Reconcile with jb-mr1-release - do not merge
Change-Id: I33319cd5922c68dc837e732a183041520a4ea634
2012-08-22 15:34:49 -07:00
Chao-Ying Fu
4cad8d6fdf Support asm/sockios.h for MIPS.
Change-Id: I5ae75b0a8c2ff5698ca46f02bb371e710fb1fee0
2012-08-22 13:37:26 -07:00
Roman Nurik
f6457d0548 Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev 2012-08-22 11:50:43 -07:00
Roman Nurik
d80ee02011 Retroactively add EffectiveNavigation and TabCompat sample code.
This sample code was launched with the Implementing Effective Navigation and
Creating Backward-Compatible UIs training classes, but the source was never
added to AOSP. This retroactively adds the source, unmodified.

Change-Id: If6face5a0548107f7fd273e466b1ced2790f4f3a
2012-08-22 08:05:28 -07:00
The Android Automerger
4d58d5697d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-22 06:33:24 -07:00
Andrew Hsieh
a99b68e2d7 am 42c4770b: am c80c3a8f: am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
* commit '42c4770bc8d28927e969ec627027645582d4fa06':
  Update malloc.h
2012-08-22 01:24:21 -07:00
Andrew Hsieh
42c4770bc8 am c80c3a8f: am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
* commit 'c80c3a8fd8bbbe4e131d6eda7bb5d9083512a743':
  Update malloc.h
2012-08-22 01:22:40 -07:00
Andrew Hsieh
c80c3a8fd8 am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
* commit '17f2af7e1f08440814ade84898f6506e15fea15c':
  Update malloc.h
2012-08-22 01:21:14 -07:00
Andrew Hsieh
17f2af7e1f am a2b32b34: Merge "Update malloc.h"
* commit 'a2b32b34220a1bdea566502da1e3254c90f62f16':
  Update malloc.h
2012-08-22 01:19:57 -07:00
Andrew Hsieh
a2b32b3422 Merge "Update malloc.h" 2012-08-22 01:08:42 -07:00
Andrew Hsieh
b155bac32b am 9f93e880: am 68d8ac7c: am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
* commit '9f93e880aa60564e71da7f5c12a9cbc6df355334':
  Support getrlimit and setrlimit for MIPS.
2012-08-21 20:00:34 -07:00
Andrew Hsieh
e2a50f3ae8 am 1aacb8db: am 9f4549c7: am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
* commit '1aacb8dbbbf1c4d205963efc4b6429ad6367ce59':
  Add a .note.android.ident section to Android ELF binaries
2012-08-21 20:00:33 -07:00
Andrew Hsieh
9f93e880aa am 68d8ac7c: am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
* commit '68d8ac7ce5b14fe589f3c555eea2bbdc7016d8e0':
  Support getrlimit and setrlimit for MIPS.
2012-08-21 19:59:40 -07:00
Andrew Hsieh
1aacb8dbbb am 9f4549c7: am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
* commit '9f4549c7db3e2f08bf7a166d4eda2e935ebbf21b':
  Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:59:38 -07:00
Andrew Hsieh
68d8ac7ce5 am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
* commit 'ad00822fd4b907da9162c9c1497bebc534c95315':
  Support getrlimit and setrlimit for MIPS.
2012-08-21 19:57:15 -07:00
Andrew Hsieh
9f4549c7db am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
* commit 'bfb393846b99f4c5f7f3c5a661b64985cda39c78':
  Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:57:14 -07:00
Andrew Hsieh
ad00822fd4 am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
* commit '581a749fb1c313dcc3d80303bcc9e129e89fdec1':
  Support getrlimit and setrlimit for MIPS.
2012-08-21 19:55:57 -07:00
Andrew Hsieh
bfb393846b am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
* commit '143949daba4c1f040753a9456a5e8d7e505e5045':
  Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:55:56 -07:00
Andrew Hsieh
581a749fb1 Merge "Support getrlimit and setrlimit for MIPS." 2012-08-21 19:48:50 -07:00
Andrew Hsieh
143949daba Merge "Add a .note.android.ident section to Android ELF binaries" 2012-08-21 19:48:16 -07:00