summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cameraservice: Fix ICameraDeviceUser aidl order.Ruben Brunk2014-05-221-23/+23
* merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3f...The Android Automerger2014-05-220-0/+0
|\
| * merge in master-release history after reset to cbc09e47a6cd9164219948caf84830...The Android Automerger2014-05-220-0/+0
| |\
| | * merge in master-release history after reset to 498692535c7ceecb3434a99c47e4c9...The Android Automerger2014-05-210-0/+0
| | |\
| | | * merge in master-release history after reset to 93c6fa7508cd0f5bb0ec80ea29ef8b...The Android Automerger2014-05-200-0/+0
| | | |\
| | | | * merge in master-release history after reset to 272b7f26c300d2029f278cf2af523c...The Android Automerger2014-05-190-0/+0
| | | | |\
| | | | | * merge in master-release history after reset to 272b7f26c300d2029f278cf2af523c...The Android Automerger2014-05-180-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in master-release history after reset to 272b7f26c300d2029f278cf2af523c...The Android Automerger2014-05-170-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in master-release history after reset to d25b89d1e417082b7e4ee9db7c08ab...The Android Automerger2014-05-150-0/+0
| | | | | |\
| | | | | | * merge in master-release history after reset to cbe6fddebe3ec84176037de7f9681d...The Android Automerger2014-05-140-0/+0
| | | | | | |\
| | | | | | | * merge in master-release history after reset to 99119b4564cea78be7a94d432dd8d8...The Android Automerger2014-05-130-0/+0
| | | | | | | |\
| | | | | | | | * merge in master-release history after reset to 5e4c4f12337ff4d7ceb105bcd441bb...The Android Automerger2014-05-120-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in master-release history after reset to 5e4c4f12337ff4d7ceb105bcd441bb...The Android Automerger2014-05-110-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in master-release history after reset to 5e4c4f12337ff4d7ceb105bcd441bb...The Android Automerger2014-05-100-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in master-release history after reset to cdedf74e34117f9834055973880ee7...The Android Automerger2014-05-080-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in master-release history after reset to 8e085cbeccb1138d52a0a423af02e6...The Android Automerger2014-05-070-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in master-release history after reset to 14136039b752376240698e8b422c76...The Android Automerger2014-05-070-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in master-release history after reset to dfa829c3ca81fcd2eecaabfff630ac...The Android Automerger2014-05-060-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in master-release history after reset to fa366b2a32294ea22bf7b6f237cdbb...The Android Automerger2014-05-050-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in master-release history after reset to fa366b2a32294ea22bf7b6f237cdbb...The Android Automerger2014-05-040-0/+0
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | * merge in master-release history after reset to fa366b2a32294ea22bf7b6f237cdbb...The Android Automerger2014-05-030-0/+0
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | * merge in master-release history after reset to c6b8225e759d1790d9a38082a18ce7...The Android Automerger2014-05-010-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in master-release history after reset to 4799fa447c2c9681c0c51fa8151974...The Android Automerger2014-04-300-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in master-release history after reset to c12ea1ce9b3ec44343892a5736923d...The Android Automerger2014-04-290-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in master-release history after reset to 67ee990d324229ab0565ce632bd5a0...The Android Automerger2014-04-280-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in master-release history after reset to 67ee990d324229ab0565ce632bd5a0...The Android Automerger2014-04-270-0/+0
| | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | | | | | * merge in master-release history after reset to 67ee990d324229ab0565ce632bd5a0...The Android Automerger2014-04-260-0/+0
| | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | | | | | * merge in master-release history after reset to 66036d50a8303cddfdd5c7320eea0e...The Android Automerger2014-04-240-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-230-0/+0
| | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-220-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-190-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-160-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-263-267/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\