OSDN Git Service
Alex Ray [Mon, 24 Jun 2013 18:28:05 +0000 (11:28 -0700)]
camera3: Add flush
Flush is used to quiesce a camera device as quickly as possible, which
can be used to deal with a pathological client (requests a frame
duration of hours then dying) as well as speed up stream configuration
changes when the outstanding requests data isn't required.
Change-Id: Ie822efae8c705bd64d63c0eab7e9c291ecb570ef
Alex Ray [Fri, 14 Jun 2013 22:09:30 +0000 (15:09 -0700)]
camera3: Pass consumer information in configure_streams
HALs seem to need to know the gralloc usage flags of the opposite
endpoint (producer/consumer) of a stream at configure time.
Instead of adding another call to pass stream information, we just
pass the usage flags in the existing usage field.
Change-Id: I745baf2c4dd9123273d811b9bd52ae68c854b70c
Jaikumar Ganesh [Tue, 11 Jun 2013 21:01:37 +0000 (21:01 +0000)]
Merge "Fused Location Provider HAL interface."
Jaikumar Ganesh [Tue, 4 Jun 2013 22:43:07 +0000 (15:43 -0700)]
Fused Location Provider HAL interface.
Fused location allows for fusion of information from
multiple source like GPS, Wifi, Cell, Bluetooth, Sensors etc
to get a location. Doing this in hardware is useful because
it can be done completely in the baseband without waking up the AP.
Change-Id: Ib007839ff51b7e87e8d62f0ff9fea1c4a474b1d1
Alex Ray [Sat, 27 Apr 2013 02:32:29 +0000 (19:32 -0700)]
modules: camera: No-op result submission with request
Change-Id: If4e377ba0ac327cc02ac2b9765ce5d406b8960a8
Alex Ray [Fri, 26 Apr 2013 21:47:08 +0000 (14:47 -0700)]
modules: camera: Input buffer reprocessing scaffolding
Change-Id: I158ba833549aee47ca3be5673f6f5d33e455ef59
Alex Ray [Wed, 20 Mar 2013 20:20:02 +0000 (13:20 -0700)]
modules: camera: memoize request settings metadata
Change-Id: I19c3a6a55a42e60f627702cd4a995664a0dfc4d2
The Android Open Source Project [Thu, 23 May 2013 15:06:40 +0000 (08:06 -0700)]
am
94a155a4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
94a155a41a562db983e4aa9c51bbeb39438885de':
The Android Open Source Project [Thu, 23 May 2013 15:05:38 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I31743534d947232b1cce9b36877c58d43e459d08
The Android Automerger [Thu, 23 May 2013 12:55:23 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Wed, 22 May 2013 16:22:45 +0000 (09:22 -0700)]
am
b3d4dae4: am
73dba5e0: Camera3: Document missing AF transitions.
* commit '
b3d4dae427ea06a5ef21fda013694603a1c6ebcc':
Camera3: Document missing AF transitions.
Eino-Ville Talvala [Wed, 22 May 2013 16:20:06 +0000 (09:20 -0700)]
am
73dba5e0: Camera3: Document missing AF transitions.
* commit '
73dba5e043d44910a8cee4def742f58607fc5894':
Camera3: Document missing AF transitions.
Eino-Ville Talvala [Tue, 21 May 2013 23:29:14 +0000 (16:29 -0700)]
Camera3: Document missing AF transitions.
Bug:
9075581
Change-Id: I7688cee904987f404b4ab7ff0e5212182f85a271
The Android Open Source Project [Thu, 16 May 2013 12:48:25 +0000 (05:48 -0700)]
am
9b5408ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
9b5408ffd6f6100e6a62d99983e1524c03ac1304':
The Android Open Source Project [Thu, 16 May 2013 12:43:48 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1e981404c88dd61fe418ae799d599ae4d072555c
The Android Automerger [Wed, 15 May 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Brian Carlstrom [Tue, 14 May 2013 22:59:22 +0000 (15:59 -0700)]
am
ee37c3a8: am
63b64337: Add larger RSA key sizes
* commit '
ee37c3a845ea1de5508ad3059457117170a8e5d5':
Add larger RSA key sizes
Brian Carlstrom [Tue, 14 May 2013 22:56:46 +0000 (15:56 -0700)]
am
63b64337: Add larger RSA key sizes
* commit '
63b64337fbaa10b282f85a7e887b40ced6d6d632':
Add larger RSA key sizes
Brian Carlstrom [Tue, 14 May 2013 22:20:28 +0000 (15:20 -0700)]
Add larger RSA key sizes
Bug:
8734191
Change-Id: I82413505b32d5cdd2c4330c63d5f66e6b7e34634
Alex Ray [Fri, 1 Mar 2013 09:32:21 +0000 (01:32 -0800)]
modules: camera: Add buffer registration scaffold
Change-Id: Ic1d20dd7f93a0ca3cd2c3af3b33a7a9df47b5e89
Alex Ray [Mon, 13 May 2013 19:47:22 +0000 (19:47 +0000)]
Merge "modules: camera: Add Streams"
The Android Automerger [Thu, 9 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Wed, 8 May 2013 22:05:14 +0000 (15:05 -0700)]
am
f20cae6b: am
4ed61b22: Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev
* commit '
f20cae6b94b7714e76b284f4167bb238e3aee2d2':
Move virtual displays out of HWC 1.2, mark experimental
Eino-Ville Talvala [Wed, 8 May 2013 22:04:16 +0000 (15:04 -0700)]
am
df336e2d: am
c6ff6c40: Merge "gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit '
df336e2de4a57cc29815f4cdc75ee975676997d5':
gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888
Eino-Ville Talvala [Wed, 8 May 2013 22:03:38 +0000 (15:03 -0700)]
am
c2f433d0: am
b605944f: Camera3: Document cropping behavior
* commit '
c2f433d00ce5e5c56094d78808e580c426d728cf':
Camera3: Document cropping behavior
Jesse Hall [Wed, 8 May 2013 20:57:55 +0000 (13:57 -0700)]
am
4ed61b22: Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev
* commit '
4ed61b22e046ed544f6afb50abd0af25d478d8b1':
Move virtual displays out of HWC 1.2, mark experimental
Jesse Hall [Wed, 8 May 2013 20:53:34 +0000 (20:53 +0000)]
Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev
Eino-Ville Talvala [Wed, 8 May 2013 16:56:53 +0000 (09:56 -0700)]
am
c6ff6c40: Merge "gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit '
c6ff6c40dd4408c7aac0e079a6d26359902c240f':
gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888
Eino-Ville Talvala [Wed, 8 May 2013 16:55:15 +0000 (16:55 +0000)]
Merge "gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
The Android Automerger [Wed, 8 May 2013 12:55:35 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Wed, 8 May 2013 00:05:52 +0000 (17:05 -0700)]
am
b605944f: Camera3: Document cropping behavior
* commit '
b605944f0a0590d0f31d48a14eaf8e6a075ddba1':
Camera3: Document cropping behavior
Jesse Hall [Wed, 20 Mar 2013 17:11:10 +0000 (10:11 -0700)]
Move virtual displays out of HWC 1.2, mark experimental
Bug:
8384764
Change-Id: I388ff3f46893b395e5c4187242f51ad7bb58da24
Eino-Ville Talvala [Mon, 6 May 2013 21:05:05 +0000 (14:05 -0700)]
gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888
Bug:
8734880
Change-Id: I0cca7fd1965e1547991be06b6b18d6302dbe8670
Alex Ray [Fri, 1 Mar 2013 00:04:35 +0000 (16:04 -0800)]
modules: camera: Add Streams
Adds a Stream object, and configureStreams support in parsing the
provided stream_array. Streams are naively setup for sync-less software
painting.
Change-Id: Ibbd90e3e2c7fa984dd5d2dcbd4da7bf4dad43aa1
Eino-Ville Talvala [Mon, 29 Apr 2013 22:26:16 +0000 (15:26 -0700)]
Camera3: Document cropping behavior
Redefined somewhat from HAL2, to be simpler for everyone.
Bug:
8756080
Change-Id: I6b7608c74c06cc6a0bfe07997444e3b07c3edb10
Alex Ray [Tue, 30 Apr 2013 15:31:51 +0000 (08:31 -0700)]
am
1a0be33f: am
74b8c4e5: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
* commit '
1a0be33faa697ed455dfdf8a398b1481e518b1a3':
gralloc: add lock_ycbcr method
Kenny Root [Tue, 30 Apr 2013 15:31:40 +0000 (08:31 -0700)]
am
03fa29db: am
eca8b3cd: keymaster_test: simulate binder pages
* commit '
03fa29dbc6a0048c98de22444f5d686b1bb9eb06':
keymaster_test: simulate binder pages
The Android Automerger [Tue, 30 Apr 2013 12:56:08 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Alex Ray [Mon, 29 Apr 2013 19:24:49 +0000 (12:24 -0700)]
modules: camera: Add scoped trace helper
This c++ helper class is normally provided by frameworks/native's
libutils, but cannot be used from the context of a hardware module. For
now just add the required functionality locally in the hardware module.
Change-Id: I5b399cbeb1c017a95baf19456dbf20569e677fbe
Alex Ray [Tue, 5 Mar 2013 22:37:28 +0000 (14:37 -0800)]
modules: camera: remove unused variable
Change-Id: Ic21cd58a750411167ef4b060e8d3abc295edc83d
Alex Ray [Mon, 29 Apr 2013 21:16:10 +0000 (14:16 -0700)]
modules: camera: fix dump log message
Change-Id: I2511653b3d2d21d03785ea220c760e2b65f0b035
Alex Ray [Mon, 29 Apr 2013 19:11:54 +0000 (12:11 -0700)]
am
74b8c4e5: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
* commit '
74b8c4e57b6d0db6bdb79d298ef8bb19cad3be2e':
gralloc: add lock_ycbcr method
Alex Ray [Mon, 29 Apr 2013 19:10:07 +0000 (19:10 +0000)]
Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
Kenny Root [Mon, 29 Apr 2013 18:27:55 +0000 (11:27 -0700)]
am
eca8b3cd: keymaster_test: simulate binder pages
* commit '
eca8b3cdf0f906062285d03a0d08e3104625df94':
keymaster_test: simulate binder pages
The Android Automerger [Mon, 29 Apr 2013 12:55:52 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Kenny Root [Fri, 26 Apr 2013 23:46:01 +0000 (16:46 -0700)]
keymaster_test: simulate binder pages
Make sure pages we use in the unit tests are read-only maps from
/dev/zero
Bug:
8736730
Change-Id: I15d816a8fd3dd7313277c9f5c44c4a102a899d03
Alex Ray [Wed, 20 Mar 2013 06:13:56 +0000 (23:13 -0700)]
gralloc: add lock_ycbcr method
This method is meant for locking the flexible YCbCr format documented in
the system graphics header.
Bug:
8734880
Change-Id: I45ae8937dcc16d0ae8a204a136121f78b4cc51e0
Eino-Ville Talvala [Thu, 25 Apr 2013 20:50:36 +0000 (13:50 -0700)]
am
ddf31fd6: am
75f0d0ec: Merge "Camera3: Clarify SHUTTER timing, ownership of request contents" into jb-mr2-dev
* commit '
ddf31fd62a10d4fea6cdd2c4d3723257d0f53a66':
Camera3: Clarify SHUTTER timing, ownership of request contents
Eino-Ville Talvala [Thu, 25 Apr 2013 19:30:37 +0000 (12:30 -0700)]
am
75f0d0ec: Merge "Camera3: Clarify SHUTTER timing, ownership of request contents" into jb-mr2-dev
* commit '
75f0d0ec0db5ab01e0937e4068c4be9e799e9853':
Camera3: Clarify SHUTTER timing, ownership of request contents
Eino-Ville Talvala [Thu, 25 Apr 2013 19:28:27 +0000 (19:28 +0000)]
Merge "Camera3: Clarify SHUTTER timing, ownership of request contents" into jb-mr2-dev
The Android Automerger [Wed, 24 Apr 2013 12:55:34 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Etienne Le Grand [Tue, 23 Apr 2013 22:02:08 +0000 (15:02 -0700)]
am
4daa2f8e: am
7a813e84: Modify sign of bias in uncalibrated magnetometer
* commit '
4daa2f8ea99631655fa469b3af33c0d3477dd42b':
Modify sign of bias in uncalibrated magnetometer
Etienne Le Grand [Tue, 23 Apr 2013 21:38:46 +0000 (14:38 -0700)]
am
7a813e84: Modify sign of bias in uncalibrated magnetometer
* commit '
7a813e844252612cd8f7fa4e391825477d8b63d0':
Modify sign of bias in uncalibrated magnetometer
Etienne Le Grand [Tue, 23 Apr 2013 21:22:23 +0000 (14:22 -0700)]
Modify sign of bias in uncalibrated magnetometer
bug
8632692
Change-Id: If92f0030e53d41a7d0bc3c3b003f5eb939123945
Eino-Ville Talvala [Mon, 22 Apr 2013 21:19:21 +0000 (14:19 -0700)]
Camera3: Clarify SHUTTER timing, ownership of request contents
- Clarify ownership of fence file descriptors, including in case of
errors.
- Make it clear notify SHUTTER must be called before the first
process_capture_result.
Change-Id: I644054a7a055c2e8a6a164c5ab6439ef2a0d1df1
The Android Automerger [Mon, 22 Apr 2013 12:55:46 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Fri, 19 Apr 2013 17:41:35 +0000 (10:41 -0700)]
am
a3f1b92b: am
29156e43: Merge "Make raw tests optional, add sanity checks for format/resolutions static info." into jb-mr2-dev
* commit '
a3f1b92b774c07bcbd9437142718d8faa99ba4c2':
Make raw tests optional, add sanity checks for format/resolutions static info.
Igor Murashkin [Fri, 19 Apr 2013 17:38:32 +0000 (10:38 -0700)]
am
29156e43: Merge "Make raw tests optional, add sanity checks for format/resolutions static info." into jb-mr2-dev
* commit '
29156e437858087c393c21e0502a1652fb77dd13':
Make raw tests optional, add sanity checks for format/resolutions static info.
Igor Murashkin [Fri, 19 Apr 2013 17:34:04 +0000 (17:34 +0000)]
Merge "Make raw tests optional, add sanity checks for format/resolutions static info." into jb-mr2-dev
Alex Ray [Thu, 18 Apr 2013 22:13:47 +0000 (15:13 -0700)]
am
071d9e4b: am
a7c66429: Revert "gralloc: add lock_ycbcr method"
* commit '
071d9e4b82a3d280b61ce8bb0a969b319465cd76':
Revert "gralloc: add lock_ycbcr method"
Alex Ray [Thu, 18 Apr 2013 22:10:15 +0000 (15:10 -0700)]
am
a7c66429: Revert "gralloc: add lock_ycbcr method"
* commit '
a7c66429136efe294240ebe96cfe67881514849f':
Revert "gralloc: add lock_ycbcr method"
Alex Ray [Thu, 18 Apr 2013 22:02:57 +0000 (15:02 -0700)]
Revert "gralloc: add lock_ycbcr method"
This reverts commit
baa47f353a318b9f498f093e70d57e4f43f7c345.
Alex Ray [Thu, 18 Apr 2013 20:48:34 +0000 (13:48 -0700)]
am
d86875fb: am
c82a0e77: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
* commit '
d86875fb8dd4178937858fccdd6fabc392fbabb5':
gralloc: add lock_ycbcr method
Alex Ray [Thu, 18 Apr 2013 20:42:22 +0000 (13:42 -0700)]
am
c82a0e77: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
* commit '
c82a0e7792190a2c02826dccf8a77473c6fce980':
gralloc: add lock_ycbcr method
Alex Ray [Thu, 18 Apr 2013 20:39:42 +0000 (20:39 +0000)]
Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
Matthew Xie [Thu, 18 Apr 2013 18:37:12 +0000 (11:37 -0700)]
am
b98207b0: am
47a0ead4: Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev
* commit '
b98207b0b657f7a45f23ab11f89cff6987f6af15':
LE (1/3): Add application ID to connection callback
Matthew Xie [Thu, 18 Apr 2013 18:33:21 +0000 (11:33 -0700)]
am
47a0ead4: Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev
* commit '
47a0ead467b563c97e2813c292e90f31e650c640':
LE (1/3): Add application ID to connection callback
Matthew Xie [Thu, 18 Apr 2013 18:31:12 +0000 (18:31 +0000)]
Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev
Igor Murashkin [Thu, 18 Apr 2013 17:09:16 +0000 (10:09 -0700)]
Make raw tests optional, add sanity checks for format/resolutions static info.
Bug:
8654456
Change-Id: Iadd0d3c326d595dce2822a9bd3ff33ce8e8f6a36
Andre Eisenbach [Wed, 10 Apr 2013 18:18:03 +0000 (11:18 -0700)]
LE (1/3): Add application ID to connection callback
Bug:
8589393
Change-Id: I1c9d83b988cad71c5652ecf4025fdc6f650fff42
The Android Open Source Project [Mon, 15 Apr 2013 17:53:15 +0000 (10:53 -0700)]
am
231d515e: Reconcile with jb-mr2-release - do not merge
* commit '
231d515e861fe83ae12faeb8f3298cd1e332ebab':
The Android Open Source Project [Mon, 15 Apr 2013 17:46:15 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic6e89b81ef0da701d1be72f10bf5f94cd26f4bf8
The Android Automerger [Mon, 15 Apr 2013 12:56:01 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:36:58 +0000 (18:36 -0700)]
am
3589c0ef: am
827e137b: Merge "Update the test output path." into jb-mr2-dev
* commit '
3589c0ef736e3e5f0ee07f756cd83a5f7c281236':
Update the test output path.
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:33:27 +0000 (18:33 -0700)]
am
827e137b: Merge "Update the test output path." into jb-mr2-dev
* commit '
827e137bb168a6cd77011e7a66a2a4250e25d800':
Update the test output path.
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:30:02 +0000 (01:30 +0000)]
Merge "Update the test output path." into jb-mr2-dev
Yu Shan Emily Lau [Fri, 12 Apr 2013 21:50:20 +0000 (14:50 -0700)]
Update the test output path.
In order for the automated test to pick up the test.
The output must be in /data/nativetest.
Change-Id: I453805a1d186fec014e34b3d37a1e8bc62b2a5ac
The Android Open Source Project [Thu, 11 Apr 2013 14:50:51 +0000 (07:50 -0700)]
am
719842ff: Reconcile with jb-mr2-release - do not merge
* commit '
719842ffa78f9239fb737e909eb8dfe76cb8308b':
The Android Open Source Project [Thu, 11 Apr 2013 14:45:17 +0000 (07:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6a6767350c2db72e397b4a7f39a1bf00db9560c0
The Android Automerger [Thu, 11 Apr 2013 12:55:44 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Wed, 10 Apr 2013 22:34:42 +0000 (15:34 -0700)]
am
37978d7c: am
9fafa4a3: Merge "Camera3: Allow many calls to process_capture_result per request" into jb-mr2-dev
* commit '
37978d7c62d00880552eb5022acde6380862213d':
Camera3: Allow many calls to process_capture_result per request
Eino-Ville Talvala [Wed, 10 Apr 2013 22:31:09 +0000 (15:31 -0700)]
am
9fafa4a3: Merge "Camera3: Allow many calls to process_capture_result per request" into jb-mr2-dev
* commit '
9fafa4a33d01f729078fb6800eaa951bb505e36a':
Camera3: Allow many calls to process_capture_result per request
Eino-Ville Talvala [Wed, 10 Apr 2013 22:27:57 +0000 (22:27 +0000)]
Merge "Camera3: Allow many calls to process_capture_result per request" into jb-mr2-dev
The Android Open Source Project [Wed, 10 Apr 2013 17:08:29 +0000 (10:08 -0700)]
am
32bd67c4: Reconcile with jb-mr2-release - do not merge
* commit '
32bd67c444d7ecfeaac961b73069c413f59fc7a6':
The Android Open Source Project [Wed, 10 Apr 2013 17:05:46 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id2611195c2e18dc743298976a1f97ecba1924974
The Android Automerger [Wed, 10 Apr 2013 12:56:21 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 06:25:12 +0000 (23:25 -0700)]
Ying Wang [Wed, 10 Apr 2013 05:28:59 +0000 (22:28 -0700)]
Ying Wang [Wed, 10 Apr 2013 04:57:28 +0000 (21:57 -0700)]
Add liblog
Bug:
8580410
Change-Id: I24645233148f70c57d2f2b3a46952cb2a1aea9ba
Alex Ray [Wed, 20 Mar 2013 06:13:56 +0000 (23:13 -0700)]
gralloc: add lock_ycbcr method
This method is meant for locking the flexible YCbCr format documented in
the system graphics header.
Change-Id: I98b196bab06f1d05fce725da44760180ce487034
Eino-Ville Talvala [Wed, 3 Apr 2013 22:18:20 +0000 (15:18 -0700)]
Camera3: Allow many calls to process_capture_result per request
Allow the HAL to split the capture result across multiple calls to
process_capture_result, so that when the sync framework cannot be
used, some output buffers can still be returned later than others.
Change-Id: Iea7f77a3d28daac3a94045ab4566f677aa53a7f9
The Android Open Source Project [Mon, 8 Apr 2013 20:40:41 +0000 (13:40 -0700)]
am
01b166e9: Reconcile with jb-mr2-release - do not merge
* commit '
01b166e97a6738ec7769c17102f5d6e9f9be96fa':
The Android Open Source Project [Mon, 8 Apr 2013 20:36:10 +0000 (13:36 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ifaae267f3be9b1bf759f6093eb331c2751b2565f
The Android Automerger [Mon, 8 Apr 2013 12:56:29 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Etienne Le Grand [Fri, 5 Apr 2013 04:12:49 +0000 (21:12 -0700)]
am
72eced94: am
52feb4b1: Merge "Sensor HAL updates" into jb-mr2-dev
* commit '
72eced942fc8a3ab7112b23c678239511486865e':
Sensor HAL updates
Etienne Le Grand [Fri, 5 Apr 2013 04:09:09 +0000 (21:09 -0700)]
am
52feb4b1: Merge "Sensor HAL updates" into jb-mr2-dev
* commit '
52feb4b1149692d9c95ef599f0086f2391567952':
Sensor HAL updates
Etienne Le Grand [Fri, 5 Apr 2013 04:05:39 +0000 (04:05 +0000)]
Merge "Sensor HAL updates" into jb-mr2-dev
Jesse Hall [Thu, 4 Apr 2013 22:43:23 +0000 (15:43 -0700)]
am
a061d6c5: am
aea9926c: Merge "Log when creating a second buffer mapping in a process" into jb-mr2-dev
* commit '
a061d6c51c4e99a8cbe471da75a343d8ccfa7ebc':
Log when creating a second buffer mapping in a process
Jesse Hall [Thu, 4 Apr 2013 22:40:03 +0000 (15:40 -0700)]
am
aea9926c: Merge "Log when creating a second buffer mapping in a process" into jb-mr2-dev
* commit '
aea9926cc9d0a789e15dfb9c806623a984a6e0ee':
Log when creating a second buffer mapping in a process
Jesse Hall [Thu, 4 Apr 2013 22:36:35 +0000 (22:36 +0000)]
Merge "Log when creating a second buffer mapping in a process" into jb-mr2-dev
OSDN Git Service
