summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* goldfish: Rebrand to LineageOScm-11.0Tim Schumacher2017-07-153-4/+4
* Build for goldfish at cm11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Takahashi Hamuzo2014-05-141-1/+1
* Merge branch 'master' of https://android.googlesource.com/device/generic/gold...Chirayu Desai2013-11-295-19/+46
|\
| * Merge commit '828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEADThe Android Open Source Project2013-11-229-56/+62
| |\
| | * am 2524d396: Update emulator to FUSE-wrap its SD card.Jeff Sharkey2013-10-092-2/+8
| | |\
| | * \ am e8122dff: camera3: Fix stream id typesZhijun He2013-09-091-3/+3
| | |\ \
| | * \ \ am 3bd0e079: Merge "Return EGL_FALSE if eglChooseConfig failed to find any ma...Jesse Hall2013-08-131-0/+2
| | |\ \ \
| * | \ \ \ Merge "Modify the build targets for goldfish from to include aosp*."Elliott Hughes2013-11-211-1/+1
| |\ \ \ \ \
| | * | | | | Modify the build targets for goldfish from to include aosp*.Raghu Gandham2013-11-111-1/+1
| |/ / / / /
| * | | | | Merge "Delete buffer data when removing it from the SharedGroup namespace"Jesse Hall2013-11-091-14/+36
| |\ \ \ \ \
| | * | | | | Delete buffer data when removing it from the SharedGroup namespaceJesse Hall2013-11-091-14/+36
| |/ / / / /
| * | | | | Merge "Catch divide by zero case in drawCheckerBoard() function."Xavier Ducrohet2013-11-081-0/+7
| |\ \ \ \ \
| | * | | | | Catch divide by zero case in drawCheckerBoard() function.Douglas Leung2013-10-151-0/+7
| | | |/ / / | | |/| | |
| * | | | | Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."Nick Kralevich2013-11-071-4/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.Stephen Smalley2013-11-061-4/+0
| |/ / / /
| * | | | Merge "Return EGL_FALSE if eglChooseConfig failed to find any matching configs"Jesse Hall2013-08-131-0/+2
| |\ \ \ \
| | * | | | Return EGL_FALSE if eglChooseConfig failed to find any matching configsMartin Storsjo2013-08-111-0/+2
| |/ / / /
* | | | | Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-019-56/+62
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update emulator to FUSE-wrap its SD card.Jeff Sharkey2013-10-092-2/+8
| | |_|/ | |/| |
| * | | camera3: Fix stream id typesZhijun He2013-09-061-3/+3
| | |/ | |/|
| * | Camera2/3: Implement full-color NV21 output.Eino-Ville Talvala2013-08-052-16/+37
| * | get rid of HAL pixelformats 5551 and 4444Mathias Agopian2013-07-262-12/+0
| * | Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by de...Colin Cross2013-07-191-0/+1
| |\ \
| | * | Added net.dns1 prop for emulator, as Android emulator ignores it by default.Ron Munitz2013-07-031-0/+1
| * | | Merge "Camera2/3: Update static metadata"Zhijun He2013-07-184-21/+10
| |\ \ \
| | * | | Camera2/3: Update static metadataZhijun He2013-07-184-21/+10
| * | | | am 8f9288ea: goldfish: use fstab.goldfishNick Kralevich2013-07-152-2/+8
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | goldfish: use fstab.goldfishNick Kralevich2013-07-122-2/+8
| * | | am bf34d172: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-270-0/+0
| |\| |
| | * | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-270-0/+0
| | |\ \
| * | | | am 2c84e47e: am 07a4c8b4: Camera3: Fix default AE modeEino-Ville Talvala2013-06-261-2/+2
| |\| | | | | |_|/ | |/| |
| | * | am 07a4c8b4: Camera3: Fix default AE modeEino-Ville Talvala2013-06-261-2/+2
| | |\ \
| * | | | Make software VP9 video decoder available to MediaCodec.hkuang2013-06-241-2/+3
| * | | | am edb073ef: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -...The Android Open Source Project2013-06-060-0/+0
| |\| | |
| | | \ \
| | | \ \
| | *-. \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-060-0/+0
| | |\ \ \ \
| | | * | | | Flush QemuPipeStream when neededPetar Jovanovic2013-06-052-0/+3
| * | | | | | am ce4f740c: am 1b87456f: Flush QemuPipeStream when neededPetar Jovanovic2013-06-052-0/+3
| |\| | | | |
| | * | | | | am 1b87456f: Flush QemuPipeStream when neededPetar Jovanovic2013-06-052-0/+3
| | |\ \ \ \ \
| * | | | | | | am 8bf2a8ae: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-280-0/+0
| |\| | | | | |
| | * | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-280-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | am 87ce3426: am 30717de9: camera3: Make front cameras limited mode, back came...Igor Murashkin2013-05-242-0/+17
| |\| | | | | |
| | * | | | | | am 30717de9: camera3: Make front cameras limited mode, back cameras full modeIgor Murashkin2013-05-242-0/+17
| | |\ \ \ \ \ \
| * | | | | | | | am e58de6ad: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| |\| | | | | | |
| | * | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| | |\ \ \ \ \ \ \
| * | | | | | | | | am 475ee270: am fd098c5a: Merge "Increase apn resource files version"Robert Greenwalt2013-05-130-0/+0
| |\| | | | | | | |
| | * | | | | | | | am fd098c5a: Merge "Increase apn resource files version"Robert Greenwalt2013-05-130-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "Increase apn resource files version"Robert Greenwalt2013-05-132-2/+2
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Increase apn resource files versionAntonio Marín Cerezuela2013-05-132-2/+2
| | | |/ / / / / / / /
| * | | | | | | | | | am 13baa8bd: am 7cb87e43: Merge "Gralloc/Camera3: Support new HAL_PIXEL_FORMA...Eino-Ville Talvala2013-05-094-17/+183
| |\| | | | | | | | |
| | * | | | | | | | | am 7cb87e43: Merge "Gralloc/Camera3: Support new HAL_PIXEL_FORMAT_YCbCr_420_8...Eino-Ville Talvala2013-05-094-17/+183
| | |\ \ \ \ \ \ \ \ \