Commit Graph

2678 Commits

Author SHA1 Message Date
Elliott Hughes
1510795fec Merge "Upgrade to tzdata2012e." 2012-08-03 12:30:18 -07:00
Elliott Hughes
094651335e Upgrade to tzdata2012e.
Includes this change:

  * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14.
    (Thanks to Steffen Thorsen.)

Change-Id: I51bfab759f424b90daeb1960c6cfb2b55b78ff46
2012-08-03 12:26:06 -07:00
David Turner
65f12237b8 am c7813c08: am d7552a31: am 2f2b7212: am 16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit 'c7813c08570a5e6ef3e410973d7f4b4befebee77':
  Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:04:06 -07:00
David Turner
c7813c0857 am d7552a31: am 2f2b7212: am 16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit 'd7552a3101affbc531f3c33deca10c28417a864c':
  Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:02:00 -07:00
David Turner
d7552a3101 am 2f2b7212: am 16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit '2f2b72120489d9e7e67a97a059a731aa72a34f72':
  Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:00:03 -07:00
David Turner
2f2b721204 am 16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
* commit '16d40217d05a1d9ad8ec475ce5f68c35bbef7029':
  Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 04:57:56 -07:00
David Turner
16d40217d0 Merge "Fix the clang build: this compiler doesn't support the gnu_inline function attribute" 2012-08-03 04:40:37 -07:00
Shih-wei Liao
4f1f149c37 Fix the clang build: this compiler doesn't support the gnu_inline function attribute
Recent clang compiler doesn't have gnu_inline working. When frameworks/rs
is compiled with clang instead of gcc, it no longer works. Will be fixed
by this patch.

Change-Id: I8b281a1305151909e18958b73914ea27343cb4cd
2012-08-03 04:38:15 -07:00
Elliott Hughes
889a706637 am df7aa950: am 9b6a4538: am 0ce92b96: am 1e304a3b: Merge "[MIPS] Support for TLS register"
* commit 'df7aa95031f5f99ba3fc95956c38bf7ffd037ab4':
  [MIPS] Support for TLS register
2012-08-02 18:51:38 -07:00
Elliott Hughes
df7aa95031 am 9b6a4538: am 0ce92b96: am 1e304a3b: Merge "[MIPS] Support for TLS register"
* commit '9b6a45386555a11aa1c7f473b21c480b4a158ea7':
  [MIPS] Support for TLS register
2012-08-02 18:49:12 -07:00
Elliott Hughes
9b6a453865 am 0ce92b96: am 1e304a3b: Merge "[MIPS] Support for TLS register"
* commit '0ce92b9625c5d0cc4e72047e6c8759c4cc079dcb':
  [MIPS] Support for TLS register
2012-08-02 18:48:04 -07:00
Elliott Hughes
0ce92b9625 am 1e304a3b: Merge "[MIPS] Support for TLS register"
* commit '1e304a3bce347da08f0f9409829d911493bad1bb':
  [MIPS] Support for TLS register
2012-08-02 18:45:56 -07:00
Elliott Hughes
1e304a3bce Merge "[MIPS] Support for TLS register" 2012-08-02 18:33:20 -07:00
Elliott Hughes
bdcc14d721 Remove an awkward #include that is no longer upstream.
This was causing trouble in https://android-review.googlesource.com/#/c/37590/.

Change-Id: Ib7cb4fbaef6e9c1470c59f67d24bd24c7ce90bcc
2012-08-02 18:12:36 -07:00
Raghu Gandham
6437eac15a MIPS support to sys/ headers
Change-Id: I32207a1d918e4842da341f6b242ae39c69a83b03
2012-08-02 18:03:54 -07:00
Raghu Gandham
1c30398143 [MIPS] Support for TLS register
Change-Id: I6b5194e5e379b573e3b1203d8015e20fb3edd647
Signed-off-by: Chris Dearman <chris@mips.com>
2012-08-02 18:01:05 -07:00
Elliott Hughes
855a3779be am e5bd6efa: am f94effda: am fd4685be: am 52f3ee96: Merge "MIPS support for libc."
* commit 'e5bd6efa0805a743ed6c2022c65c5a8ff79d7310':
  MIPS support for libc.
2012-08-02 16:39:18 -07:00
Elliott Hughes
e5bd6efa08 am f94effda: am fd4685be: am 52f3ee96: Merge "MIPS support for libc."
* commit 'f94effdab27f2bbe3f079d454e71ca9e60166318':
  MIPS support for libc.
2012-08-02 16:37:07 -07:00
Elliott Hughes
f94effdab2 am fd4685be: am 52f3ee96: Merge "MIPS support for libc."
* commit 'fd4685be87fa2c957d4f95deb75a6ba763fd7339':
  MIPS support for libc.
2012-08-02 16:34:57 -07:00
Elliott Hughes
fd4685be87 am 52f3ee96: Merge "MIPS support for libc."
* commit '52f3ee962b384bf247638adb653f0024ce92a895':
  MIPS support for libc.
2012-08-02 16:32:47 -07:00
Elliott Hughes
52f3ee962b Merge "MIPS support for libc." 2012-08-02 16:14:47 -07:00
Elliott Hughes
36c27b547e am 79d834b5: am 82dcfee5: am 19e30fc4: am a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit '79d834b5aba80407046ece1377033c8d48fbd427':
  Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:13:40 -07:00
Elliott Hughes
967c9f7fcb am 422067eb: am c0719660: am 670766c5: am 994935f6: Merge "Error numbers are target specific."
* commit '422067eb3ceba3c39903df5562cb8997b40d61c4':
  Error numbers are target specific.
