summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 51a625d1257b77c6b0d78ff548db2...The Android Automerger2014-10-020-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to 12dd2669561a70c4dd97572ba3e06...The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 12dd2669561a70c4dd97572ba3e06...The Android Automerger2014-09-300-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c109ad762ff2ff67ce042c1bf55fa...The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c109ad762ff2ff67ce042c1bf55fa...The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | |/|
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c109ad762ff2ff67ce042c1bf55fa...The Android Automerger2014-09-270-0/+0
| | | | | | | | | | | | |/|
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 4d7f8bdcfdc694ca64bc0349aa017...The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to d93dcf9a532a0d6ba88d8c220f629...The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 42be3d72dedda974e9001f8c81d07...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 78f0b51ac319dbed8f845612947d9...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8399a0c584316d499b191b6ab9764...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8399a0c584316d499b191b6ab9764...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8399a0c584316d499b191b6ab9764...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | |/|
| * | | | | | | | | | | | | | | | | | Merge "Vector version of camera preview graphic." into lmp-mr1-devDan Sandler2014-11-141-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Vector version of camera preview graphic.Dan Sandler2014-11-141-0/+27
| * | | | | | | | | | | | | | | | | | | Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-devDan Sandler2014-11-1423-1/+1
| |\| | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Trim transparent pixels off camera preview bitmaps.Dan Sandler2014-11-1423-1/+1
| | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Fix camera latency testShaohan Zou2014-11-121-0/+8
| * | | | | | | | | | | | | | | | | reset to 8dd164a with history.Qiwen Zhao2014-11-120-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix camera latency testShaohan Zou2014-11-051-0/+8
| | |/ / / / / / / / / / / / / / /
| | * / / / / / / / / / / / / / / Adopt the new error handling mechanism in portability.Senpo Hu2014-10-244-29/+51
| | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | am 91bceebd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | am cc933608: am 2d440350: Update to use real L codename.Dianne Hackborn2014-10-104-4/+4
| | |\| | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | am 2d440350: Update to use real L codename.Dianne Hackborn2014-10-094-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ st...Alan Newberger2014-10-072-13/+50
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bitAlan Newberger2014-10-062-13/+50
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings re...Alan Newberger2014-10-061-1/+1
| | |\| | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into ...Alan Newberger2014-10-061-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle"...Alan Newberger2014-10-051-2/+6
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-devAlan Newberger2014-10-051-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into ...Alan Newberger2014-10-051-2/+11
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-devAlan Newberger2014-10-051-2/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | am ce06a319: am 0021c301: Merge "Avoid porting null keys when copying prefere...Alan Newberger2014-10-051-2/+6
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | am 0021c301: Merge "Avoid porting null keys when copying preferences into new...Alan Newberger2014-10-051-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | am d0590b34: am a9ed2418: Only set preview size before starting previewAlan Newberger2014-10-051-82/+62
| | |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | am a9ed2418: Only set preview size before starting previewAlan Newberger2014-10-051-82/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | am 04b6e4c0: am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activiti...Alan Newberger2014-10-022-2/+2
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from CameraAlan Newberger2014-10-022-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | am 36cb7fb8: am dae542a3: Fix error in settings key from refactorAlan Newberger2014-10-021-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | am dae542a3: Fix error in settings key from refactorAlan Newberger2014-10-021-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | am 07c463d3: am d822d1cf: Only allow one draw call pending at a timeAlan Newberger2014-10-011-30/+12
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | am d822d1cf: Only allow one draw call pending at a timeAlan Newberger2014-10-011-30/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | am f0e685d9: am 2499af48: Stability: call stopPreview() before switching off ...Senpo Hu2014-10-011-4/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | am 2499af48: Stability: call stopPreview() before switching off video module.Senpo Hu2014-10-011-4/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | am d51f2cc7: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-09-290-0/+0
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | am 8838aba5: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method call...Senpo Hu2014-09-291-7/+21
| | |\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after rele...Senpo Hu2014-09-291-7/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | am f9d6b067: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/...Puneet Lall2014-09-275-35/+161
| | |\| | | | | | | | | | | | | | | | | | | | |