summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
|\
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-060-0/+0
| | | | | |\
| | | | | | * Revert "Add multi-display and flip fence to HWC"Jesse Hall2012-07-312-69/+64
* | | | | | | Merge "HWC 1.1: add FRAMEBUFFER_TARGET layer type" into jb-mr1-devJesse Hall2012-08-202-13/+31
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | HWC 1.1: add FRAMEBUFFER_TARGET layer typeJesse Hall2012-08-162-13/+31
| |/ / / / /
* | | | | | hwc: update blank documentation to specify that blank is synchronousColin Cross2012-08-161-0/+2
|/ / / / /
* | | | | Merge "Enhanced bluetooth HAL with DUT mode APIs" into jb-mr1-devMatthew Xie2012-08-130-0/+0
|\ \ \ \ \
| * | | | | Enhanced bluetooth HAL with DUT mode APIsKausik Sinnaswamy2012-08-130-0/+0
| |/ / / /
* | | | | am 42a70b67: Merge "Enhance keymaster tests"Kenny Root2012-08-130-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge "Enhance keymaster tests"Kenny Root2012-08-132-37/+97
| |\ \ \ \ \
| | * | | | | Enhance keymaster testsKenny Root2012-08-132-37/+97
| |/ / / / /
* | | | | | Merge "Enhance keymaster tests" into jb-mr1-devKenny Root2012-08-132-37/+97
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Enhance keymaster testsKenny Root2012-08-092-37/+97
| | |/ / / | |/| | |
* | | | | Camera2: Add ZSL pixel format, AF CANCEL trigger, lots of docsEino-Ville Talvala2012-08-101-24/+98
|/ / / /
* | | | Merge "Simplify prepare and set semantics (comments only)" into jb-mr1-devJamie Gennis2012-08-071-16/+12
|\ \ \ \
| * | | | Simplify prepare and set semantics (comments only)Jesse Hall2012-08-071-16/+12
* | | | | Extend the audio HAL interface to support get/set master muteJohn Grossman2012-08-072-3/+29
|/ / / /
* | | | Add multi-display and flip fence to HWCJesse Hall2012-08-072-64/+69
| |/ / |/| |
* | | Camera2: Test logging changesEino-Ville Talvala2012-07-311-8/+8
* | | Revert "Add multi-display and flip fence to HWC"Jesse Hall2012-07-312-69/+64
| |/ |/|
* | Add multi-display and flip fence to HWCJesse Hall2012-07-302-64/+69
* | Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-devEd Heyl2012-07-261-1/+4
|\ \
| * | hardware: Add field for number of framebuffers supportedNaseer Ahmed2012-07-091-1/+4
* | | Merge "Add comment"Glenn Kasten2012-07-251-1/+4
|\ \ \
| * | | Add commentGlenn Kasten2012-07-251-1/+4
* | | | struct effect_descriptor_s const correctnessGlenn Kasten2012-07-243-5/+5
|/ / /
* | | am afc55fd4: (-s ours) Extend the audio HAL interface to support get/set mast...John Grossman2012-07-190-0/+0
|\ \ \
| * | | Extend the audio HAL interface to support get/set master mute: DO NOT MERGEJohn Grossman2012-07-172-3/+29
* | | | Merge "Add camera gralloc usage flags."Eino-Ville Talvala2012-07-171-1/+5
|\ \ \ \
| * | | | Add camera gralloc usage flags.Eino-Ville Talvala2012-07-161-1/+5
* | | | | Merge changes I9622e8a0,I7b942e10,I3abd86e9,I27656f52,I662c7595,Ida4ef37e,Ic5...Matthew Xie2012-07-160-0/+0
|\ \ \ \ \
| * | | | | add 0xff to the end of an enumMatthew Xie2012-07-140-0/+0
| * | | | | Adding authentication failure reason specific status codes to bt_status_t str...Ganesh Ganapathi Batta2012-07-140-0/+0
| * | | | | Add support for CMEESreenidhi T2012-07-140-0/+0
| * | | | | Added ACL connected/disconnected events/callbacks to the Bluetooth HALKausik Sinnaswamy2012-07-140-0/+0
| * | | | | Enabled audio state changed JNI callback in A2DP HALKausik Sinnaswamy2012-07-140-0/+0
| * | | | | added pan profilezzy2012-07-140-0/+0
| * | | | | Added API to get remote services of devicefredc2012-07-140-0/+0
| * | | | | Added comment for mutli accept listenzzy2012-07-140-0/+0
| * | | | | added new btif_hl (HDP profile) moduleSen-Der Huang2012-07-140-0/+0
| * | | | | Changed the arguements for set report and send data apiPriti Aghera2012-07-140-0/+0
| * | | | | new bt socket interfacezzy2012-07-140-0/+0
| * | | | | Added dedicated HAL callback notifying framework on audio datapathMattias Agren2012-07-140-0/+0
| * | | | | Added new state BT_BOND_STATE_BONDING.Ravi Nagarajan2012-07-140-0/+0
| * | | | | Align the service status codes with spec. Add a new state for slc connection ...Ravi Nagarajan2012-07-140-0/+0
| * | | | | PTS fixes: Re-define the call state values to match CLCCRavi Nagarajan2012-07-140-0/+0