2012-08-02 16:13:38 -07:00
Elliott Hughes
79d834b5ab am 82dcfee5: am 19e30fc4: am a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit '82dcfee5fcd5243ff9df2aa7497e83dd567b6f95':
  Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:10:34 -07:00
Elliott Hughes
422067eb3c am c0719660: am 670766c5: am 994935f6: Merge "Error numbers are target specific."
* commit 'c07196605cc9bb55af2173832536e342e902d2c5':
  Error numbers are target specific.
2012-08-02 16:10:32 -07:00
Elliott Hughes
82dcfee5fc am 19e30fc4: am a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit '19e30fc41030ab0524134b097dfef88baea14f4a':
  Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:07:41 -07:00
Elliott Hughes
c07196605c am 670766c5: am 994935f6: Merge "Error numbers are target specific."
* commit '670766c5649086ad5ffe26c0deadeb460139202f':
  Error numbers are target specific.
2012-08-02 16:07:40 -07:00
Raghu Gandham
405b8029a6 MIPS support for libc.
Change-Id: I2864dea04b3faf2d919165dcaa600af5b16c41c8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-02 16:07:26 -07:00
Elliott Hughes
19e30fc410 am a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
* commit 'a1c0f08d3ccbe5c40be53903615e59113ade4922':
  Fix a ENOTUP/ENOTSUP typo.
2012-08-02 15:59:22 -07:00
Elliott Hughes
670766c564 am 994935f6: Merge "Error numbers are target specific."
* commit '994935f64cdbd7553ecbfbd15d4e4dd429277409':
  Error numbers are target specific.
2012-08-02 15:59:21 -07:00
Elliott Hughes
a1c0f08d3c Merge "Fix a ENOTUP/ENOTSUP typo." 2012-08-02 15:46:44 -07:00
Elliott Hughes
fccadc38bd am 0b8dda0e: am 673c092e: am 54830578: am f34ecbff: Merge "MIPS support to the linker"
* commit '0b8dda0e422e9669af06d9e6d264fb14652b23b5':
  MIPS support to the linker
2012-08-02 15:45:45 -07:00
Elliott Hughes
ecb53eab4b Fix a ENOTUP/ENOTSUP typo.
Change-Id: Ifa347a09a2aa1f505965ae7c1383fd0caf95793c
2012-08-02 15:45:04 -07:00
Elliott Hughes
0b8dda0e42 am 673c092e: am 54830578: am f34ecbff: Merge "MIPS support to the linker"
* commit '673c092e0fc40afa291086d06ab39a6d22e7f894':
  MIPS support to the linker
2012-08-02 15:43:44 -07:00
Elliott Hughes
994935f64c Merge "Error numbers are target specific." 2012-08-02 15:42:48 -07:00
Elliott Hughes
673c092e0f am 54830578: am f34ecbff: Merge "MIPS support to the linker"
* commit '5483057817d071140d94299452b31881c4a6e748':
  MIPS support to the linker
2012-08-02 15:39:45 -07:00
Brian Muramatsu
963a8fc036 am fa22fd9f: am 402ec708: Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
* commit 'fa22fd9f817e0fe49e0f7524f5589710f1140d8f':
  Update msm_camera.h to version that supports instance handle based lookup
2012-08-02 15:24:34 -07:00
Brian Muramatsu
fa22fd9f81 am 402ec708: Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
* commit '402ec70899909f0b32c1ac304e3f26434424a3b3':
  Update msm_camera.h to version that supports instance handle based lookup
2012-08-02 15:22:34 -07:00
Brian Muramatsu
402ec70899 Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev 2012-08-02 15:20:58 -07:00
The Android Open Source Project
3a6e56534d am d7b3cc0c: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'd7b3cc0c69b02cad4090a0068349f1ab83e3112f':
2012-08-02 15:09:18 -07:00
Elliott Hughes
5483057817 am f34ecbff: Merge "MIPS support to the linker"
* commit 'f34ecbff0dd2b8e6961020b8c91260f33d4cf3ea':
  MIPS support to the linker
2012-08-02 14:57:52 -07:00
Elliott Hughes
f34ecbff0d Merge "MIPS support to the linker" 2012-08-02 14:43:55 -07:00
Raghu Gandham
d7daacb463 MIPS support to the linker
Change-Id: I37ec2d6c51d82bb9e9dbfef4b38c85366bead255
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
2012-08-02 14:39:50 -07:00
The Android Open Source Project
d7b3cc0c69 Reconcile with jb-mr1-release - do not merge
Change-Id: Ia1f59a486efa98614b8f97f9432e1040c90d2ec7
2012-08-02 11:26:02 -07:00
The Android Automerger
248321bb6f merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-02 07:41:45 -07:00
Chris Dearman
da2611084f Error numbers are target specific.
Use the system supplied error numbers when mapping error numbers to messages.

Change-Id: I520556fa3e2ff668fdc4eda36ad31491fbb48ea8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-01 17:53:07 -07:00
The Android Open Source Project
2a258c9f2d am 8f2f2466: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '8f2f24661870c349a19bff71d85ed5eb897c7c9f':
2012-08-01 14:50:42 -07:00
The Android Open Source Project
8f2f246618 Reconcile with jb-mr1-release - do not merge
Change-Id: I2295284f2cccfc72a25c2675762cc613faa337a4
2012-08-01 13:11:49 -07:00
The Android Automerger
617a5ee417 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-01 07:10:06 -07:00
Ajay Dudani
cbbe9528ca Update msm_camera.h to version that supports instance handle based lookup
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
2012-07-31 21:32:50 -07:00