summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s ours am: a20839f5d9Xin Li2019-07-030-0/+0
|\
| * [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s oursXin Li2019-07-020-0/+0
| |\
| | * [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-masterXin Li2019-07-020-0/+0
| | |\
| | | * Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-masterTreeHugger Robot2019-07-028-27/+32
| | | |\
* | | | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s ours am: 779d7d3a3dXin Li2019-07-020-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s oursXin Li2019-07-020-0/+0
| |\| | |
| | * | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-masterXin Li2019-07-020-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-masterXin Li2019-07-018-27/+32
| | | |\ \
* | | | | | Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422fa am: 304c389360Tianjie Xu2019-07-022-5/+2
|\| | | | |
| * | | | | Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422faTianjie Xu2019-07-022-5/+2
| |\| | | |
| | * | | | Merge "Build libimgdiff as a host only library" am: 9341e970baTianjie Xu2019-07-022-5/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | Merge "Build libimgdiff as a host only library"Tianjie Xu2019-07-022-5/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge "Build libimgdiff as a host only library"Tianjie Xu2019-07-022-5/+2
| | | | |\
| | | | | * Build libimgdiff as a host only libraryTianjie Xu2019-06-282-5/+2
| | | | |/
* | | | | Merge "Add unit tests for simulator" am: 4955648c4c am: 143b1d9aed am: ce2b33231eTianjie Xu2019-06-284-10/+414
|\| | | |
| * | | | Merge "Add unit tests for simulator" am: 4955648c4c am: 143b1d9aedTianjie Xu2019-06-284-10/+414
| |\| | |
| | * | | Merge "Add unit tests for simulator" am: 4955648c4cTianjie Xu2019-06-284-10/+414
| | |\| |
| | | * | Merge "Add unit tests for simulator"Tianjie Xu2019-06-284-10/+414
| | | |\|
| | | | * Merge "Add unit tests for simulator"Tianjie Xu2019-06-284-10/+414
| | | | |\
| | | | | * Add unit tests for simulatorTianjie Xu2019-06-284-10/+414
* | | | | | Merge "Rename product_services to system_ext" am: b9f356f581 am: b8e68bf831 am: 165fd3916eTianjie Xu2019-06-282-3/+3
|\| | | | |
| * | | | | Merge "Rename product_services to system_ext" am: b9f356f581 am: b8e68bf831Tianjie Xu2019-06-282-3/+3
| |\| | | |
| | * | | | Merge "Rename product_services to system_ext" am: b9f356f581Tianjie Xu2019-06-282-3/+3
| | |\| | |
| | | * | | Merge "Rename product_services to system_ext"Tianjie Xu2019-06-282-3/+3
| | | |\| |
| | | | * | Merge "Rename product_services to system_ext"Tianjie Xu2019-06-282-3/+3
| | | | |\ \
| | | | | * | Rename product_services to system_extJustin Yun2019-06-282-3/+3
* | | | | | | Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db am: 116152d738 am: 378dda080bTianjie Xu2019-06-283-4/+39
|\| | | | | |
| * | | | | | Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db am: 116152d738Tianjie Xu2019-06-283-4/+39
| |\| | | | |
| | * | | | | Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72dbTianjie Xu2019-06-283-4/+39
| | |\| | | |
| | | * | | | Merge "Implement ShowMenu for StubRecoveryUI"Tianjie Xu2019-06-283-4/+39
| | | |\| | |
| | | | * | | Merge "Implement ShowMenu for StubRecoveryUI"Tianjie Xu2019-06-283-4/+39
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | Implement ShowMenu for StubRecoveryUITianjie Xu2019-06-283-4/+39
| | | | | |/
* | | | | | Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4 am: 9b57172706 am: 18de138abdTao Bao2019-06-281-1/+1
|\| | | | |
| * | | | | Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4 am: 9b57172706Tao Bao2019-06-281-1/+1
| |\| | | |
| | * | | | Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4Tao Bao2019-06-281-1/+1
| | |\| | |
| | | * | | Merge "recovery_ui: Remove redundant menu creation."Tao Bao2019-06-281-1/+1
| | | |\| |
| | | | * | Merge "recovery_ui: Remove redundant menu creation."Treehugger Robot2019-06-271-1/+1
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * recovery_ui: Remove redundant menu creation.Tao Bao2019-06-271-1/+1
| | | | |/
* | | | | Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7 am: 3aaf87cf4e am: a2a500381aTianjie Xu2019-06-248-305/+394
|\| | | |
| * | | | Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7 am: 3aaf87cf4eTianjie Xu2019-06-248-305/+394
| |\| | |
| | * | | Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7Tianjie Xu2019-06-248-305/+394
| | |\| |
| | | * | Merge "Implement updater runtime for dynamic partitions"Tianjie Xu2019-06-248-305/+394
| | | |\|
| | | | * Merge "Implement updater runtime for dynamic partitions"Treehugger Robot2019-06-248-305/+394
| | | | |\
| | | | | * Implement updater runtime for dynamic partitionsTianjie Xu2019-06-248-305/+394
* | | | | | Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b am: b50f855396 am: 00d4092790Tao Bao2019-06-243-3/+7
|\| | | | |
| * | | | | Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b am: b50f855396Tao Bao2019-06-243-3/+7
| |\| | | |
| | * | | | Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077bTao Bao2019-06-243-3/+7
| | |\| | |
| | | * | | Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default."Tao Bao2019-06-243-3/+7
| | | |\| |
| | | | * | Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default."Treehugger Robot2019-06-243-3/+7
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * updater_sample: Build SystemUpdaterSample as non-privileged app by default.Tao Bao2019-06-213-3/+7
* | | | | | Merge "Support starting fuse from a block map" am: 090b62832f am: b96f2bf618 am: a51a41101aTianjie Xu2019-06-219-33/+88
|\| | | | |
| * | | | | Merge "Support starting fuse from a block map" am: 090b62832f am: b96f2bf618Tianjie Xu2019-06-219-33/+88
| |\| | | |
| | * | | | Merge "Support starting fuse from a block map" am: 090b62832fTianjie Xu2019-06-219-33/+88
| | |\| | |
| | | * | | Merge "Support starting fuse from a block map"Tianjie Xu2019-06-219-33/+88
| | | |\| |
| | | | * | Merge "Support starting fuse from a block map"Tianjie Xu2019-06-219-33/+88
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Support starting fuse from a block mapTianjie Xu2019-06-209-33/+88
* | | | | | Merge "Implement the TargetFile and BuildInfo" am: 9b76970e9a am: 75c4b32e3a am: 252f3d3392Tianjie Xu2019-06-218-25/+513
|\| | | | |
| * | | | | Merge "Implement the TargetFile and BuildInfo" am: 9b76970e9a am: 75c4b32e3aTianjie Xu2019-06-218-25/+513
| |\| | | |
| | * | | | Merge "Implement the TargetFile and BuildInfo" am: 9b76970e9aTianjie Xu2019-06-218-25/+513
| | |\| | |
| | | * | | Merge "Implement the TargetFile and BuildInfo"Tianjie Xu2019-06-218-25/+513
| | | |\| |
| | | | * | Merge "Implement the TargetFile and BuildInfo"Tianjie Xu2019-06-218-25/+513
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Implement the TargetFile and BuildInfoTianjie Xu2019-06-018-25/+513
* | | | | | Merge "Revert "libprocessgroup users use libcutils" am: cdbd84de26 am: 81e341f224" into qt-r1-dev-plus-aospZhijun He2019-06-190-0/+0
|\| | | | |
| * | | | | Merge "Revert "libprocessgroup users use libcutils" am: cdbd84de26 am: 81e341f224" into qt-r1-dev-plus-aospAndroid Build Merger (Role)2019-06-190-0/+0
| |\ \ \ \ \
| | * | | | | Revert "libprocessgroup users use libcutils" am: cdbd84de26Zhijun He2019-06-191-2/+0
| | |\| | | |
| | | * | | | Revert "libprocessgroup users use libcutils"Zhijun He2019-06-191-2/+0
| | | |\ \ \ \
* | | | | | | | Revert "libprocessgroup users use libcutils" am: cdbd84de26 am: 2b40105c43Zhijun He2019-06-191-2/+0
|\| | | | | | |
| * | | | | | | Revert "libprocessgroup users use libcutils" am: cdbd84de26Zhijun He2019-06-191-2/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Revert "libprocessgroup users use libcutils"Zhijun He2019-06-191-2/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Revert "libprocessgroup users use libcutils"Zhijun He2019-06-191-2/+0
* | | | | | | | libprocessgroup users use libcutils am: 46ec20b692 am: 60f68c7862Steven Moreland2019-06-190-0/+0
|\| | | | | | |
| * | | | | | | libprocessgroup users use libcutils am: 46ec20b692Steven Moreland2019-06-190-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | libprocessgroup users use libcutilsSteven Moreland2019-06-191-0/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
* | | | | | | | libprocessgroup users use libcutils am: 46ec20b692 am: f1532a9655Steven Moreland2019-06-191-0/+2
|\| | | | | | |
| * | | | | | | libprocessgroup users use libcutils am: 46ec20b692Steven Moreland2019-06-191-0/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | libprocessgroup users use libcutilsSteven Moreland2019-06-191-0/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | libprocessgroup users use libcutilsSteven Moreland2019-06-181-0/+2
* | | | | | | | Merge "InstallPackage now takes a package as parameter" am: 87e2275970 am: a927a16841 am: f7498516caTianjie Xu2019-06-147-53/+83
|\| | | | | | |
| * | | | | | | Merge "InstallPackage now takes a package as parameter" am: 87e2275970 am: a927a16841Tianjie Xu2019-06-147-53/+83
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "InstallPackage now takes a package as parameter" am: 87e2275970Tianjie Xu2019-06-147-53/+83
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge "InstallPackage now takes a package as parameter"Tianjie Xu2019-06-147-53/+83
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge "InstallPackage now takes a package as parameter"Tianjie Xu2019-06-147-53/+83
| | | | |\ \ \ \
| | | | | * | | | InstallPackage now takes a package as parameterTianjie Xu2019-06-137-53/+83
* | | | | | | | | Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7 am: a3211f0ecb am: e242d87430Elliott Hughes2019-06-132-2/+2
|\| | | | | | | |
| * | | | | | | | Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7 am: a3211f0ecbElliott Hughes2019-06-132-2/+2
| |\| | | | | | |
| | * | | | | | | Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7Elliott Hughes2019-06-132-2/+2
| | |\| | | | | |
| | | * | | | | | Merge "Use the new ziparchive Next std::string_view overload."Elliott Hughes2019-06-132-2/+2
| | | |\| | | | |
| | | | * | | | | Merge "Use the new ziparchive Next std::string_view overload."Elliott Hughes2019-06-132-2/+2
| | | | |\ \ \ \ \
| | | | | * | | | | Use the new ziparchive Next std::string_view overload.Elliott Hughes2019-06-122-2/+2
| | | | | |/ / / /
* | | | | | | | | Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544 am: 6a550f518e am: 7d453edf34Zhang, GaofengX2019-06-131-3/+3
|\| | | | | | | |
| * | | | | | | | Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544 am: 6a550f518eZhang, GaofengX2019-06-131-3/+3
| |\| | | | | | |
| | * | | | | | | Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544Zhang, GaofengX2019-06-131-3/+3
| | |\| | | | | |
| | | * | | | | | Merge "Avoid key_queue_mutex deadlock in waitkey()"Zhang, GaofengX2019-06-131-3/+3
| | | |\| | | | |
| | | | * | | | | Merge "Avoid key_queue_mutex deadlock in waitkey()"Treehugger Robot2019-06-131-3/+3
| | | | |\ \ \ \ \
| | | | | * | | | | Avoid key_queue_mutex deadlock in waitkey()Zhang, GaofengX2019-06-121-3/+3
* | | | | | | | | | [automerger skipped] minadbd: `adb rescue getprop` returns newline-terminated result. am: e3cc180d31 -s oursTao Bao2019-06-120-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] minadbd: `adb rescue getprop` returns newline-terminated result.Tao Bao2019-06-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | minadbd: `adb rescue getprop` returns newline-terminated result.Tao Bao2019-06-111-10/+7
* | | | | | | | | | [automerger skipped] minadbd: Support `adb rescue getprop`. am: 5359d777e6 -s oursTao Bao2019-06-110-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] minadbd: Support `adb rescue getprop`.Tao Bao2019-06-110-0/+0
| |\| | | | | | | |
| | * | | | | | | | minadbd: Support `adb rescue getprop`.Tao Bao2019-06-061-5/+18
* | | | | | | | | | [automerger skipped] minadbd: More allowed properties. am: 7a31ab675e -s oursTao Bao2019-06-110-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] minadbd: More allowed properties.Tao Bao2019-06-110-0/+0
| |\| | | | | | | |
| | * | | | | | | | minadbd: More allowed properties.Tao Bao2019-06-061-1/+8
* | | | | | | | | | Merge "minadbd: `adb rescue getprop` returns newline-terminated result." am: cb930939a4 am: d401ed099e am: 4721ced095Tao Bao2019-06-111-10/+7
|\| | | | | | | | |
| * | | | | | | | | Merge "minadbd: `adb rescue getprop` returns newline-terminated result." am: cb930939a4 am: d401ed099eTao Bao2019-06-111-10/+7
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "minadbd: `adb rescue getprop` returns newline-terminated result." am: cb930939a4Tao Bao2019-06-111-10/+7
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "minadbd: `adb rescue getprop` returns newline-terminated result."Tao Bao2019-06-111-10/+7
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Merge "minadbd: `adb rescue getprop` returns newline-terminated result."Tao Bao2019-06-111-10/+7
| | | | |\ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | | * | | | | minadbd: `adb rescue getprop` returns newline-terminated result.Tao Bao2019-06-101-10/+7
| | | | |/ / / / /
* | | | | | | | | Merge "minadbd: Support `adb rescue getprop`." am: 533a12c71e am: 0d00c1bf12 am: 024b53abe3Tao Bao2019-06-051-5/+18
|\| | | | | | | |
| * | | | | | | | Merge "minadbd: Support `adb rescue getprop`." am: 533a12c71e am: 0d00c1bf12Tao Bao2019-06-051-5/+18
| |\| | | | | | |
| | * | | | | | | Merge "minadbd: Support `adb rescue getprop`." am: 533a12c71eTao Bao2019-06-051-5/+18
| | |\| | | | | |
| | | * | | | | | Merge "minadbd: Support `adb rescue getprop`."Tao Bao2019-06-051-5/+18
| | | |\| | | | |
| | | | * | | | | Merge "minadbd: Support `adb rescue getprop`."Tao Bao2019-06-051-5/+18
| | | | |\ \ \ \ \
| | | | | * | | | | minadbd: Support `adb rescue getprop`.Tao Bao2019-06-051-5/+18
| | | | |/ / / / /
* | | | | | | | | Merge "minadbd: More allowed properties." am: 1ef7f92871 am: 6c37304201 am: 9b2cfec8ddTao Bao2019-06-051-1/+8
|\| | | | | | | |
| * | | | | | | | Merge "minadbd: More allowed properties." am: 1ef7f92871 am: 6c37304201Tao Bao2019-06-051-1/+8
| |\| | | | | | |
| | * | | | | | | Merge "minadbd: More allowed properties." am: 1ef7f92871Tao Bao2019-06-051-1/+8
| | |\| | | | | |
| | | * | | | | | Merge "minadbd: More allowed properties."Tao Bao2019-06-051-1/+8
| | | |\| | | | |
| | | | * | | | | Merge "minadbd: More allowed properties."Tao Bao2019-06-051-1/+8
| | | | |\ \ \ \ \
| | | | | * | | | | minadbd: More allowed properties.Tao Bao2019-06-031-1/+8
| | | | | | |_|_|/ | | | | | |/| | |
* | | | | | | | | Merge "Use icu4j instead of its deprecated legacy alias icu4j-host" am: 14bc5e1feb am: af4d1dda03 am: 2f8626c3f7Paul Duffin2019-06-041-1/+1
|\| | | | | | | |
| * | | | | | | | Merge "Use icu4j instead of its deprecated legacy alias icu4j-host" am: 14bc5e1feb am: af4d1dda03Paul Duffin2019-06-041-1/+1
| |\| | | | | | |
| | * | | | | | | Merge "Use icu4j instead of its deprecated legacy alias icu4j-host" am: 14bc5e1febPaul Duffin2019-06-041-1/+1
| | |\| | | | | |
| | | * | | | | | Merge "Use icu4j instead of its deprecated legacy alias icu4j-host"Paul Duffin2019-06-041-1/+1
| | | |\| | | | |
| | | | * | | | | Merge "Use icu4j instead of its deprecated legacy alias icu4j-host"Paul Duffin2019-06-041-1/+1
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Use icu4j instead of its deprecated legacy alias icu4j-hostPaul Duffin2019-06-031-1/+1
| | | | |/ / / /
* | | | | | | | Merge "Disable building simulator for mac" am: f3dd821f76 am: 3489b274d0 am: b93dc08bc6Tianjie Xu2019-05-302-0/+13
|\| | | | | | |
| * | | | | | | Merge "Disable building simulator for mac" am: f3dd821f76 am: 3489b274d0Tianjie Xu2019-05-302-0/+13
| |\| | | | | |
| | * | | | | | Merge "Disable building simulator for mac" am: f3dd821f76Tianjie Xu2019-05-302-0/+13
| | |\| | | | |
| | | * | | | | Merge "Disable building simulator for mac"Tianjie Xu2019-05-302-0/+13
| | | |\| | | |
| | | | * | | | Merge "Disable building simulator for mac"Treehugger Robot2019-05-302-0/+13
| | | | |\ \ \ \
| | | | | * | | | Disable building simulator for macTianjie Xu2019-05-302-0/+13
| | | | |/ / / /
* | | | | | | | Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf am: 29d9d7bbbe am: 55e82e2fc5Tianjie Xu2019-05-2910-30/+424
|\| | | | | | |
| * | | | | | | Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf am: 29d9d7bbbeTianjie Xu2019-05-2910-30/+424
| |\| | | | | |
| | * | | | | | Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cfTianjie Xu2019-05-2910-30/+424
| | |\| | | | |
| | | * | | | | Merge "Implement an update simulator to verify BB OTA packages on host"Tianjie Xu2019-05-2910-30/+424
| | | |\| | | |
| | | | * | | | Merge "Implement an update simulator to verify BB OTA packages on host"Tianjie Xu2019-05-2910-30/+424
| | | | |\ \ \ \
| | | | | * | | | Implement an update simulator to verify BB OTA packages on hostTianjie Xu2019-05-2910-30/+424
| | | | |/ / / /
* | | | | | | | Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce am: 7d0545f14a am: 3447708800Mark Salyzyn2019-05-287-10/+29
|\| | | | | | |
| * | | | | | | Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce am: 7d0545f14aMark Salyzyn2019-05-287-10/+29
| |\| | | | | |
| | * | | | | | Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ceMark Salyzyn2019-05-287-10/+29
| | |\| | | | |
| | | * | | | | Merge "recovery: report compliant reboot reason (Part Deux)"Mark Salyzyn2019-05-287-10/+29
| | | |\| | | |
| | | | * | | | Merge "recovery: report compliant reboot reason (Part Deux)"Treehugger Robot2019-05-287-10/+29
| | | | |\ \ \ \
| | | | | * | | | recovery: report compliant reboot reason (Part Deux)Mark Salyzyn2019-05-237-10/+29
* | | | | | | | | Merge "Some clean ups to the updater" am: 52e61f6995 am: a0c0e04163 am: e89cfb6a41Tianjie Xu2019-05-246-14/+16
|\| | | | | | | |
| * | | | | | | | Merge "Some clean ups to the updater" am: 52e61f6995 am: a0c0e04163Tianjie Xu2019-05-246-14/+16
| |\| | | | | | |
| | * | | | | | | Merge "Some clean ups to the updater" am: 52e61f6995Tianjie Xu2019-05-246-14/+16
| | |\| | | | | |
| | | * | | | | | Merge "Some clean ups to the updater"Tianjie Xu2019-05-246-14/+16
| | | |\| | | | |
| | | | * | | | | Merge "Some clean ups to the updater"Tianjie Xu2019-05-246-14/+16
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Some clean ups to the updaterTianjie Xu2019-05-226-14/+16
* | | | | | | | | [automerger skipped] Add misc_writer. am: 35e0f6d290 -s ours am: 865c17893b -s oursTao Bao2019-05-240-0/+0
|\| | | | | | | |
| * | | | | | | | [automerger skipped] Add misc_writer. am: 35e0f6d290 -s oursTao Bao2019-05-230-0/+0
| |\| | | | | | |
| | * | | | | | | [automerger skipped] Add misc_writer.Tao Bao2019-05-230-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | [automerger skipped] Add misc_writer. am: 35e0f6d290 am: af0a76d1c5 -s oursTao Bao2019-05-240-0/+0
|\| | | | | | | |
| * | | | | | | | [automerger skipped] Add misc_writer. am: 35e0f6d290Tao Bao2019-05-230-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Add misc_writer.Tao Bao2019-05-236-6/+258
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Add misc_writer.Tao Bao2019-05-216-6/+258
| | |/ / / / / /
* | | | | | | | Merge "Move off the Next ZipString overload." am: 7b67d28518 am: 505ed45940 am: ee57256055Elliott Hughes2019-05-243-9/+7
|\| | | | | | |
| * | | | | | | Merge "Move off the Next ZipString overload." am: 7b67d28518 am: 505ed45940Elliott Hughes2019-05-233-9/+7
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Move off the Next ZipString overload." am: 7b67d28518Elliott Hughes2019-05-233-9/+7
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge "Move off the Next ZipString overload."Elliott Hughes2019-05-233-9/+7
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Merge "Move off the Next ZipString overload."Elliott Hughes2019-05-233-9/+7
| | | | |\ \ \ \
| | | | | * | | | Move off the Next ZipString overload.Elliott Hughes2019-05-233-9/+7
| | | | | | |/ / | | | | | |/| |
* | | | | | | | Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd am: b491496fc3 am: 863c8f36ddTao Bao2019-05-247-29/+10
|\| | | | | | |
| * | | | | | | Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd am: b491496fc3Tao Bao2019-05-237-29/+10
| |\| | | | | |
| | * | | | | | Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182ddTao Bao2019-05-237-29/+10
| | |\| | | | |
| | | * | | | | Merge "Revert "recovery: report compliant reboot reason""Tao Bao2019-05-237-29/+10
| | | |\| | | |
| | | | * | | | Merge "Revert "recovery: report compliant reboot reason""Treehugger Robot2019-05-227-29/+10
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Revert "recovery: report compliant reboot reason"Tao Bao2019-05-227-29/+10
| | | | |/ / /
* | | | | | | Merge "recovery: report compliant reboot reason" am: d31fb2e7fc am: c3042973a4 am: d77641069eMark Salyzyn2019-05-227-10/+29
|\| | | | | |
| * | | | | | Merge "recovery: report compliant reboot reason" am: d31fb2e7fc am: c3042973a4Mark Salyzyn2019-05-227-10/+29
| |\| | | | |
| | * | | | | Merge "recovery: report compliant reboot reason" am: d31fb2e7fcMark Salyzyn2019-05-217-10/+29
| | |\| | | |
| | | * | | | Merge "recovery: report compliant reboot reason"Mark Salyzyn2019-05-217-10/+29
| | | |\| | |
| | | | * | | Merge "recovery: report compliant reboot reason"Mark Salyzyn2019-05-217-10/+29
| | | | |\ \ \
| | | | | * | | recovery: report compliant reboot reasonMark Salyzyn2019-05-207-10/+29
* | | | | | | | Merge "Add UpdaterRuntime class" am: e7b3c5698e am: c6d7065880 am: 3445bf5352Tianjie Xu2019-05-2213-164/+486
|\| | | | | | |
| * | | | | | | Merge "Add UpdaterRuntime class" am: e7b3c5698e am: c6d7065880Tianjie Xu2019-05-2213-164/+486
| |\| | | | | |
| | * | | | | | Merge "Add UpdaterRuntime class" am: e7b3c5698eTianjie Xu2019-05-2113-164/+486
| | |\| | | | |
| | | * | | | | Merge "Add UpdaterRuntime class"Tianjie Xu2019-05-2113-164/+486
| | | |\| | | |
| | | | * | | | Merge "Add UpdaterRuntime class"Tianjie Xu2019-05-2113-164/+486
| | | | |\ \ \ \
| | | | | * | | | Add UpdaterRuntime classTianjie Xu2019-05-2113-164/+486
| | | | | |/ / /
* | | | | | | | Merge "Add misc_writer." am: 962f7e0c0c am: f9fb4878fc am: 70bc3c40d2Tao Bao2019-05-216-14/+259
|\| | | | | | |
| * | | | | | | Merge "Add misc_writer." am: 962f7e0c0c am: f9fb4878fcTao Bao2019-05-216-14/+259
| |\| | | | | |
| | * | | | | | Merge "Add misc_writer." am: 962f7e0c0cTao Bao2019-05-216-14/+259
| | |\| | | | |
| | | * | | | | Merge "Add misc_writer."Tao Bao2019-05-216-14/+259
| | | |\| | | | | | | | |/ / / | | | |/| | |
| | | | * | | Merge "Add misc_writer."Tao Bao2019-05-216-14/+259
| | | |/| | |
| | | | * | | Add misc_writer.Tao Bao2019-05-216-14/+259
| | | |/ / /
* | | | | | [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master am: e7a0262c14 -s ours am: ec3d4af4b6Xin Li2019-05-160-0/+0
|\| | | | |
| * | | | | [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master am: e7a0262c14 -s oursXin Li2019-05-160-0/+0
| |\| | | |
| | * | | | [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-masterXin Li2019-05-160-0/+0
| |/| | | | | | |/ / /
| | * | | DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-masterXin Li2019-05-140-0/+0
| | |\ \ \
| | | * \ \ Snap for 5450365 from bd8ed91d04de07e5e1d8ec391e27279137713804 to pi-platform-releaseandroid-build-team Robot2019-05-071-5/+5
| | | |\ \ \
| | | | * \ \ Snap for 5322077 from fc8af23e97cc29d4af5f3d4df05ffb339e34b08e to pi-qpr3-releaseandroid-build-team Robot2019-02-201-5/+5
| | | | |\ \ \
* | | | | | | | Merge "roots: Remove get_system_root and logical_partitions_mapped." am: ba8f38d741 am: c53856dca7Tao Bao2019-05-115-16/+6
|\| | | | | | |
| * | | | | | | Merge "roots: Remove get_system_root and logical_partitions_mapped." am: ba8f38d741Tao Bao2019-05-115-16/+6
| |\| | | | | |
| | * | | | | | Merge "roots: Remove get_system_root and logical_partitions_mapped."Tao Bao2019-05-115-16/+6
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "roots: Remove get_system_root and logical_partitions_mapped."Tao Bao2019-05-115-16/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | roots: Remove get_system_root and logical_partitions_mapped.Tao Bao2019-05-105-16/+6
| | | |/ / / / / /
* | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-05-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-05-101-1/+1
* | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s ours am: 8e7be1faeb -s oursXin Li2019-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s oursXin Li2019-05-100-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."Xin Li2019-05-100-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."Xin Li2019-05-102-3/+3
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li2019-05-092-3/+3
| | | | |\ \ \ \ \ \ \
* | | | | | | | | | | | Merge "Track libziparchive API change." am: 6da27adb0b am: 46fa74623aElliott Hughes2019-05-103-4/+3
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Track libziparchive API change." am: 6da27adb0bElliott Hughes2019-05-103-4/+3
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Track libziparchive API change."Elliott Hughes2019-05-093-4/+3
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Track libziparchive API change."Elliott Hughes2019-05-093-4/+3
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Track libziparchive API change.Elliott Hughes2019-05-093-4/+3
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "Skip hashtree computation during block image verify" am: c046a61d97 am: e945763a5dTianjie Xu2019-05-101-1/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Skip hashtree computation during block image verify" am: c046a61d97Tianjie Xu2019-05-101-1/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Skip hashtree computation during block image verify"Tianjie Xu2019-05-091-1/+1
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Skip hashtree computation during block image verify"Tianjie Xu2019-05-091-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Skip hashtree computation during block image verifyTianjie Xu2019-05-091-1/+1
| | | |/ / / / / / / / /
* | | | | | / / / / / / Merge "Add Updater class and remove UpdaterInfo" am: 19737a5b38 am: 93667742feTianjie Xu2019-05-099-340/+419
|\| | | | | | | | | | | | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge "Add Updater class and remove UpdaterInfo" am: 19737a5b38Tianjie Xu2019-05-099-340/+419
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Add Updater class and remove UpdaterInfo"Tianjie Xu2019-05-099-340/+419
| | |\| | | | | | | | | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge "Add Updater class and remove UpdaterInfo"Tianjie Xu2019-05-099-340/+419
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Add Updater class and remove UpdaterInfoTianjie Xu2019-05-099-340/+419
| | | |/ / / / / /
* | | | | | | | | Merge "Track libziparchive API change." am: 9423d2f6b7 am: 0d24715223Elliott Hughes2019-05-078-27/+15
|\| | | | | | | |
| * | | | | | | | Merge "Track libziparchive API change." am: 9423d2f6b7Elliott Hughes2019-05-078-27/+15
| |\| | | | | | |
| | * | | | | | | Merge "Track libziparchive API change."Elliott Hughes2019-05-078-27/+15
| | |\| | | | | |
| | | * | | | | | Merge "Track libziparchive API change."Elliott Hughes2019-05-078-27/+15
| | | |\ \ \ \ \ \
| | | | * | | | | | Track libziparchive API change.Elliott Hughes2019-05-068-27/+15
* | | | | | | | | | Merge "Disable libbootloader_message for darwin" am: 12262d568a am: 5a25636f34Colin Cross2019-05-061-1/+4
|\| | | | | | | | |
| * | | | | | | | | Merge "Disable libbootloader_message for darwin" am: 12262d568aColin Cross2019-05-061-1/+4
| |\| | | | | | | |
| | * | | | | | | | Merge "Disable libbootloader_message for darwin"Colin Cross2019-05-061-1/+4
| | |\| | | | | | |
| | | * | | | | | | Merge "Disable libbootloader_message for darwin"Treehugger Robot2019-05-061-1/+4
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Disable libbootloader_message for darwinColin Cross2019-05-061-1/+4
* | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9681eef5ff -s oursBill Yi2019-05-050-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-05-050-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Import translations. DO NOT MERGEBill Yi2019-05-051-1/+1
* | | | | | | | | | Merge "ConsumePrefix is now in libbase." am: b699b4b1cd am: 24566cebf5Elliott Hughes2019-05-041-5/+5
|\| | | | | | | | |
| * | | | | | | | | Merge "ConsumePrefix is now in libbase." am: b699b4b1cdElliott Hughes2019-05-041-5/+5
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "ConsumePrefix is now in libbase."Elliott Hughes2019-05-041-5/+5
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "ConsumePrefix is now in libbase."Elliott Hughes2019-05-041-5/+5
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | ConsumePrefix is now in libbase.Elliott Hughes2019-05-031-5/+5
* | | | | | | | | | Merge changes from topic "cuttlefish_misc" am: be25cd21e4 am: d3916e2f1fYifan Hong2019-05-033-4/+39
|\| | | | | | | | |
| * | | | | | | | | Merge changes from topic "cuttlefish_misc" am: be25cd21e4Yifan Hong2019-05-033-4/+39
| |\| | | | | | | |
| | * | | | | | | | Merge changes from topic "cuttlefish_misc"Yifan Hong2019-05-033-4/+39
| | |\| | | | | | |
| | | * | | | | | | Merge changes from topic "cuttlefish_misc"Treehugger Robot2019-05-033-4/+39
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | libbootloader_message: host_supported.Yifan Hong2019-05-032-4/+26
| | | | * | | | | | | libbootloader_message: write recovery to any deviceYifan Hong2019-05-032-0/+13
* | | | | | | | | | | Merge "Implement FuseBlockDataProvider" am: bfd6cf59dc am: 15a899363eTianjie Xu2019-05-0311-1/+309
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Implement FuseBlockDataProvider" am: bfd6cf59dcTianjie Xu2019-05-0311-1/+309
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Implement FuseBlockDataProvider"Tianjie Xu2019-05-0311-1/+309
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Implement FuseBlockDataProvider"Tianjie Xu2019-05-0311-1/+309
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Implement FuseBlockDataProviderxunchang2019-05-0111-1/+309
| | | |/ / / / / / /
* | | | | | | | | | Merge changes I2d42f55a,Ic1b5dbf7 am: b5fe2dd00c am: 2ea4768d6eTao Bao2019-05-0110-108/+118
|\| | | | | | | | |
| * | | | | | | | | Merge changes I2d42f55a,Ic1b5dbf7 am: b5fe2dd00cTao Bao2019-05-0110-108/+118
| |\| | | | | | | |
| | * | | | | | | | Merge changes I2d42f55a,Ic1b5dbf7Tao Bao2019-05-0110-108/+118
| | |\| | | | | | |
| | | * | | | | | | Merge changes I2d42f55a,Ic1b5dbf7Tao Bao2019-04-3010-108/+118
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | install: Install functions return InstallResult.Tao Bao2019-04-307-39/+51
| | | | * | | | | | | install: Return bool for a few check functions.Tao Bao2019-04-305-69/+67
| | | |/ / / / / / /
* | | | | | | | | | Support wipe command in rescue mode am: 5a1916b9bexunchang2019-05-010-0/+0
|\| | | | | | | | |
| * | | | | | | | | Support wipe command in rescue modexunchang2019-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Support wipe command in rescue modexunchang2019-04-306-22/+64
* | | | | | | | | | Merge "tests: Merge recovery_component_test into recovery_unit_test." am: 865d1df0c9 am: 064ce341eeTao Bao2019-04-3016-158/+115
|\| | | | | | | | |
| * | | | | | | | | Merge "tests: Merge recovery_component_test into recovery_unit_test." am: 865d1df0c9Tao Bao2019-04-3016-158/+115
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "tests: Merge recovery_component_test into recovery_unit_test."Tao Bao2019-04-3016-158/+115
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "tests: Merge recovery_component_test into recovery_unit_test."Tao Bao2019-04-3016-158/+115
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | tests: Merge recovery_component_test into recovery_unit_test.Tao Bao2019-04-3016-158/+115
| | | |/ / / / / / /
* | | | | | | | | | Merge "Consolidate the codes that handle reboot/shutdown." am: 189c8f9aeb am: 3486372d69Tao Bao2019-04-306-24/+30
|\| | | | | | | | |
| * | | | | | | | | Merge "Consolidate the codes that handle reboot/shutdown." am: 189c8f9aebTao Bao2019-04-306-24/+30
| |\| | | | | | | |
| | * | | | | | | | Merge "Consolidate the codes that handle reboot/shutdown."Tao Bao2019-04-306-24/+30
| | |\| | | | | | |
| | | * | | | | | | Merge "Consolidate the codes that handle reboot/shutdown."Tao Bao2019-04-296-24/+30
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Consolidate the codes that handle reboot/shutdown.Tao Bao2019-04-296-24/+30
* | | | | | | | | | [automerger skipped] Parse BCB command to enter rescue mode. am: 75321ade87 -s oursTao Bao2019-04-300-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Parse BCB command to enter rescue mode.Tao Bao2019-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Parse BCB command to enter rescue mode.Tao Bao2019-04-284-20/+63
* | | | | | | | | | [automerger skipped] minadbd: Support `adb reboot` under sideload/rescue modes. am: 7b9b7db877 -s oursTao Bao2019-04-300-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] minadbd: Support `adb reboot` under sideload/rescue modes.Tao Bao2019-04-290-0/+0
| |\| | | | | | | |
| | * | | | | | | | minadbd: Support `adb reboot` under sideload/rescue modes.Tao Bao2019-04-269-60/+176
* | | | | | | | | | [automerger skipped] Add test for minadbd am: 23f15fcfaf -s oursxunchang2019-04-300-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Add test for minadbdxunchang2019-04-290-0/+0
| |\| | | | | | | |
| | * | | | | | | | Add test for minadbdxunchang2019-04-264-1/+226
* | | | | | | | | | [automerger skipped] minadbd: Support rescue install and getprop commands. am: e5c6446a10 -s oursTao Bao2019-04-300-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] minadbd: Support rescue install and getprop commands.Tao Bao2019-04-290-0/+0
| |\| | | | | | | |
| | * | | | | | | | minadbd: Support rescue install and getprop commands.Tao Bao2019-04-265-21/+82
* | | | | | | | | | [automerger skipped] Remove the FD parameter from FuseDataProvider ctor. am: 178cdd4f5c -s oursTao Bao2019-04-300-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Remove the FD parameter from FuseDataProvider ctor.Tao Bao2019-04-290-0/+0
| |\| | | | | | | |
| | * | | | | | | | Remove the FD parameter from FuseDataProvider ctor.Tao Bao2019-04-264-29/+34
* | | | | | | | | | [automerger skipped] Allow entering rescue mode via recovery UI. am: 378bfbfc5c -s oursTao Bao2019-04-300-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Allow entering rescue mode via recovery UI.Tao Bao2019-04-290-0/+0
| |\| | | | | | | |
| | * | | | | | | | Allow entering rescue mode via recovery UI.Tao Bao2019-04-269-17/+60
* | | | | | | | | | Merge "Add install/wipe_device.cpp." am: 40ccbe3324 am: a4993ce078Tao Bao2019-04-296-168/+233
|\| | | | | | | | |
| * | | | | | | | | Merge "Add install/wipe_device.cpp." am: 40ccbe3324Tao Bao2019-04-296-168/+233
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Add install/wipe_device.cpp."Tao Bao2019-04-296-168/+233
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Add install/wipe_device.cpp."Tao Bao2019-04-296-168/+233
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Add install/wipe_device.cpp.Tao Bao2019-04-276-168/+233
| | | | | |_|_|_|/ | | | | |/| | | |
* | | | | | | | | Merge "Support wipe command in rescue mode" am: 8fc8f39b62 am: 6c9f2acda0Tianjie Xu2019-04-296-22/+64
|\| | | | | | | |
| * | | | | | | | Merge "Support wipe command in rescue mode" am: 8fc8f39b62Tianjie Xu2019-04-296-22/+64
| |\| | | | | | |
| | * | | | | | | Merge "Support wipe command in rescue mode"Tianjie Xu2019-04-296-22/+64
| | |\| | | | | |
| | | * | | | | | Merge "Support wipe command in rescue mode"Tianjie Xu2019-04-296-22/+64
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Support wipe command in rescue modexunchang2019-04-266-22/+64
* | | | | | | | | Merge "Add recovery_host_test to TEST_MAPPING." am: 42168c4ab2 am: a11bb6c2c0Tao Bao2019-04-263-33/+6
|\| | | | | | | |
| * | | | | | | | Merge "Add recovery_host_test to TEST_MAPPING." am: 42168c4ab2Tao Bao2019-04-263-33/+6
| |\| | | | | | |
| | * | | | | | | Merge "Add recovery_host_test to TEST_MAPPING."Tao Bao2019-04-263-33/+6
| | |\| | | | | |
| | | * | | | | | Merge "Add recovery_host_test to TEST_MAPPING."Treehugger Robot2019-04-263-33/+6
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Add recovery_host_test to TEST_MAPPING.Tao Bao2019-04-263-33/+6
| | | |/ / / / /
* | | | | | | | Merge "Parse BCB command to enter rescue mode." am: e645ba5aca am: 2f5b6751d8Tao Bao2019-04-264-20/+63
|\| | | | | | |
| * | | | | | | Merge "Parse BCB command to enter rescue mode." am: e645ba5acaTao Bao2019-04-264-20/+63
| |\| | | | | |
| | * | | | | | Merge "Parse BCB command to enter rescue mode."Tao Bao2019-04-264-20/+63
| | |\| | | | |
| | | * | | | | Merge "Parse BCB command to enter rescue mode."Tao Bao2019-04-264-20/+63
| | | |\ \ \ \ \
| | | | * | | | | Parse BCB command to enter rescue mode.Tao Bao2019-04-254-20/+63
| | | |/ / / / /
* | | | | | | | Merge "Add TEST_MAPPING." am: c6ebcaaad7 am: d8cecf4df9Tao Bao2019-04-251-0/+13
|\| | | | | | |
| * | | | | | | Merge "Add TEST_MAPPING." am: c6ebcaaad7Tao Bao2019-04-251-0/+13
| |\| | | | | |
| | * | | | | | Merge "Add TEST_MAPPING."Tao Bao2019-04-251-0/+13
| | |\| | | | |
| | | * | | | | Merge "Add TEST_MAPPING."Treehugger Robot2019-04-251-0/+13
| | | |\ \ \ \ \
| | | | * | | | | Add TEST_MAPPING.Tao Bao2019-04-241-0/+13
| | | |/ / / / /
* | | | | | | | Merge "minadbd: Support `adb reboot` under sideload/rescue modes." am: cf1f715d62 am: 0d6f57a90fTao Bao2019-04-249-60/+176
|\| | | | | | |
| * | | | | | | Merge "minadbd: Support `adb reboot` under sideload/rescue modes." am: cf1f715d62Tao Bao2019-04-249-60/+176
| |\| | | | | |
| | * | | | | | Merge "minadbd: Support `adb reboot` under sideload/rescue modes."Tao Bao2019-04-249-60/+176
| | |\| | | | |
| | | * | | | | Merge "minadbd: Support `adb reboot` under sideload/rescue modes."Tao Bao2019-04-249-60/+176
| | | |\ \ \ \ \
| | | | * | | | | minadbd: Support `adb reboot` under sideload/rescue modes.Tao Bao2019-04-249-60/+176
| | | |/ / / / /
* | | | | | | | Merge "Add test for minadbd" am: c92f412b8d am: b63e6963ecTianjie Xu2019-04-244-1/+226
|\| | | | | | |
| * | | | | | | Merge "Add test for minadbd" am: c92f412b8dTianjie Xu2019-04-244-1/+226
| |\| | | | | |
| | * | | | | | Merge "Add test for minadbd"Tianjie Xu2019-04-244-1/+226
| | |\| | | | |
| | | * | | | | Merge "Add test for minadbd"Tianjie Xu2019-04-244-1/+226
| | | |\ \ \ \ \
| | | | * | | | | Add test for minadbdxunchang2019-04-234-1/+226
* | | | | | | | | Merge changes Ibdb7dd0b,Iafd3e846 am: 72e6e55e34 am: 05e295b755Tianjie Xu2019-04-235-12/+33
|\| | | | | | | |
| * | | | | | | | Merge changes Ibdb7dd0b,Iafd3e846 am: 72e6e55e34Tianjie Xu2019-04-235-12/+33
| |\| | | | | | |
| | * | | | | | | Merge changes Ibdb7dd0b,Iafd3e846Tianjie Xu2019-04-235-12/+33
| | |\| | | | | |
| | | * | | | | | Merge changes Ibdb7dd0b,Iafd3e846Tianjie Xu2019-04-235-12/+33
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | matches_locale no longer accept empty locales in the png filexunchang2019-04-232-2/+6
| | | | * | | | | Fall back to en-US if localized bitmap is missing for a localexunchang2019-04-224-10/+27
* | | | | | | | | Merge "minadbd: Support rescue install and getprop commands." am: f365574a60 am: 8c7085878cTao Bao2019-04-235-21/+82
|\| | | | | | | |
| * | | | | | | | Merge "minadbd: Support rescue install and getprop commands." am: f365574a60Tao Bao2019-04-235-21/+82
| |\| | | | | | |
| | * | | | | | | Merge "minadbd: Support rescue install and getprop commands."Tao Bao2019-04-235-21/+82
| | |\| | | | | |
| | | * | | | | | Merge "minadbd: Support rescue install and getprop commands."Tao Bao2019-04-235-21/+82
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | minadbd: Support rescue install and getprop commands.Tao Bao2019-04-195-21/+82
| | | |/ / / / /
* | | | | | | | Merge "Allow entering rescue mode via recovery UI." am: b951138ebe am: bca2ceb7a7Tao Bao2019-04-199-17/+60
|\| | | | | | |
| * | | | | | | Merge "Allow entering rescue mode via recovery UI." am: b951138ebeTao Bao2019-04-199-17/+60
| |\| | | | | |
| | * | | | | | Merge "Allow entering rescue mode via recovery UI."Tao Bao2019-04-199-17/+60
| | |\| | | | |
| | | * | | | | Merge "Allow entering rescue mode via recovery UI."Tao Bao2019-04-189-17/+60
| | | |\ \ \ \ \
| | | | * | | | | Allow entering rescue mode via recovery UI.Tao Bao2019-04-179-17/+60
| | | |/ / / / /
* | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: d0052c30ce -s oursBill Yi2019-04-180-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-04-180-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Import translations. DO NOT MERGEBill Yi2019-04-172-3/+3
* | | | | | | | [automerger skipped] DO NOT MERGE: Move load & restore logs to logging.cpp am: cd780b456fxunchang2019-04-170-0/+0
|\| | | | | | |
| * | | | | | | DO NOT MERGE: Move load & restore logs to logging.cppxunchang2019-04-170-0/+0
| |\| | | | | |
| | * | | | | | DO NOT MERGE: Move load & restore logs to logging.cppxunchang2019-04-165-84/+109
* | | | | | | | [automerger skipped] DO NOT MERGE: Move wipe cache|data to libinstall am: 388d253b9c -s oursxunchang2019-04-170-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] DO NOT MERGE: Move wipe cache|data to libinstallxunchang2019-04-170-0/+0
| |\| | | | | |
| | * | | | | | DO NOT MERGE: Move wipe cache|data to libinstallxunchang2019-04-1617-224/+303
* | | | | | | | [automerger skipped] DO NOT MERGE: Add socket communication between recovery and minadbd am: 95d67323a4 -s oursxunchang2019-04-170-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] DO NOT MERGE: Add socket communication between recovery and minadbdxunchang2019-04-170-0/+0
| |\| | | | | |
| | * | | | | | DO NOT MERGE: Add socket communication between recovery and minadbdxunchang2019-04-169-85/+429
* | | | | | | | [automerger skipped] DO NOT MERGE: Build libinstall as a static library. am: 2f8afba707 -s oursTao Bao2019-04-170-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] DO NOT MERGE: Build libinstall as a static library.Tao Bao2019-04-170-0/+0
| |\| | | | | |
| | * | | | | | DO NOT MERGE: Build libinstall as a static library.Tao Bao2019-04-163-6/+9
* | | | | | | | Merge "Move load & restore logs to logging.cpp" am: 3aff98aee8 am: c3a273b33aTianjie Xu2019-04-165-84/+109
|\| | | | | | |
| * | | | | | | Merge "Move load & restore logs to logging.cpp" am: 3aff98aee8Tianjie Xu2019-04-165-84/+109
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Move load & restore logs to logging.cpp"Tianjie Xu2019-04-165-84/+109
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge "Move load & restore logs to logging.cpp"Tianjie Xu2019-04-165-84/+109
| | | |\ \ \ \ \
| | | | * | | | | Move load & restore logs to logging.cppxunchang2019-04-165-84/+109
* | | | | | | | | Merge "Remove the FD parameter from FuseDataProvider ctor." am: bb0c6e1fe7 am: 510daac2ccTao Bao2019-04-164-29/+34
|\| | | | | | | |
| * | | | | | | | Merge "Remove the FD parameter from FuseDataProvider ctor." am: bb0c6e1fe7Tao Bao2019-04-164-29/+34
| |\| | | | | | |
| | * | | | | | | Merge "Remove the FD parameter from FuseDataProvider ctor."Tao Bao2019-04-164-29/+34
| | |\| | | | | |
| | | * | | | | | Merge "Remove the FD parameter from FuseDataProvider ctor."Treehugger Robot2019-04-164-29/+34
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Remove the FD parameter from FuseDataProvider ctor.Tao Bao2019-04-164-29/+34
* | | | | | | | | Merge "Move wipe cache|data to libinstall" am: 9fc764f1f0 am: 2148d317cdTianjie Xu2019-04-1617-224/+303
|\| | | | | | | |
| * | | | | | | | Merge "Move wipe cache|data to libinstall" am: 9fc764f1f0Tianjie Xu2019-04-1617-224/+303
| |\| | | | | | |
| | * | | | | | | Merge "Move wipe cache|data to libinstall"Tianjie Xu2019-04-1617-224/+303
| | |\| | | | | |
| | | * | | | | | Merge "Move wipe cache|data to libinstall"Tianjie Xu2019-04-1617-224/+303
| | | |\ \ \ \ \ \
| | | | * | | | | | Move wipe cache|data to libinstallxunchang2019-04-1517-224/+303
| | | | |/ / / / /
* | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0b172415fd -s ours am: 440d03ede2 -s oursBill Yi2019-04-130-0/+0
|\| | | | | | | |
| * | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0b172415fd -s oursBill Yi2019-04-130-0/+0
| |\| | | | | | |
| | * | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE"Bill Yi2019-04-130-0/+0
| | |\| | | | | |
| | | * | | | | | Merge "Import translations. DO NOT MERGE"Treehugger Robot2019-04-132-3/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Import translations. DO NOT MERGEBill Yi2019-04-132-3/+3
| | | |/ / / / /
* | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-04-121-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2019-04-121-2/+2
* | | | | | | | | Merge "Add socket communication between recovery and minadbd" am: 6c5f70b9b2 am: f9709883f1Tianjie Xu2019-04-129-85/+429
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Merge "Add socket communication between recovery and minadbd" am: 6c5f70b9b2Tianjie Xu2019-04-129-85/+429
| |\| | | | | |
| | * | | | | | Merge "Add socket communication between recovery and minadbd"Tianjie Xu2019-04-129-85/+429
| | |\| | | | |
| | | * | | | | Merge "Add socket communication between recovery and minadbd"Tianjie Xu2019-04-129-85/+429
| | | |\ \ \ \ \
| | | | * | | | | Add socket communication between recovery and minadbdxunchang2019-04-119-85/+429
| | | |/ / / / /
* | | | | | | | Merge "Build libinstall as a static library." am: 38d5e60874 am: a8cc70fbe1Tao Bao2019-04-093-6/+9
|\| | | | | | |
| * | | | | | | Merge "Build libinstall as a static library." am: 38d5e60874Tao Bao2019-04-093-6/+9
| |\| | | | | |
| | * | | | | | Merge "Build libinstall as a static library."Tao Bao2019-04-093-6/+9
| | |\| | | | |
| | | * | | | | Merge "Build libinstall as a static library."Tao Bao2019-04-083-6/+9
| | | |\ \ \ \ \
| | | | * | | | | Build libinstall as a static library.Tao Bao2019-04-083-6/+9
| | | |/ / / / /
* | | | | | | | Import translations. DO NOT MERGEBill Yi2019-04-081-1/+1
* | | | | | | | Merge "libotautil exports libfstab header." am: 8e0821e690 am: 416343e73aTao Bao2019-04-040-0/+0
|\| | | | | | |
| * | | | | | | Merge "libotautil exports libfstab header." am: 8e0821e690Tao Bao2019-04-044-5/+4
| |\| | | | | | | | |_|/ / / / | |/| | | | |
* | | | | | | Merge master@5406228 into qt-dev. am: a1382c23b4Bill Rassieur2019-04-040-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge master@5406228 into qt-dev.Bill Rassieur2019-04-030-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge master@5406228 into qt-dev.Bill Rassieur2019-03-2825-119/+138
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge "libotautil exports libfstab header." am: 8e0821e690 am: 416343e73aTao Bao2019-04-044-5/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge "libotautil exports libfstab header." am: 8e0821e690Tao Bao2019-04-044-5/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "libotautil exports libfstab header."Tao Bao2019-04-044-5/+4
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Merge "libotautil exports libfstab header."Tao Bao2019-04-044-5/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | libotautil exports libfstab header.Tao Bao2019-04-034-5/+4
* | | | | | | | | | | Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-0236-297/+452
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-040-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-03-2925-119/+138
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | / / / / | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge "Append -verity when looking for verity device-mapper names." am: bc2eab4315 am: 9a53189ae5David Anderson2019-04-031-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Append -verity when looking for verity device-mapper names." am: bc2eab4315David Anderson2019-04-021-0/+9
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Append -verity when looking for verity device-mapper names."David Anderson2019-04-021-0/+9
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Append -verity when looking for verity device-mapper names."David Anderson2019-04-021-0/+9
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | | * | | | | | Append -verity when looking for verity device-mapper names.David Anderson2019-04-021-0/+9
* | | | | | | | | | Merge changes Ibbe7084e,If584fc8a am: bb8f0fff17 am: effd4ca883Tao Bao2019-03-304-33/+9
|\| | | | | | | | |
| * | | | | | | | | Merge changes Ibbe7084e,If584fc8a am: bb8f0fff17Tao Bao2019-03-304-33/+9
| |\| | | | | | | |
| | * | | | | | | | Merge changes Ibbe7084e,If584fc8aTao Bao2019-03-304-33/+9
| | |\| | | | | | |
| | | * | | | | | | Merge changes Ibbe7084e,If584fc8aTao Bao2019-03-304-33/+9
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | recovery: Remove SetUsbConfig() out of common.h.Tao Bao2019-03-293-8/+6
| | | | * | | | | | | Remove ui_print().Tao Bao2019-03-293-25/+3
| | | |/ / / / / / /
* | | | | | | | | | Merge "Move install to separate module" am: a232d9dccb am: 3f25d6bb07Tianjie Xu2019-03-2928-185/+196
|\| | | | | | | | |
| * | | | | | | | | Merge "Move install to separate module" am: a232d9dccbTianjie Xu2019-03-2928-185/+196
| |\| | | | | | | |
| | * | | | | | | | Merge "Move install to separate module"Tianjie Xu2019-03-2928-185/+196
| | |\| | | | | | |
| | | * | | | | | | Merge "Move install to separate module"Tianjie Xu2019-03-2928-185/+196
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Move install to separate modulexunchang2019-03-2928-185/+196
| | | |/ / / / / / /
* | | | | | | | | | Merge "Use flags = 0 to avoid fd closing for child updater process" am: 50bda24f1e am: 111663d893Bill Peckham2019-03-291-1/+3
|\| | | | | | | | |
| * | | | | | | | | Merge "Use flags = 0 to avoid fd closing for child updater process" am: 50bda24f1eBill Peckham2019-03-291-1/+3
| |\| | | | | | | |
| | * | | | | | | | Merge "Use flags = 0 to avoid fd closing for child updater process"Bill Peckham2019-03-291-1/+3
| | |\| | | | | | |
| | | * | | | | | | Merge "Use flags = 0 to avoid fd closing for child updater process"Bill Peckham2019-03-291-1/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Use flags = 0 to avoid fd closing for child updater processBill Peckham2019-03-291-1/+3
* | | | | | | | | | | Merge "Fix bogus error checking on unique_fd" am: a0fe1227b8 am: 7367caad0fBernie Innocenti2019-03-292-2/+2
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Fix bogus error checking on unique_fd" am: a0fe1227b8Bernie Innocenti2019-03-292-2/+2
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Fix bogus error checking on unique_fd"Bernie Innocenti2019-03-292-2/+2
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Fix bogus error checking on unique_fd"Treehugger Robot2019-03-292-2/+2
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Fix bogus error checking on unique_fdBernie Innocenti2019-03-282-2/+2
| | | | |/ / / / / /
* | | | | | | | | | Merge "Remove the extern declaration of `sehandle` from roots.cpp." am: 047582b506 am: 9e23616e2eTao Bao2019-03-281-2/+0
|\| | | | | | | | |
| * | | | | | | | | Merge "Remove the extern declaration of `sehandle` from roots.cpp." am: 047582b506Tao Bao2019-03-281-2/+0
| |\| | | | | | | |
| | * | | | | | | | Merge "Remove the extern declaration of `sehandle` from roots.cpp."Tao Bao2019-03-281-2/+0
| | |\| | | | | | |
| | | * | | | | | | Merge "Remove the extern declaration of `sehandle` from roots.cpp."Treehugger Robot2019-03-281-2/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Remove the extern declaration of `sehandle` from roots.cpp.Tao Bao2019-03-281-2/+0
| | | |/ / / / / /
* | | | | | | | | Merge "Allow RSA 4096 key in package verification" am: 3168ddf79d am: 3de9ee62b8Tianjie Xu2019-03-275-3/+50
|\| | | | | | | |
| * | | | | | | | Merge "Allow RSA 4096 key in package verification" am: 3168ddf79dTianjie Xu2019-03-275-3/+50
| |\| | | | | | |
| | * | | | | | | Merge "Allow RSA 4096 key in package verification"Tianjie Xu2019-03-275-3/+50
| | |\| | | | | |
| | | * | | | | | Merge "Allow RSA 4096 key in package verification"Tianjie Xu2019-03-275-3/+50
| | | |\ \ \ \ \ \
| | | | * | | | | | Allow RSA 4096 key in package verificationxunchang2019-03-265-3/+50
* | | | | | | | | | Merge "Move out the code to parse block map in MemMap" am: f1cbd2f7f2 am: 67a3ffc22fTianjie Xu2019-03-273-71/+192
|\| | | | | | | | | | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge "Move out the code to parse block map in MemMap" am: f1cbd2f7f2Tianjie Xu2019-03-273-71/+192
| |\| | | | | | |
| | * | | | | | | Merge "Move out the code to parse block map in MemMap"Tianjie Xu2019-03-273-71/+192
| | |\| | | | | |
| | | * | | | | | Merge "Move out the code to parse block map in MemMap"Tianjie Xu2019-03-263-71/+192
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Move out the code to parse block map in MemMapxunchang2019-03-263-71/+192
| | | |/ / / / /
* | | | | | | | Merge "Move librecovery_ui to a sub-directory" am: 6287253eb4 am: 45898d8bb4Tianjie Xu2019-03-220-0/+0
|\| | | | | | |
| * | | | | | | Merge "Move librecovery_ui to a sub-directory" am: 6287253eb4Tianjie Xu2019-03-2225-119/+138
| |\| | | | | |
| | * | | | | | Merge "Move librecovery_ui to a sub-directory"Tianjie Xu2019-03-2225-119/+138
| | |\| | | | |
| | | * | | | | Merge "Move librecovery_ui to a sub-directory"Tianjie Xu2019-03-2225-119/+138
| | | |\ \ \ \ \
| | | | * | | | | Move librecovery_ui to a sub-directoryTianjie Xu2019-03-2125-119/+138
| | | |/ / / / /
* | | | / / / / Move librecovery_ui to a sub-directoryTianjie Xu2019-03-2125-119/+138
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge "Move apply_from_sdcard to fuse_sdcard_install" am: 3c61cd02cf am: 3c21700fcdTianjie Xu2019-03-204-183/+192
|\| | | | | |
| * | | | | | Merge "Move apply_from_sdcard to fuse_sdcard_install" am: 3c61cd02cfTianjie Xu2019-03-204-183/+192
| |\| | | | |
| | * | | | | Merge "Move apply_from_sdcard to fuse_sdcard_install"Tianjie Xu2019-03-204-183/+192
| | |\| | | |
| | | * | | | Merge "Move apply_from_sdcard to fuse_sdcard_install"Tianjie Xu2019-03-204-183/+192
| | | |\ \ \ \
| | | | * | | | Move apply_from_sdcard to fuse_sdcard_installxunchang2019-03-204-183/+192
* | | | | | | | Merge "Remove the provider_vtab" am: 2037c60de4 am: d7eba6248bTianjie Xu2019-03-208-59/+40
|\| | | | | | |
| * | | | | | | Merge "Remove the provider_vtab" am: 2037c60de4Tianjie Xu2019-03-208-59/+40
| |\| | | | | |
| | * | | | | | Merge "Remove the provider_vtab"Tianjie Xu2019-03-208-59/+40
| | |\| | | | |
| | | * | | | | Merge "Remove the provider_vtab"Tianjie Xu2019-03-208-59/+40
| | | |\| | | |
| | | | * | | | Remove the provider_vtabxunchang2019-03-198-59/+40
* | | | | | | | Merge "Create a FuseDataProvider base class" am: eeea86f5fd am: 4aa4bf5e19Tianjie Xu2019-03-1916-136/+250
|\| | | | | | |
| * | | | | | | Merge "Create a FuseDataProvider base class" am: eeea86f5fdTianjie Xu2019-03-1916-136/+250
| |\| | | | | |
| | * | | | | | Merge "Create a FuseDataProvider base class"Tianjie Xu2019-03-1916-136/+250
| | |\| | | | |
| | | * | | | | Merge "Create a FuseDataProvider base class"Tianjie Xu2019-03-1916-136/+250
| | | |\| | | |
| | | | * | | | Create a FuseDataProvider base classxunchang2019-03-1916-136/+250
* | | | | | | | Merge "Skip calling verify_package_compatibility when resuming." am: 98beb6414b am: c4148b529aTao Bao2019-03-191-2/+2
|\| | | | | | |
| * | | | | | | Merge "Skip calling verify_package_compatibility when resuming." am: 98beb6414bTao Bao2019-03-191-2/+2
| |\| | | | | |
| | * | | | | | Merge "Skip calling verify_package_compatibility when resuming."Tao Bao2019-03-191-2/+2
| | |\| | | | |
| | | * | | | | Merge "Skip calling verify_package_compatibility when resuming."Treehugger Robot2019-03-191-2/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Skip calling verify_package_compatibility when resuming.Tao Bao2019-03-181-2/+2
* | | | | | | | Merge "Implement FilePackage class" am: 698dc08561 am: cd73207f50Tianjie Xu2019-03-158-17/+273
|\| | | | | | |
| * | | | | | | Merge "Implement FilePackage class" am: 698dc08561Tianjie Xu2019-03-158-17/+273
| |\| | | | | |
| | * | | | | | Merge "Implement FilePackage class"Tianjie Xu2019-03-158-17/+273
| | |\| | | | |
| | | * | | | | Merge "Implement FilePackage class"Tianjie Xu2019-03-158-17/+273
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Implement FilePackage classxunchang2019-03-148-17/+273
| | | |/ / / /
* | | | | | | Merge "Start charger at /system/bin/charger." am: d5bbec7750 am: 37b1520682Tao Bao2019-03-141-1/+1
|\| | | | | |
| * | | | | | Merge "Start charger at /system/bin/charger." am: d5bbec7750Tao Bao2019-03-141-1/+1
| |\| | | | |
| | * | | | | Merge "Start charger at /system/bin/charger."Tao Bao2019-03-141-1/+1
| | |\| | | |
| | | * | | | Merge "Start charger at /system/bin/charger."Tao Bao2019-03-141-1/+1
| | | |\ \ \ \
| | | | * | | | Start charger at /system/bin/charger.Tao Bao2018-09-151-1/+1
* | | | | | | | Merge "Update_verifier: Remove the support for legacy text format CareMap" am: 2e6fbfc31e am: b2d56cb5ffxunchang2019-03-140-0/+0
|\| | | | | | |
| * | | | | | | Merge "Update_verifier: Remove the support for legacy text format CareMap" am: 2e6fbfc31exunchang2019-03-143-88/+6
| |\| | | | | |
| | * | | | | | Merge "Update_verifier: Remove the support for legacy text format CareMap"xunchang2019-03-143-88/+6
| | |\| | | | |
| | | * | | | | Merge "Update_verifier: Remove the support for legacy text format CareMap"Treehugger Robot2019-03-143-88/+6
| | | |\ \ \ \ \
| | | | * | | | | Update_verifier: Remove the support for legacy text format CareMapxunchang2019-03-133-88/+6
* | | | | | | | | Merge "update_verifier: Add some missing #include's." am: 05f9a8e100 am: 6105a6fb6eTao Bao2019-03-141-1/+4
|\| | | | | | | |
| * | | | | | | | Merge "update_verifier: Add some missing #include's." am: 05f9a8e100Tao Bao2019-03-141-1/+4
| |\| | | | | | |
| | * | | | | | | Merge "update_verifier: Add some missing #include's."Tao Bao2019-03-141-1/+4
| | |\| | | | | |
| | | * | | | | | Merge "update_verifier: Add some missing #include's."Treehugger Robot2019-03-141-1/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | update_verifier: Add some missing #include's.Tao Bao2019-03-131-1/+4
* | | | | | | | | Merge "Update_verifier: Remove the support for legacy text format CareMap"Tianjie Xu2019-03-143-88/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update_verifier: Remove the support for legacy text format CareMapxunchang2019-03-133-88/+6
* | | | | | | | | | Merge "Use the package class for wipe packages" am: 2a33682ef5 am: 682cd4fbc4Tianjie Xu2019-03-133-36/+26
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Use the package class for wipe packages" am: 2a33682ef5Tianjie Xu2019-03-133-36/+26
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Use the package class for wipe packages"Tianjie Xu2019-03-133-36/+26
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Use the package class for wipe packages"Tianjie Xu2019-03-133-36/+26
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Use the package class for wipe packagesxunchang2019-03-123-36/+26
* | | | | | | | | | Merge "minui: Managed FDs with smart pointers." am: fc7a0dc3a2 am: 7b8303f072Tao Bao2019-03-122-103/+107
|\| | | | | | | | |
| * | | | | | | | | Merge "minui: Managed FDs with smart pointers." am: fc7a0dc3a2Tao Bao2019-03-122-103/+107
| |\| | | | | | | |
| | * | | | | | | | Merge "minui: Managed FDs with smart pointers."Tao Bao2019-03-122-103/+107
| | |\| | | | | | |
| | | * | | | | | | Merge "minui: Managed FDs with smart pointers."Tao Bao2019-03-122-103/+107
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | minui: Managed FDs with smart pointers.Tao Bao2019-03-112-103/+107
| | | |/ / / / / /
* | | | / / / / / Merge "minui: Fix the wrong move of the callback." am: aefc9e3ba9 am: ea37122996Tao Bao2019-03-121-1/+1
|\| | | | | | | | | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge "minui: Fix the wrong move of the callback." am: aefc9e3ba9Tao Bao2019-03-121-1/+1
| |\| | | | | |
| | * | | | | | Merge "minui: Fix the wrong move of the callback."Tao Bao2019-03-121-1/+1
| | |\| | | | |
| | | * | | | | Merge "minui: Fix the wrong move of the callback."Tao Bao2019-03-111-1/+1
| | | |\ \ \ \ \
| | | | * | | | | minui: Fix the wrong move of the callback.Tao Bao2019-03-111-1/+1
* | | | | | | | | Merge "Create a wrapper class for update package" am: ba9965199a am: d4f28312dcTianjie Xu2019-03-119-88/+314
|\| | | | | | | |
| * | | | | | | | Merge "Create a wrapper class for update package" am: ba9965199aTianjie Xu2019-03-119-88/+314
| |\| | | | | | |
| | * | | | | | | Merge "Create a wrapper class for update package"Tianjie Xu2019-03-119-88/+314
| | |\| | | | | |
| | | * | | | | | Merge "Create a wrapper class for update package"Tianjie Xu2019-03-119-88/+314
| | | |\ \ \ \ \ \
| | | | * | | | | | Create a wrapper class for update packagexunchang2019-03-119-88/+314
* | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 6c54127462 -s ours am: c4c7abfb41 -s oursXin Li2019-03-110-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 6c54127462 -s oursXin Li2019-03-110-0/+0
| |\| | | | | | | |
| | * | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Xin Li2019-03-110-0/+0
| | |\| | | | | | |
| | | * | | | | | | Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Treehugger Robot2019-03-110-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
* | | | | | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3399fdabf5 -s ours am: 645f73ac4b -s oursXin Li2019-03-110-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3399fdabf5 -s oursXin Li2019-03-110-0/+0
| |\| | | | | | | |
| | * | | | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | / / / | | | | | |_|/ / / | | | | |/| | | |
* | | | | | | | | Merge "Add a new entry in wipe package to list all wipe partitions" am: a8969842ae am: de5ba7ab97Tianjie Xu2019-03-083-45/+130
|\| | | | | | | |
| * | | | | | | | Merge "Add a new entry in wipe package to list all wipe partitions" am: a8969842aeTianjie Xu2019-03-083-45/+130
| |\| | | | | | |
| | * | | | | | | Merge "Add a new entry in wipe package to list all wipe partitions"Tianjie Xu2019-03-083-45/+130
| | |\| | | | | |
| | | * | | | | | Merge "Add a new entry in wipe package to list all wipe partitions"Tianjie Xu2019-03-073-45/+130
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Add a new entry in wipe package to list all wipe partitionsxunchang2019-03-073-45/+130
* | | | | | | | | Merge "Use O_CLOEXEC at a few places." am: e3857ca43e am: 4e95d7503eTao Bao2019-03-024-4/+4
|\| | | | | | | |
| * | | | | | | | Merge "Use O_CLOEXEC at a few places." am: e3857ca43eTao Bao2019-03-024-4/+4
| |\| | | | | | |
| | * | | | | | | Merge "Use O_CLOEXEC at a few places."Tao Bao2019-03-024-4/+4
| | |\| | | | | |
| | | * | | | | | Merge "Use O_CLOEXEC at a few places."Treehugger Robot2019-03-024-4/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Use O_CLOEXEC at a few places.Tao Bao2019-03-014-4/+4
| | | |/ / / / /
* | | | | | | | Merge "Use android::base::Pipe." am: 21cfc8b6f4 am: a04a7d89c2Tao Bao2019-03-012-76/+61
|\| | | | | | |
| * | | | | | | Merge "Use android::base::Pipe." am: 21cfc8b6f4Tao Bao2019-03-012-76/+61
| |\| | | | | |
| | * | | | | | Merge "Use android::base::Pipe."Tao Bao2019-03-012-76/+61
| | |\| | | | |
| | | * | | | | Merge "Use android::base::Pipe."Treehugger Robot2019-03-012-76/+61
| | | |\ \ \ \ \
| | | | * | | | | Use android::base::Pipe.Tao Bao2019-03-012-76/+61
| | | |/ / / / /
* | | | | | | | Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12e am: 2ee3614be3Zhomart Mukhamejanov2019-02-261-2/+4
|\| | | | | | |
| * | | | | | | Merge "Updater updater_sample/README.md - build instructions." am: 52db3dc12eZhomart Mukhamejanov2019-02-261-2/+4
| |\| | | | | |
| | * | | | | | Merge "Updater updater_sample/README.md - build instructions."Zhomart Mukhamejanov2019-02-261-2/+4
| | |\| | | | |
| | | * | | | | Merge "Updater updater_sample/README.md - build instructions."Zhomart Mukhamejanov2019-02-261-2/+4
| | | |\ \ \ \ \
| | | | * | | | | Updater updater_sample/README.md - build instructions.Zhomart Mukhamejanov2019-02-261-2/+4
| | | |/ / / / /
* | | | | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | | | | |
| * | | | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | | | |
| | * | | | | | Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-masterXin Li2019-02-210-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-210-0/+0
| | | |\ \ \ \ \ \
* | | | | | | | | | Merge "Add a logo to the fastbootd screen." am: d294935bf7 am: dbefca86b8David Anderson2019-02-2110-1/+26
|\| | | | | | | | |
| * | | | | | | | | Merge "Add a logo to the fastbootd screen." am: d294935bf7David Anderson2019-02-2110-1/+26
| |\| | | | | | | |
| | * | | | | | | | Merge "Add a logo to the fastbootd screen."David Anderson2019-02-2110-1/+26
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | / / / / / | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "Add a logo to the fastbootd screen."David Anderson2019-02-2110-1/+26
| | | |\ \ \ \ \ \
| | | | * | | | | | Add a logo to the fastbootd screen.David Anderson2019-02-1210-1/+26
| | | |/ / / / / /
* | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: fc8af23e97 -s oursBill Yi2019-02-160-0/+0
|\| | | | | | | |
| * | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-02-160-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-161-5/+5
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: c98e5d4ad1 -s oursXin Li2019-02-120-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-masterXin Li2019-02-120-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-masterXin Li2019-02-120-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Snap for 5180536 from 8b508c984d6e516bf20318173aa001f0906672e5 to pi-platform-releaseandroid-build-team Robot2019-02-090-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge "Snap for 5053079 from ad81bd64c27f222114c04efb74ee39d360708711 to pi-qpr2-release" into pi-qpr2-releaseandroid-build-team Robot2018-10-060-0/+0
| | | | |\ \ \ \ \
| | | | | * | | | | Snap for 5053079 from ad81bd64c27f222114c04efb74ee39d360708711 to pi-qpr2-releaseandroid-build-team Robot2018-10-060-0/+0
| | | | | |\| | | |
| | | | * | | | | | Snap for 5053079 from ad81bd64c27f222114c04efb74ee39d360708711 to pi-qpr2-releaseandroid-build-team Robot2018-10-060-0/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| / / / / | | | | | |/ / / /
* | | | | | | | | Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8 am: 5837eba8edDaniel Rosenberg2019-02-082-6/+31
|\| | | | | | | |
| * | | | | | | | Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8Daniel Rosenberg2019-02-082-6/+31
| |\| | | | | | |
| | * | | | | | | Merge "Defer marking boot successful when checkpointing"Daniel Rosenberg2019-02-082-6/+31
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge "Defer marking boot successful when checkpointing"Daniel Rosenberg2019-02-082-6/+31
| | | |\ \ \ \ \ \
| | | | * | | | | | Defer marking boot successful when checkpointingDaniel Rosenberg2019-02-072-6/+31
* | | | | | | | | | Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1 am: 644e290d2dTianjie Xu2019-02-061-2/+2
|\| | | | | | | | |
| * | | | | | | | | Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1Tianjie Xu2019-02-061-2/+2
| |\| | | | | | | |
| | * | | | | | | | Merge "Recovery test: Fix an parameter issue in string construction"Tianjie Xu2019-02-061-2/+2
| | |\| | | | | | |
| | | * | | | | | | Merge "Recovery test: Fix an parameter issue in string construction"Tianjie Xu2019-02-061-2/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Recovery test: Fix an parameter issue in string constructionxunchang2019-02-051-2/+2
| | | |/ / / / / /
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-021-10/+10
* | | | | | | | | Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95f am: 9594188eeaTom Cherry2019-01-315-5/+18
|\| | | | | | | |
| * | | | | | | | Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95fTom Cherry2019-01-315-5/+18
| |\| | | | | | |
| | * | | | | | | Merge "Add android::fs_mgr namespace for new Fstab code"Tom Cherry2019-01-315-5/+18
| | |\| | | | | |
| | | * | | | | | Merge "Add android::fs_mgr namespace for new Fstab code"Tom Cherry2019-01-315-5/+18
| | | |\ \ \ \ \ \
| | | | * | | | | | Add android::fs_mgr namespace for new Fstab codeTom Cherry2019-01-315-5/+18
| | | |/ / / / / /
* | | | | | | | | Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9 am: cc025b2b4aTianjie Xu2019-01-301-3/+5
|\| | | | | | | |
| * | | | | | | | Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9Tianjie Xu2019-01-301-3/+5
| |\| | | | | | |
| | * | | | | | | Merge "Fix potential size overflow in blockimg.cpp"Tianjie Xu2019-01-301-3/+5
| | |\| | | | | |
| | | * | | | | | Merge "Fix potential size overflow in blockimg.cpp"Tianjie Xu2019-01-301-3/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix potential size overflow in blockimg.cppxunchang2019-01-171-3/+5
* | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s ours am: 2b8e48240e -s oursSuren Baghdasaryan2019-01-250-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s oursSuren Baghdasaryan2019-01-250-0/+0
| |\| | | | | | | |
| | * | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency"""Suren Baghdasaryan2019-01-250-0/+0
| | |\| | | | | | |
| | | * | | | | | | Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency"""Suren Baghdasaryan2019-01-251-0/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""Suren Baghdasaryan2019-01-251-0/+1
| | | |/ / / / / / /
* | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s ours am: 56d6cf2c94 -s oursSuren Baghdasaryan2019-01-240-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s oursSuren Baghdasaryan2019-01-240-0/+0
| |\| | | | | | | |
| | * | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""Suren Baghdasaryan2019-01-240-0/+0
| | |\| | | | | | |
| | | * | | | | | | Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""Suren Baghdasaryan2019-01-241-1/+0
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | DO NOT MERGE: Revert "Add libprocessgroup dependency"Suren Baghdasaryan2019-01-241-1/+0
* | | | | | | | | | | Merge "Check that install file exists before unlink" am: 05d48050c1 am: a04ff295cfNg Zhi An2019-01-241-2/+2
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Check that install file exists before unlink" am: 05d48050c1Ng Zhi An2019-01-241-2/+2
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Check that install file exists before unlink"Ng Zhi An2019-01-241-2/+2
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Check that install file exists before unlink"Treehugger Robot2019-01-241-2/+2
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Check that install file exists before unlinkNg Zhi An2019-01-241-2/+2
| | | |/ / / / / / /
* | | | | | | | | | [automerger skipped] Merge "Add libprocessgroup dependency" am: 4475f7330a am: bd36c3a8ecSuren Baghdasaryan2019-01-220-0/+0
|\| | | | | | | | |
| * | | | | | | | | Merge "Add libprocessgroup dependency" am: 4475f7330aSuren Baghdasaryan2019-01-221-0/+1
| |\| | | | | | | |
| | * | | | | | | | Merge "Add libprocessgroup dependency"Suren Baghdasaryan2019-01-221-0/+1
| | |\| | | | | | |
| | | * | | | | | | Merge "Add libprocessgroup dependency"Suren Baghdasaryan2019-01-221-0/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Add libprocessgroup dependencySuren Baghdasaryan2019-01-201-0/+1
| | | |/ / / / / / /
* | | | | | | | | | Add libprocessgroup dependencySuren Baghdasaryan2019-01-171-0/+1
* | | | | | | | | | Merge "e2fsck_static is no longer needed for remount" am: 725d7f8dfd am: f1fd5ec266Hridya Valsaraju2019-01-171-8/+0
|\| | | | | | | | |
| * | | | | | | | | Merge "e2fsck_static is no longer needed for remount" am: 725d7f8dfdHridya Valsaraju2019-01-171-8/+0
| |\| | | | | | | |
| | * | | | | | | | Merge "e2fsck_static is no longer needed for remount"Hridya Valsaraju2019-01-171-8/+0
| | |\| | | | | | |
| | | * | | | | | | Merge "e2fsck_static is no longer needed for remount"Treehugger Robot2019-01-171-8/+0
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | e2fsck_static is no longer needed for remountHridya Valsaraju2019-01-171-8/+0
| | | |/ / / / / / /
* | | | | | | | | | Merge "screen_ui: Trivial fix to append newline when logging." am: 594a63cc9d am: fadc163b60Tao Bao2019-01-171-2/+2
|\| | | | | | | | |
| * | | | | | | | | Merge "screen_ui: Trivial fix to append newline when logging." am: 594a63cc9dTao Bao2019-01-171-2/+2
| |\| | | | | | | | | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge "screen_ui: Trivial fix to append newline when logging."Tao Bao2019-01-171-2/+2
| | |\| | | | | |
| | | * | | | | | Merge "screen_ui: Trivial fix to append newline when logging."Tao Bao2019-01-171-2/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | screen_ui: Trivial fix to append newline when logging.Tao Bao2019-01-161-2/+2
* | | | | | | | | Merge "updater: add functions to modify dynamic partition metadata" am: 27aa9404fc am: 4def1e8a54Yifan Hong2019-01-167-9/+534
|\| | | | | | | |
| * | | | | | | | Merge "updater: add functions to modify dynamic partition metadata" am: 27aa9404fcYifan Hong2019-01-167-9/+534
| |\| | | | | | |
| | * | | | | | | Merge "updater: add functions to modify dynamic partition metadata"Yifan Hong2019-01-167-9/+534
| | |\| | | | | |
| | | * | | | | | Merge "updater: add functions to modify dynamic partition metadata"Yifan Hong2019-01-167-9/+534
| | | |\ \ \ \ \ \
| | | | * | | | | | updater: add functions to modify dynamic partition metadataYifan Hong2019-01-147-9/+534
| | | |/ / / / / /
* | | | | | | | | Merge "Create stash dir recursively." am: 7a0b65472b am: 32932a48f9Yifan Hong2019-01-141-1/+2
|\| | | | | | | |
| * | | | | | | | Merge "Create stash dir recursively." am: 7a0b65472bYifan Hong2019-01-141-1/+2
| |\| | | | | | |
| | * | | | | | | Merge "Create stash dir recursively."Yifan Hong2019-01-141-1/+2
| | |\| | | | | |
| | | * | | | | | Merge "Create stash dir recursively."Yifan Hong2019-01-141-1/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Create stash dir recursively.Yifan Hong2019-01-121-1/+2
| | | |/ / / / /
* | | | | | | | Merge "Use dynamically linked f2fs executables." am: 22a27f9965 am: ad4ce79b4dTao Bao2019-01-084-25/+21
|\| | | | | | |
| * | | | | | | Merge "Use dynamically linked f2fs executables." am: 22a27f9965Tao Bao2019-01-084-25/+21
| |\| | | | | |
| | * | | | | | Merge "Use dynamically linked f2fs executables."Tao Bao2019-01-084-25/+21
| | |\| | | | |
| | | * | | | | Merge "Use dynamically linked f2fs executables."Tao Bao2019-01-084-25/+21
| | | |\ \ \ \ \
| | | | * | | | | Use dynamically linked f2fs executables.Tao Bao2018-12-204-25/+21
* | | | | | | | | Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" am: 08a8b40c91 am: 159d267cc6Yifan Hong2019-01-081-11/+10
|\| | | | | | | |
| * | | | | | | | Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" am: 08a8b40c91Yifan Hong2019-01-081-11/+10
| |\| | | | | | |
| | * | | | | | | Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD"Yifan Hong2019-01-081-11/+10
| | |\| | | | | |
| | | * | | | | | Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD"Yifan Hong2019-01-081-11/+10
| | | |\ \ \ \ \ \
| | | | * | | | | | updater: erase ignores EOPNOTSUPP for BLKDISCARDYifan Hong2019-01-051-11/+10
| | | |/ / / / / /
* | | | | | | | | Merge "minadbd: daemon_service_to_fd takes std::string_view." am: 72aa58dcf7 am: 29578b1117Tao Bao2019-01-022-7/+9
|\| | | | | | | |
| * | | | | | | | Merge "minadbd: daemon_service_to_fd takes std::string_view." am: 72aa58dcf7Tao Bao2019-01-022-7/+9
| |\| | | | | | |
| | * | | | | | | Merge "minadbd: daemon_service_to_fd takes std::string_view."Tao Bao2019-01-022-7/+9
| | |\| | | | | |
| | | * | | | | | Merge "minadbd: daemon_service_to_fd takes std::string_view."Tao Bao2019-01-022-7/+9
| | | |\ \ \ \ \ \
| | | | * | | | | | minadbd: daemon_service_to_fd takes std::string_view.Tao Bao2019-01-022-7/+9
| | | |/ / / / / /
* | | | | | | | | Merge "Add a horizontal line at the end of the graphic menu" am: fc0665c701 am: 095b6858ddTianjie Xu2018-12-211-0/+1
|\| | | | | | | |
| * | | | | | | | Merge "Add a horizontal line at the end of the graphic menu" am: fc0665c701Tianjie Xu2018-12-211-0/+1
| |\| | | | | | |
| | * | | | | | | Merge "Add a horizontal line at the end of the graphic menu"Tianjie Xu2018-12-211-0/+1
| | |\| | | | | |
| | | * | | | | | Merge "Add a horizontal line at the end of the graphic menu"Tianjie Xu2018-12-211-0/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Add a horizontal line at the end of the graphic menuxunchang2018-12-201-0/+1
* | | | | | | | | Merge "Clean up the arg setup for exec(3)." am: f0c03e62a2 am: 1b94d3a35bTao Bao2018-12-203-68/+40
|\| | | | | | | |
| * | | | | | | | Merge "Clean up the arg setup for exec(3)." am: f0c03e62a2Tao Bao2018-12-203-68/+40
| |\| | | | | | |
| | * | | | | | | Merge "Clean up the arg setup for exec(3)."Tao Bao2018-12-203-68/+40
| | |\| | | | | |
| | | * | | | | | Merge "Clean up the arg setup for exec(3)."Tao Bao2018-12-203-68/+40
| | | |\ \ \ \ \ \
| | | | * | | | | | Clean up the arg setup for exec(3).Tao Bao2018-12-203-68/+40
| | | |/ / / / / /
* | | | | | | | | Merge changes from topic "vintf_object_recovery_mount" am: 82fc6ae5b8 am: cc6eb0ee44Yifan Hong2018-12-206-61/+57
|\| | | | | | | |
| * | | | | | | | Merge changes from topic "vintf_object_recovery_mount" am: 82fc6ae5b8Yifan Hong2018-12-196-61/+57
| |\| | | | | | |
| | * | | | | | | Merge changes from topic "vintf_object_recovery_mount"Yifan Hong2018-12-196-61/+57
| | |\| | | | | |
| | | * | | | | | Merge changes from topic "vintf_object_recovery_mount"Yifan Hong2018-12-197-181/+61
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | roots.cpp: convert to C++ FstabYifan Hong2018-12-196-61/+57
* | | | | | | | | Move parts of roots.cpp to libfs_mgr am: 0f339e27bb am: 6e232ed3ceYifan Hong2018-12-202-124/+8
|\| | | | | | | |
| * | | | | | | | Move parts of roots.cpp to libfs_mgr am: 0f339e27bbYifan Hong2018-12-192-124/+8
| |\| | | | | | |
| | * | | | | | | Move parts of roots.cpp to libfs_mgrYifan Hong2018-12-192-124/+8
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Move parts of roots.cpp to libfs_mgrYifan Hong2018-12-192-124/+8
* | | | | | | | | Merge "Add verification before downloading whole package" am: 2e7393dbde am: e84953e9aaZhomart Mukhamejanov2018-12-182-1/+52
|\| | | | | | | |
| * | | | | | | | Merge "Add verification before downloading whole package" am: 2e7393dbdeZhomart Mukhamejanov2018-12-182-1/+52
| |\| | | | | | |
| | * | | | | | | Merge "Add verification before downloading whole package"Zhomart Mukhamejanov2018-12-182-1/+52
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "Add verification before downloading whole package"Zhomart Mukhamejanov2018-12-182-1/+52
| | | |\ \ \ \ \ \
| | | | * | | | | | Add verification before downloading whole packageZhomart Mukhamejanov2018-12-172-1/+52
| | | |/ / / / / /
* | | | | | | | | [automerger skipped] Merge "Add PrepareUpdateService." am: 2e33cbeb20 am: 1811a6b734Zhomart Mukhamejanov2018-12-170-0/+0
|\| | | | | | | |
| * | | | | | | | Merge "Add PrepareUpdateService." am: 2e33cbeb20Zhomart Mukhamejanov2018-12-177-113/+110
| |\| | | | | | |
| | * | | | | | | Merge "Add PrepareUpdateService."Zhomart Mukhamejanov2018-12-177-113/+110
| | |\| | | | | |
| | | * | | | | | Merge "Add PrepareUpdateService."Zhomart Mukhamejanov2018-12-177-113/+110
| | | |\ \ \ \ \ \
| | | | * | | | | | Add PrepareUpdateService.Zhomart Mukhamejanov2018-12-177-113/+110
* | | | | | | | | | Merge "use epoll_create1" am: a8d712ec50 am: 649d2d35dcNick Kralevich2018-12-171-1/+1
|\| | | | | | | | |
| * | | | | | | | | Merge "use epoll_create1" am: a8d712ec50Nick Kralevich2018-12-171-1/+1
| |\| | | | | | | |
| | * | | | | | | | Merge "use epoll_create1"Nick Kralevich2018-12-171-1/+1
| | |\| | | | | | |
| | | * | | | | | | Merge "use epoll_create1"Treehugger Robot2018-12-171-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | use epoll_create1Nick Kralevich2018-12-171-1/+1
| | | | |/ / / / / /
* | | | | | | | | | Merge "applypatch: Fix comparison of integers of different signs." am: dfbdaf3f1d am: acdb8d8d18Tao Bao2018-12-172-5/+13
|\| | | | | | | | |
| * | | | | | | | | Merge "applypatch: Fix comparison of integers of different signs." am: dfbdaf3f1dTao Bao2018-12-172-5/+13
| |\| | | | | | | |
| | * | | | | | | | Merge "applypatch: Fix comparison of integers of different signs."Tao Bao2018-12-172-5/+13
| | |\| | | | | | |
| | | * | | | | | | Merge "applypatch: Fix comparison of integers of different signs."Tao Bao2018-12-172-5/+13
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | applypatch: Fix comparison of integers of different signs.Tao Bao2018-12-172-5/+13
| | | |/ / / / / /
* | | | | | | | | Add PrepareUpdateService.Zhomart Mukhamejanov2018-12-158-113/+111
* | | | | | | | | Migrate bootable/recovery to androidx.testkoushik panuganti2018-12-127-16/+20
* | | | | | | | | Merge "Show wipe data confirmation text in recovery mode" am: c456aab7e2 am: 608acc9ca2Tianjie Xu2018-12-125-6/+51
|\| | | | | | | |
| * | | | | | | | Merge "Show wipe data confirmation text in recovery mode" am: c456aab7e2Tianjie Xu2018-12-125-6/+51
| |\| | | | | | |
| | * | | | | | | Merge "Show wipe data confirmation text in recovery mode"Tianjie Xu2018-12-125-6/+51
| | |\| | | | | |
| | | * | | | | | Merge "Show wipe data confirmation text in recovery mode"Tianjie Xu2018-12-125-6/+51
| | | |\ \ \ \ \ \
| | | | * | | | | | Show wipe data confirmation text in recovery modeTianjie Xu2018-12-125-6/+51
| | | |/ / / / / /
* | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 00ab5cd4f7 -s oursBill Yi2018-12-120-0/+0
|\| | | | | | | |
| * | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-12-120-0/+0
| |\| | | | | | |
| | * | | | | | | Import translations. DO NOT MERGEBill Yi2018-12-1185-0/+425
* | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-12-110-0/+0
|\| | | | | | | |
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2018-12-1185-0/+425
* | | | | | | | | Merge "tests: Temporarily disable ScreenRecoveryUITest tests." am: ceab300864 am: f68cf7c34fTao Bao2018-12-071-18/+18
|\| | | | | | | |
| * | | | | | | | Merge "tests: Temporarily disable ScreenRecoveryUITest tests." am: ceab300864Tao Bao2018-12-071-18/+18
| |\| | | | | | |
| | * | | | | | | Merge "tests: Temporarily disable ScreenRecoveryUITest tests."Tao Bao2018-12-071-18/+18
| | |\| | | | | |
| | | * | | | | | Merge "tests: Temporarily disable ScreenRecoveryUITest tests."Tao Bao2018-12-071-18/+18
| | | |\ \ \ \ \ \
| | | | * | | | | | tests: Temporarily disable ScreenRecoveryUITest tests.Tao Bao2018-12-061-18/+18
| | | |/ / / / / /
* | | | | | | | | Merge changes Id946ab1c,Ifacd01d6 am: 5de42a592a am: 211fe93f19Tao Bao2018-12-061-175/+166
|\| | | | | | | |
| * | | | | | | | Merge changes Id946ab1c,Ifacd01d6 am: 5de42a592aTao Bao2018-12-061-175/+166
| |\| | | | | | |
| | * | | | | | | Merge changes Id946ab1c,Ifacd01d6Tao Bao2018-12-061-175/+166
| | |\| | | | | |
| | | * | | | | | Merge changes Id946ab1c,Ifacd01d6Treehugger Robot2018-12-061-175/+166
| | | |\ \ \ \ \ \
| | | | * | | | | | uncrypt: Fix the comparison in FindBlockDevice().Tao Bao2018-12-051-3/+1
| | | | * | | | | | uncrypt: Replace a few C-strings with std::string.Tao Bao2018-12-051-175/+168
| | | |/ / / / / /
* | | | | | | | | Merge "Move some small users of fstab to new C++ Fstab" am: 62040c53e0 am: 94b3574440Tom Cherry2018-12-052-35/+27
|\| | | | | | | |
| * | | | | | | | Merge "Move some small users of fstab to new C++ Fstab" am: 62040c53e0Tom Cherry2018-12-052-35/+27
| |\| | | | | | |
| | * | | | | | | Merge "Move some small users of fstab to new C++ Fstab"Tom Cherry2018-12-052-35/+27
| | |\| | | | | |
| | | * | | | | | Merge "Move some small users of fstab to new C++ Fstab"Tom Cherry2018-12-052-35/+27
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Move some small users of fstab to new C++ FstabTom Cherry2018-12-042-35/+27
| | | |/ / / / /
* | | | | | | | Merge "C++17 is the default now." am: 8fc15c02bd am: 9f909492c0Elliott Hughes2018-12-042-3/+0
|\| | | | | | |
| * | | | | | | Merge "C++17 is the default now." am: 8fc15c02bdElliott Hughes2018-12-032-3/+0
| |\| | | | | |
| | * | | | | | Merge "C++17 is the default now."Elliott Hughes2018-12-032-3/+0
| | |\| | | | |
| | | * | | | | Merge "C++17 is the default now."Treehugger Robot2018-12-032-3/+0
| | | |\ \ \ \ \
| | | | * | | | | C++17 is the default now.Elliott Hughes2018-12-032-3/+0
| | | |/ / / / /
* | | | | | | | Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks" am: a37aa092c7 am: ec6d0626f4Yifan Hong2018-12-011-1/+1
|\| | | | | | |
| * | | | | | | Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks" am: a37aa092c7Yifan Hong2018-12-011-1/+1
| |\| | | | | |
| | * | | | | | Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks"Yifan Hong2018-12-011-1/+1
| | |\| | | | |
| | | * | | | | Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks"Treehugger Robot2018-12-011-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Fix ensure_path_mounted_at for fsck_unshare_blocksYifan Hong2018-12-011-1/+1
* | | | | | | | | Merge "ImageGenerator: ignore the duplicate locales" am: 7846823125 am: af36438170Tianjie Xu2018-12-011-8/+14
|\| | | | | | | |
| * | | | | | | | Merge "ImageGenerator: ignore the duplicate locales" am: 7846823125Tianjie Xu2018-12-011-8/+14
| |\| | | | | | |
| | * | | | | | | Merge "ImageGenerator: ignore the duplicate locales"Tianjie Xu2018-12-011-8/+14
| | |\| | | | | |
| | | * | | | | | Merge "ImageGenerator: ignore the duplicate locales"Tianjie Xu2018-12-011-8/+14
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | ImageGenerator: ignore the duplicate localesxunchang2018-11-291-8/+14
* | | | | | | | | Merge "SYSTEM_ROOT -> get_system_root" am: cbfeb7f6af am: fe00ae099cYifan Hong2018-11-304-18/+17
|\| | | | | | | |
| * | | | | | | | Merge "SYSTEM_ROOT -> get_system_root" am: cbfeb7f6afYifan Hong2018-11-304-18/+17
| |\| | | | | | |
| | * | | | | | | Merge "SYSTEM_ROOT -> get_system_root"Yifan Hong2018-11-304-18/+17
| | |\| | | | | |
| | | * | | | | | Merge "SYSTEM_ROOT -> get_system_root"Yifan Hong2018-11-304-18/+17
| | | |\ \ \ \ \ \
| | | | * | | | | | SYSTEM_ROOT -> get_system_rootYifan Hong2018-11-284-18/+17
* | | | | | | | | | Merge "Update for long long -> off64_t for fstab.length" am: 1f66578d6f am: 21197a7f2bTom Cherry2018-11-301-1/+2
|\| | | | | | | | |
| * | | | | | | | | Merge "Update for long long -> off64_t for fstab.length" am: 1f66578d6fTom Cherry2018-11-301-1/+2
| |\| | | | | | | |
| | * | | | | | | | Merge "Update for long long -> off64_t for fstab.length"Tom Cherry2018-11-301-1/+2
| | |\| | | | | | |
| | | * | | | | | | Merge "Update for long long -> off64_t for fstab.length"Tom Cherry2018-11-301-1/+2
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Update for long long -> off64_t for fstab.lengthTom Cherry2018-11-291-1/+2
* | | | | | | | | | Merge "ImageGenerator: Handle special characters in xml files" am: 697003dbce am: f2099b7872Tianjie Xu2018-11-291-13/+34
|\| | | | | | | | |
| * | | | | | | | | Merge "ImageGenerator: Handle special characters in xml files" am: 697003dbceTianjie Xu2018-11-291-13/+34
| |\| | | | | | | |
| | * | | | | | | | Merge "ImageGenerator: Handle special characters in xml files"Tianjie Xu2018-11-291-13/+34
| | |\| | | | | | |
| | | * | | | | | | Merge "ImageGenerator: Handle special characters in xml files"Tianjie Xu2018-11-291-13/+34
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | ImageGenerator: Handle special characters in xml filesxunchang2018-11-291-13/+34
* | | | | | | | | | Merge "ImageGenerator: switch to BreakIterator from icu library" am: 86936c46a8 am: 49ba6fc534Tianjie Xu2018-11-282-62/+24
|\| | | | | | | | |
| * | | | | | | | | Merge "ImageGenerator: switch to BreakIterator from icu library" am: 86936c46a8Tianjie Xu2018-11-282-62/+24
| |\| | | | | | | |
| | * | | | | | | | Merge "ImageGenerator: switch to BreakIterator from icu library"Tianjie Xu2018-11-282-62/+24
| | |\| | | | | | |
| | | * | | | | | | Merge "ImageGenerator: switch to BreakIterator from icu library"Tianjie Xu2018-11-282-62/+24
| | | |\| | | | | |
| | | | * | | | | | ImageGenerator: switch to BreakIterator from icu libraryxunchang2018-11-282-62/+24
* | | | | | | | | | Merge "make_f2fs: use -g android by default" am: 4cd38430d7 am: f8c230a072Jaegeuk Kim2018-11-282-11/+2
|\| | | | | | | | |
| * | | | | | | | | Merge "make_f2fs: use -g android by default" am: 4cd38430d7Jaegeuk Kim2018-11-282-11/+2
| |\| | | | | | | |
| | * | | | | | | | Merge "make_f2fs: use -g android by default"Jaegeuk Kim2018-11-282-11/+2
| | |\| | | | | | |
| | | * | | | | | | Merge "make_f2fs: use -g android by default"Jaegeuk Kim2018-11-282-11/+2
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | make_f2fs: use -g android by defaultJaegeuk Kim2018-11-212-11/+2
* | | | | | | | | | | Merge "Update README.md." am: c075d688fd am: 096d3205b4Tao Bao2018-11-281-13/+6
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Update README.md." am: c075d688fdTao Bao2018-11-281-13/+6
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Update README.md."Tao Bao2018-11-281-13/+6
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Update README.md."Treehugger Robot2018-11-281-13/+6
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Update README.md.Tao Bao2018-11-271-13/+6
| | | | | |/ / / / / / | | | | |/| | | | | |
* | | | | | | | | | | Merge "minui: GRSurface::Create() computes data_size on its own." am: a54b883607 am: 67a57dbed0Tao Bao2018-11-289-43/+66
|\| | | | | | | | | |
| * | | | | | | | | | Merge "minui: GRSurface::Create() computes data_size on its own." am: a54b883607Tao Bao2018-11-289-43/+66
| |\| | | | | | | | |
| | * | | | | | | | | Merge "minui: GRSurface::Create() computes data_size on its own."Tao Bao2018-11-289-43/+66
| | |\| | | | | | | |
| | | * | | | | | | | Merge "minui: GRSurface::Create() computes data_size on its own."Tao Bao2018-11-289-43/+66
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | minui: GRSurface::Create() computes data_size on its own.Tao Bao2018-11-279-43/+66
| | | |/ / / / / / /
* | | | | | | | | | Merge "minui: Fix a wrong arg in calling GRSurface::Create()." am: ea4ec3149b am: 1166fd1855Tao Bao2018-11-273-1/+38
|\| | | | | | | | |
| * | | | | | | | | Merge "minui: Fix a wrong arg in calling GRSurface::Create()." am: ea4ec3149bTao Bao2018-11-273-1/+38
| |\| | | | | | | |
| | * | | | | | | | Merge "minui: Fix a wrong arg in calling GRSurface::Create()."Tao Bao2018-11-273-1/+38
| | |\| | | | | | |
| | | * | | | | | | Merge "minui: Fix a wrong arg in calling GRSurface::Create()."Tao Bao2018-11-273-1/+38
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | minui: Fix a wrong arg in calling GRSurface::Create().Tao Bao2018-11-273-1/+38
| | | |/ / / / / /
* | | | | | | | | Merge changes I7b7cee68,I07d22c0d am: fb8a636a2d am: 5e789287d4Tianjie Xu2018-11-261-28/+176
|\| | | | | | | |
| * | | | | | | | Merge changes I7b7cee68,I07d22c0d am: fb8a636a2dTianjie Xu2018-11-261-28/+176
| |\| | | | | | |
| | * | | | | | | Merge changes I7b7cee68,I07d22c0dTianjie Xu2018-11-261-28/+176
| | |\| | | | | |
| | | * | | | | | Merge changes I7b7cee68,I07d22c0dTianjie Xu2018-11-261-28/+176
| | | |\ \ \ \ \ \
| | | | * | | | | | ImageGenerator: add an option to specify the supported localesTianjie Xu2018-11-261-4/+42
| | | | * | | | | | Handle rendering problem for the word "Android" and punctuationsTianjie Xu2018-11-261-24/+134
| | | |/ / / / / /
* | | | | | | | | Merge "uncrypt: write permission for f2fs_pin_file" am: d65cde7c5a am: 04630e738eJaegeuk Kim2018-11-221-1/+1
|\| | | | | | | |
| * | | | | | | | Merge "uncrypt: write permission for f2fs_pin_file" am: d65cde7c5aJaegeuk Kim2018-11-221-1/+1
| |\| | | | | | |
| | * | | | | | | Merge "uncrypt: write permission for f2fs_pin_file"Jaegeuk Kim2018-11-221-1/+1
| | |\| | | | | |
| | | * | | | | | Merge "uncrypt: write permission for f2fs_pin_file"Jaegeuk Kim2018-11-221-1/+1
| | | |\| | | | |
| | | | * | | | | uncrypt: write permission for f2fs_pin_fileJaegeuk Kim2018-11-211-1/+1
| | | |/ / / / /
* | | | | | | | Merge "Delete the dumpkey host tool" am: 14d5540426 am: 74fa7cd1d9Tianjie Xu2018-11-213-298/+0
|\| | | | | | |
| * | | | | | | Merge "Delete the dumpkey host tool" am: 14d5540426Tianjie Xu2018-11-213-298/+0
| |\| | | | | |
| | * | | | | | Merge "Delete the dumpkey host tool"Tianjie Xu2018-11-213-298/+0
| | |\| | | | |
| | | * | | | | Merge "Delete the dumpkey host tool"Tianjie Xu2018-11-213-298/+0
| | | |\ \ \ \ \
| | | | * | | | | Delete the dumpkey host toolTianjie Xu2018-10-293-298/+0
* | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" am: d01f664cae -s ours am: f1cb8dbdee -s oursTianjie Xu2018-11-210-0/+0
|\| | | | | | | |
| * | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" am: d01f664cae -s oursTianjie Xu2018-11-210-0/+0
| |\| | | | | | |
| | * | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE"Tianjie Xu2018-11-210-0/+0
| | |\| | | | | |
| | | * | | | | | Merge "Import translations. DO NOT MERGE"Tianjie Xu2018-11-2185-0/+425
| | | |\ \ \ \ \ \
| | | | * | | | | | Import translations. DO NOT MERGEBill Yi2018-11-1685-0/+425
* | | | | | | | | | Merge "logical -> dynamic partitions." am: b22bd959e5 am: 5f16d61150Yifan Hong2018-11-171-2/+2
|\| | | | | | | | |
| * | | | | | | | | Merge "logical -> dynamic partitions." am: b22bd959e5Yifan Hong2018-11-171-2/+2
| |\| | | | | | | |
| | * | | | | | | | Merge "logical -> dynamic partitions."Yifan Hong2018-11-171-2/+2
| | |\| | | | | | |
| | | * | | | | | | Merge "logical -> dynamic partitions."Treehugger Robot2018-11-171-2/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | logical -> dynamic partitions.Yifan Hong2018-11-161-2/+2
* | | | | | | | | | Merge "switch to using android-base/file.h instead of android-base/test_utils.h" am: 814c306106 am: 838cac4798Mark Salyzyn2018-11-1515-15/+3
|\| | | | | | | | |
| * | | | | | | | | Merge "switch to using android-base/file.h instead of android-base/test_utils.h" am: 814c306106Mark Salyzyn2018-11-1515-15/+3
| |\| | | | | | | |
| | * | | | | | | | Merge "switch to using android-base/file.h instead of android-base/test_utils.h"Mark Salyzyn2018-11-1515-15/+3
| | |\| | | | | | |
| | | * | | | | | | Merge "switch to using android-base/file.h instead of android-base/test_utils.h"Treehugger Robot2018-11-1515-15/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | switch to using android-base/file.h instead of android-base/test_utils.hMark Salyzyn2018-11-1515-15/+3
* | | | | | | | | | | Merge "minadbd: track adb C++ version change." am: b67811dd49 am: 421a39e271Josh Gao2018-11-151-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge "minadbd: track adb C++ version change." am: b67811dd49Josh Gao2018-11-151-0/+1
| |\| | | | | | | | |
| | * | | | | | | | | Merge "minadbd: track adb C++ version change."Josh Gao2018-11-151-0/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "minadbd: track adb C++ version change."Josh Gao2018-11-151-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | minadbd: track adb C++ version change.Josh Gao2018-11-131-0/+1
* | | | | | | | | | | | Merge "Adjust the background text image width to reduce its size" am: 4ef9cb27eb am: f565ebb45fTianjie Xu2018-11-152-27/+82
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Adjust the background text image width to reduce its size" am: 4ef9cb27ebTianjie Xu2018-11-152-27/+82
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Adjust the background text image width to reduce its size"Tianjie Xu2018-11-152-27/+82
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Adjust the background text image width to reduce its size"Tianjie Xu2018-11-152-27/+82
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Adjust the background text image width to reduce its sizeTianjie Xu2018-11-152-27/+82
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "Use the non-LTO/PGO hwbinder in recovery_component_test" am: 87e2fc3831 am: 30b4ad5c56Pirama Arumuga Nainar2018-11-151-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Use the non-LTO/PGO hwbinder in recovery_component_test" am: 87e2fc3831Pirama Arumuga Nainar2018-11-151-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Use the non-LTO/PGO hwbinder in recovery_component_test"Pirama Arumuga Nainar2018-11-151-1/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Use the non-LTO/PGO hwbinder in recovery_component_test"Treehugger Robot2018-11-151-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Use the non-LTO/PGO hwbinder in recovery_component_testPirama Arumuga Nainar2018-11-141-1/+1
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "image generator: format the java file" am: 860c82a66b am: 5faf4021c9Tianjie Xu2018-11-141-469/+482
|\| | | | | | | | | |
| * | | | | | | | | | Merge "image generator: format the java file" am: 860c82a66bTianjie Xu2018-11-141-469/+482
| |\| | | | | | | | |
| | * | | | | | | | | Merge "image generator: format the java file"Tianjie Xu2018-11-141-469/+482
| | |\| | | | | | | |
| | | * | | | | | | | Merge "image generator: format the java file"Tianjie Xu2018-11-141-469/+482
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | image generator: format the java fileTianjie Xu2018-11-131-469/+482
| | | |/ / / / / / /
* | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-11-1385-850/+425
* | | | | | | | | | Merge "Check and dump the signal info for killed updater." am: 02a945556e am: d409598e08Tao Bao2018-11-091-2/+9
|\| | | | | | | | |
| * | | | | | | | | Merge "Check and dump the signal info for killed updater." am: 02a945556eTao Bao2018-11-091-2/+9
| |\| | | | | | | |
| | * | | | | | | | Merge "Check and dump the signal info for killed updater."Tao Bao2018-11-091-2/+9
| | |\| | | | | | |
| | | * | | | | | | Merge "Check and dump the signal info for killed updater."Treehugger Robot2018-11-081-2/+9
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Check and dump the signal info for killed updater.Tao Bao2018-11-081-2/+9
* | | | | | | | | | | Merge "minui: GRSurface manages data with std::unique_ptr." am: 481613b35f am: 6f42a59e7dTao Bao2018-11-082-13/+16
|\| | | | | | | | | |
| * | | | | | | | | | Merge "minui: GRSurface manages data with std::unique_ptr." am: 481613b35fTao Bao2018-11-082-13/+16
| |\| | | | | | | | |
| | * | | | | | | | | Merge "minui: GRSurface manages data with std::unique_ptr."Tao Bao2018-11-082-13/+16
| | |\| | | | | | | |
| | | * | | | | | | | Merge "minui: GRSurface manages data with std::unique_ptr."Tao Bao2018-11-082-13/+16
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | minui: GRSurface manages data with std::unique_ptr.Tao Bao2018-11-072-13/+16
| | | |/ / / / / / /
* | | | | | | | | | Merge changes If24c6b7c,I381b0103 am: 67b7e64034 am: aeda63b106Tao Bao2018-11-062-15/+12
|\| | | | | | | | |
| * | | | | | | | | Merge changes If24c6b7c,I381b0103 am: 67b7e64034Tao Bao2018-11-062-15/+12
| |\| | | | | | | |
| | * | | | | | | | Merge changes If24c6b7c,I381b0103Tao Bao2018-11-062-15/+12
| | |\| | | | | | |
| | | * | | | | | | Merge changes If24c6b7c,I381b0103Tao Bao2018-11-062-15/+12
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | image_generator: Fix the warnings on import order.Tao Bao2018-11-061-13/+11
| | | | * | | | | | | Add tools/ to the style-checking path.Tao Bao2018-11-061-2/+1
| | | |/ / / / / / /
* | | | | | | | | | Merge "tests: Add a testcase for updater overrun while patching." am: d1f105a466 am: 5a47206ffbTao Bao2018-11-061-80/+85
|\| | | | | | | | |
| * | | | | | | | | Merge "tests: Add a testcase for updater overrun while patching." am: d1f105a466Tao Bao2018-11-061-80/+85
| |\| | | | | | | |
| | * | | | | | | | Merge "tests: Add a testcase for updater overrun while patching."Tao Bao2018-11-061-80/+85
| | |\| | | | | | |
| | | * | | | | | | Merge "tests: Add a testcase for updater overrun while patching."Tao Bao2018-11-061-80/+85
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | tests: Add a testcase for updater overrun while patching.Tao Bao2018-11-061-80/+85
| | | |/ / / / / / /
* | | | | | | | | | Merge "ui: Manage loaded resources with smart pointers." am: 06aea3a894 am: 18a5d529cdTao Bao2018-11-064-163/+165
|\| | | | | | | | |
| * | | | | | | | | Merge "ui: Manage loaded resources with smart pointers." am: 06aea3a894Tao Bao2018-11-064-163/+165
| |\| | | | | | | |
| | * | | | | | | | Merge "ui: Manage loaded resources with smart pointers."Tao Bao2018-11-064-163/+165
| | |\| | | | | | |
| | | * | | | | | | Merge "ui: Manage loaded resources with smart pointers."Treehugger Robot2018-11-064-163/+165
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | ui: Manage loaded resources with smart pointers.Tao Bao2018-11-054-163/+165
* | | | | | | | | | | Merge "updater: Error out on underrun during patching." am: a0404ecd16 am: 2a4e64a351Tao Bao2018-11-052-1/+46
|\| | | | | | | | | |
| * | | | | | | | | | Merge "updater: Error out on underrun during patching." am: a0404ecd16Tao Bao2018-11-052-1/+46
| |\| | | | | | | | |
| | * | | | | | | | | Merge "updater: Error out on underrun during patching."Tao Bao2018-11-052-1/+46
| | |\| | | | | | | |
| | | * | | | | | | | Merge "updater: Error out on underrun during patching."Tao Bao2018-11-052-1/+46
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | updater: Error out on underrun during patching.Tao Bao2018-11-052-1/+46
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "tests: Remove obsolete testdata files." am: f720da5317 am: e9f568e5e5Tao Bao2018-11-053-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | Merge "tests: Remove obsolete testdata files." am: f720da5317Tao Bao2018-11-053-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Merge "tests: Remove obsolete testdata files."Tao Bao2018-11-053-0/+0
| | |\| | | | | | | |
| | | * | | | | | | | Merge "tests: Remove obsolete testdata files."Tao Bao2018-11-053-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | tests: Remove obsolete testdata files.Tao Bao2018-11-053-0/+0
| | | |/ / / / / / /
* | | | | | | | | | Merge "Make the text image readable under recovery" am: d84922216c am: d50aa4f4eeTianjie Xu2018-11-051-14/+123
|\| | | | | | | | |
| * | | | | | | | | Merge "Make the text image readable under recovery" am: d84922216cTianjie Xu2018-11-051-14/+123
| |\| | | | | | | |
| | * | | | | | | | Merge "Make the text image readable under recovery"Tianjie Xu2018-11-051-14/+123
| | |\| | | | | | |
| | | * | | | | | | Merge "Make the text image readable under recovery"Tianjie Xu2018-11-051-14/+123
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Make the text image readable under recoveryTianjie Xu2018-11-011-14/+123
* | | | | | | | | | | Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." am: f2a9152408 am: f0cf952082Tao Bao2018-11-022-14/+9
|\| | | | | | | | | |
| * | | | | | | | | | Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." am: f2a9152408Tao Bao2018-11-022-14/+9
| |\| | | | | | | | |
| | * | | | | | | | | Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev."Tao Bao2018-11-022-14/+9
| | |\| | | | | | | |
| | | * | | | | | | | Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev."Treehugger Robot2018-11-022-14/+9
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | minui: Use android::base::unique_fd in MinuiBackendFbdev.Tao Bao2018-11-022-14/+9
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "minui: Add GRSurface::Clone()." am: 948790fa4c am: 24b89ffd25Tao Bao2018-11-023-3/+25
|\| | | | | | | | | |
| * | | | | | | | | | Merge "minui: Add GRSurface::Clone()." am: 948790fa4cTao Bao2018-11-023-3/+25
| |\| | | | | | | | |
| | * | | | | | | | | Merge "minui: Add GRSurface::Clone()."Tao Bao2018-11-023-3/+25
| | |\| | | | | | | |
| | | * | | | | | | | Merge "minui: Add GRSurface::Clone()."Tao Bao2018-11-023-3/+25
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | minui: Add GRSurface::Clone().Tao Bao2018-11-013-3/+25
| | | |/ / / / / / / /
* | | | | | | | | | | Merge changes I69ce001a,I14514017,I8e67cda7 am: d2e1c0a981 am: 082adef0e0Tao Bao2018-11-017-112/+128
|\| | | | | | | | | |
| * | | | | | | | | | Merge changes I69ce001a,I14514017,I8e67cda7 am: d2e1c0a981Tao Bao2018-11-017-112/+128
| |\| | | | | | | | |
| | * | | | | | | | | Merge changes I69ce001a,I14514017,I8e67cda7Tao Bao2018-11-017-112/+128
| | |\| | | | | | | |
| | | * | | | | | | | Merge changes I69ce001a,I14514017,I8e67cda7Tao Bao2018-11-017-112/+128
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | minui: Remove the default and copy ctors for GRSurface.Tao Bao2018-11-013-12/+10
| | | | * | | | | | | | minui: Refactor GRSurfaceAdf.Tao Bao2018-11-012-56/+65
| | | | * | | | | | | | minui: Refactor GRSurfaceFbdev.Tao Bao2018-11-012-44/+53
* | | | | | | | | | | | Merge "Refactor the code to check the metadata" am: cbdcfc0038 am: 6ba8eb5248Tianjie Xu2018-11-014-147/+410
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Refactor the code to check the metadata" am: cbdcfc0038Tianjie Xu2018-11-014-147/+410
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Refactor the code to check the metadata"Tianjie Xu2018-11-014-147/+410
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Refactor the code to check the metadata"Tianjie Xu2018-11-014-147/+410
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Refactor the code to check the metadataTianjie Xu2018-10-314-147/+410
| | | | | |/ / / / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." am: 4ba20f1031 am: 9533329773Tao Bao2018-11-011-24/+14
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." am: 4ba20f1031Tao Bao2018-11-011-24/+14
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest."Tao Bao2018-11-011-24/+14
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest."Tao Bao2018-11-011-24/+14
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | tests: Use FRIEND_TEST in ScreenRecoveryUITest.Tao Bao2018-11-011-24/+14
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "minui: Add a protected GRSurface ctor." am: 287d5dc618 am: 6e0ce63c4bTao Bao2018-11-014-107/+86
|\| | | | | | | | | |
| * | | | | | | | | | Merge "minui: Add a protected GRSurface ctor." am: 287d5dc618Tao Bao2018-11-014-107/+86
| |\| | | | | | | | |
| | * | | | | | | | | Merge "minui: Add a protected GRSurface ctor."Tao Bao2018-11-014-107/+86
| | |\| | | | | | | |
| | | * | | | | | | | Merge "minui: Add a protected GRSurface ctor."Tao Bao2018-11-014-107/+86
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | minui: Add a protected GRSurface ctor.Tao Bao2018-10-314-107/+86
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "recovery: Fix mounting /system with dynamic partitions." am: 023807fcf7 am: e3f6814451David Anderson2018-10-313-2/+34
|\| | | | | | | | | |
| * | | | | | | | | | Merge "recovery: Fix mounting /system with dynamic partitions." am: 023807fcf7David Anderson2018-10-313-2/+34
| |\| | | | | | | | |
| | * | | | | | | | | Merge "recovery: Fix mounting /system with dynamic partitions."David Anderson2018-10-313-2/+34
| | |\| | | | | | | |
| | | * | | | | | | | Merge "recovery: Fix mounting /system with dynamic partitions."David Anderson2018-10-313-2/+34
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | recovery: Fix mounting /system with dynamic partitions.David Anderson2018-10-303-2/+34
| | | |/ / / / / / /
* | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-10-3185-0/+850
* | | | | | | | | | Merge "Add description for the new translation" am: d84d570d8c am: 3616e28bd1Tianjie Xu2018-10-301-0/+32
|\| | | | | | | | |
| * | | | | | | | | Merge "Add description for the new translation" am: d84d570d8cTianjie Xu2018-10-301-0/+32
| |\| | | | | | | |
| | * | | | | | | | Merge "Add description for the new translation"Tianjie Xu2018-10-301-0/+32
| | |\| | | | | | |
| | | * | | | | | | Merge "Add description for the new translation"Tianjie Xu2018-10-301-0/+32
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Add description for the new translationTianjie Xu2018-10-291-0/+32
| | | | | |/ / / / / | | | | |/| | | | |
* | | | | | | | | | Merge "Switch to use commandline parser" am: fd27983b62 am: 188b4ec273Tianjie Xu2018-10-293-15/+72
|\| | | | | | | | |
| * | | | | | | | | Merge "Switch to use commandline parser" am: fd27983b62Tianjie Xu2018-10-293-15/+72
| |\| | | | | | | |
| | * | | | | | | | Merge "Switch to use commandline parser"Tianjie Xu2018-10-293-15/+72
| | |\| | | | | | |
| | | * | | | | | | Merge "Switch to use commandline parser"Tianjie Xu2018-10-293-15/+72
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Switch to use commandline parserTianjie Xu2018-10-293-15/+72
| | | | |/ / / / / /
* | | | | | | | | | Merge "Clean up the zipfile creation in InstallTest" am: 41cb6a65ac am: 078034d300Tianjie Xu2018-10-291-99/+40
|\| | | | | | | | |
| * | | | | | | | | Merge "Clean up the zipfile creation in InstallTest" am: 41cb6a65acTianjie Xu2018-10-291-99/+40
| |\| | | | | | | |
| | * | | | | | | | Merge "Clean up the zipfile creation in InstallTest"Tianjie Xu2018-10-291-99/+40
| | |\| | | | | | |
| | | * | | | | | | Merge "Clean up the zipfile creation in InstallTest"Tianjie Xu2018-10-291-99/+40
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Clean up the zipfile creation in InstallTestTianjie Xu2018-10-291-99/+40
| | | |/ / / / / /
* | | | | | | | | Merge "Remove the load_keys function" am: 64ceace44f am: ac9d4ae1bfTianjie Xu2018-10-253-326/+9
|\| | | | | | | |
| * | | | | | | | Merge "Remove the load_keys function" am: 64ceace44fTianjie Xu2018-10-253-326/+9
| |\| | | | | | |
| | * | | | | | | Merge "Remove the load_keys function"Tianjie Xu2018-10-253-326/+9
| | |\| | | | | |
| | | * | | | | | Merge "Remove the load_keys function"Tianjie Xu2018-10-253-326/+9
| | | |\ \ \ \ \ \
| | | | * | | | | | Remove the load_keys functionTianjie Xu2018-10-253-326/+9
* | | | | | | | | | Merge "Add sanity check when loading public keys for OTA package" am: 6793f61795 am: accb42d1b3Tianjie Xu2018-10-253-6/+84
|\| | | | | | | | |
| * | | | | | | | | Merge "Add sanity check when loading public keys for OTA package" am: 6793f61795Tianjie Xu2018-10-253-6/+84
| |\| | | | | | | |
| | * | | | | | | | Merge "Add sanity check when loading public keys for OTA package"Tianjie Xu2018-10-253-6/+84
| | |\| | | | | | |
| | | * | | | | | | Merge "Add sanity check when loading public keys for OTA package"Tianjie Xu2018-10-253-6/+84
| | | |\| | | | | |
| | | | * | | | | | Add sanity check when loading public keys for OTA packageTianjie Xu2018-10-253-6/+84
* | | | | | | | | | Merge "minui: Cleanup GRSurfaceDrm and MinuiBackendDrm." am: c17c819693 am: b420e60596Tao Bao2018-10-252-126/+109
|\| | | | | | | | |
| * | | | | | | | | Merge "minui: Cleanup GRSurfaceDrm and MinuiBackendDrm." am: c17c819693Tao Bao2018-10-252-126/+109
| |\| | | | | | | |
| | * | | | | | | | Merge "minui: Cleanup GRSurfaceDrm and MinuiBackendDrm."Tao Bao2018-10-252-126/+109
| | |\| | | | | | |
| | | * | | | | | | Merge "minui: Cleanup GRSurfaceDrm and MinuiBackendDrm."Treehugger Robot2018-10-252-126/+109
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | minui: Cleanup GRSurfaceDrm and MinuiBackendDrm.Tao Bao2018-10-242-126/+109
| | | | | |/ / / / / | | | | |/| | | | |
* | | | | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 0db98fa501 -s ours am: 5168a610d2 -s oursBill Yi2018-10-250-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 0db98fa501 -s oursBill Yi2018-10-250-0/+0
| |\| | | | | | | |
| | * | | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-250-0/+0
| | |\| | | | | | |
| | | * | | | | | | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | | | |/ / / / | | | | |/| | | |
* | | | | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: b19931239d -s oursBill Yi2018-10-240-0/+0
|\| | | | | | | |
| * | | | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |\| | | | | | |
| | * | | | | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Snap for 4745538 from 723056a83f8c8b15af02d9c302862dbb2304ea8c to pi-releaseandroid-build-team Robot2018-04-261-5/+14
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | Snap for 4722539 from eacb9c069756ff31df55f38d91610887ae079ac0 to pi-releaseandroid-build-team Robot2018-04-151-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Snap for 4713750 from 257dd337da28ccd2f930afe3b55e76873f73c15f to pi-releaseandroid-build-team Robot2018-04-113-7/+6
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Snap for 4706961 from 7fdb6355e4482da80c8e4633fc54a72380881965 to pi-releaseandroid-build-team Robot2018-04-082-1/+3
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Snap for 4701683 from 848f227eea524a48208bdd4181f90fb63a31ed2b to pi-releaseandroid-build-team Robot2018-04-052-9/+42
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Snap for 4677756 from 454d8cb805e633aaa1c6456a57ec9c2dc6c6e163 to pi-releaseandroid-build-team Robot2018-03-252-14/+11
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Snap for 4667902 from d26f95287a0efc6a3160624fa4e577891a2c9794 to pi-releaseandroid-build-team Robot2018-03-211-0/+51
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Snap for 4653471 from 91b48f9161a918e4af6233af7fa842b9af0a6bac to pi-releaseandroid-build-team Robot2018-03-142-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4647811 from 01daebbe68943725e7b80e30082330c6bd042a88 to pi-releaseandroid-build-team Robot2018-03-113-13/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4632767 from 4249cdfe29491b0ad8c418d8015a50cb37b6ff9b to pi-releaseandroid-build-team Robot2018-03-0411-27/+139
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4628106 from bb928df6ebd70ac0680184927ea00b373c3e507f to pi-releaseandroid-build-team Robot2018-03-011-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4620899 from 133d1d25d72b51f691c5ef1178250e3b8a3b9a47 to pi-releaseandroid-build-team Robot2018-02-256-21/+150
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4615953 from a7df3189136283ae20812845183337066498bb2e to pi-releaseandroid-build-team Robot2018-02-221-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4611397 from 0d4a75abf06b2d196b2f6cc7f558798d5a8e6bf7 to pi-releaseandroid-build-team Robot2018-02-192-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4610834 from 7920648ebb22c85a2b48de343f2f217619dba3ad to pi-releaseandroid-build-team Robot2018-02-186-9/+31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4603395 from 974a6e80c63f9d17f98cba9fcbd3ddb918fe67a3 to pi-releaseandroid-build-team Robot2018-02-141-239/+244
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4598635 from 66db2c56360ff3e8f2602181ba1fe52c6d1ad3c5 to pi-releaseandroid-build-team Robot2018-02-114-9/+483
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4577102 from d5097253f66b95c7ec5c1fe61e052bc527e9ee1f to pi-releaseandroid-build-team Robot2018-01-313-23/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Snap for 4571561 from 50d24b9ce5352514fe68621c1c18edcbd3be947d to pi-releaseandroid-build-team Robot2018-01-281-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Snap for 4545621 from bd84bd438aa8bee6ed975af962a4d8abe0a5ce57 to pi-releaseandroid-build-team Robot2018-01-141-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4517567 from 77e8137720a486adda3a68103bf0894210324fed to pi-releaseandroid-build-team Robot2017-12-242-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4502278 from c35b5c64a8d8192e8e04b378510c64737517c606 to pi-releaseandroid-build-team Robot2017-12-141-0/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4496165 from 7153b24dd767200ab154fee5751e2493cd9ad4e6 to pi-releaseandroid-build-team Robot2017-12-116-24/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4481641 from 1ab7bf47a60a39cc3d44fdac977e0a044cf06d8a to pi-releaseandroid-build-team Robot2017-12-032-269/+302
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4462748 from debdd1732ccc863229134ed14de822da8fad55e4 to pi-releaseandroid-build-team Robot2017-11-213-57/+91
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4459973 from 0a0b6a9fe1e1f2f6b46683dbe313426164d33b40 to pi-releaseandroid-build-team Robot2017-11-193-97/+110
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4455093 from 8e376e01e7c9467f5da6d2fd01db824be811a3f7 to pi-releaseandroid-build-team Robot2017-11-161-3/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4450504 from 60ee0268496d3e73f4f33dffe64cace0da104ca4 to pi-releaseandroid-build-team Robot2017-11-142-5/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4447680 from d70f5d924b915b1c7e93c01af6dbe8d30b3b8cc3 to pi-releaseandroid-build-team Robot2017-11-1214-107/+244
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4439972 from deca0cb59c0fbac2a9ecca2fb7db7d324a43b81c to pi-releaseandroid-build-team Robot2017-11-084-55/+170
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4437123 from d7d0cc4c08e6bb95963af2067ffee2755b351ef2 to pi-releaseandroid-build-team Robot2017-11-0710-275/+188
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4434599 from 4d9ce1aa502c625e101cd91fe9b26aa8bfb2d26f to pi-releaseandroid-build-team Robot2017-11-0513-403/+430
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4429796 from efb6a0b7a6d6e68d0213e628b3fa6f31c6b13007 to pi-releaseandroid-build-team Robot2017-11-024-53/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4425573 from 1385908bdbe37a1c3fc58c89de8d24fb0b5b3089 to pi-releaseandroid-build-team Robot2017-10-311-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4422293 from 395b02098ffb93b2ea7611839099180a6db64bfb to pi-releaseandroid-build-team Robot2017-10-292-29/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4415813 from 353e1d629bb5ca59cdfb476ddfe65d1f6818947d to pi-releaseandroid-build-team Robot2017-10-254-25/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4413317 from 6e9ee375276619c14262147c796ca51e013fb435 to pi-releaseandroid-build-team Robot2017-10-241-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4410151 from ff7c618fd31bb3a1e3bb92bdd250938d6839006d to pi-releaseandroid-build-team Robot2017-10-212-103/+174
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4407698 from a6f341ebed653cbea825dde8842594b79292bbac to pi-releaseandroid-build-team Robot2017-10-202-78/+64
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4402171 from 01395b0949121f1baa5cf59e2de649ac3d35beac to pi-releaseandroid-build-team Robot2017-10-186-151/+220
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4393550 from a68bef7cd68a976bd0f105dc6d08f05701ec7fe3 to pi-releaseandroid-build-team Robot2017-10-1332-311/+287
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4388640 from 6d5da419715a852e29dde9f25858dc3802819dea to pi-releaseandroid-build-team Robot2017-10-1120-70/+68
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4386413 from cbd8479410f0e80172291ec895875866bd1b1321 to pi-releaseandroid-build-team Robot2017-10-105-2/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4383207 from 2bf82666c3ebe0609515e02281597925c3cee44f to pi-releaseandroid-build-team Robot2017-10-078-56/+125
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4380820 from b59132d66c5e77970d05d195210872987cf0e69c to pi-releaseandroid-build-team Robot2017-10-065-320/+280
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4375922 from a79c09493e2589d2ca6030a6042a2a566c641833 to pi-releaseandroid-build-team Robot2017-10-049-5/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4373608 from ff1f8d207cb973e8220a20da71d62089df92f10d to pi-releaseandroid-build-team Robot2017-10-035-8/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-4370135 snap-temp-L93500000107644030android-build-team Robot2017-09-3017-376/+403
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-4367572 snap-temp-L13500000107248413android-build-team Robot2017-09-297-21/+153
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-ccf2fffc-f042-4ff3-9aa0-53d7f927fbf8-for-git_pi-release-4362679 snap-temp-L24900000106498589android-build-team Robot2017-09-274-70/+174
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-ed8626b9-4479-4c76-9207-5f511f136606-for-git_pi-release-4354758 snap-temp-L65900000105223161android-build-team Robot2017-09-2225-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-849a3dc3-db53-4e70-9b7a-92295133ddeb-for-git_pi-release-4346747 snap-temp-L27900000104043986android-build-team Robot2017-09-192-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-b45781ff-b719-488b-ad10-06b90910709b-for-git_pi-release-4344268 snap-temp-L16300000103640188android-build-team Robot2017-09-181-6/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-b06579bd-a905-4db5-ada9-c69d40f4df90-for-git_pi-release-4335309 snap-temp-L62700000102430107android-build-team Robot2017-09-144-6/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-8244a883-eac1-43aa-b800-33dd285ccdd1-for-git_pi-release-4332766 snap-temp-L47800000102000453android-build-team Robot2017-09-131-8/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-07e0701a-6024-4964-a0bf-f87d472b7ee2-for-git_pi-release-4329913 snap-temp-L73100000101564133android-build-team Robot2017-09-125-120/+142
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-cacfaf25-4304-4e6b-ab4e-089367c7ed39-for-git_pi-release-4326570 snap-temp-L59400000101056305android-build-team Robot2017-09-107-163/+830
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-51e6d4a7-52eb-462d-9bf2-f148ba83e4bd-for-git_pi-release-4320962 snap-temp-L22700000100184372android-build-team Robot2017-09-071-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-b4448e78-a682-4bc1-b691-b70e74fef19f-for-git_pi-release-4314474 snap-temp-L95500000099150132android-build-team Robot2017-09-032-76/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-48587b2e-b0d9-4e33-ae5f-05bd16bc9d6f-for-git_pi-release-4308806 snap-temp-L91400000098269614android-build-team Robot2017-08-312-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-dbb5053c-c8af-4c07-a295-d7d7b281ce3f-for-git_pi-release-4306414 snap-temp-L16000000097876522android-build-team Robot2017-08-3014-37/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-d9d65d1a-80f5-45e5-a00f-5a3915c3d445-for-git_pi-release-4303984 snap-temp-L75600000097489288android-build-team Robot2017-08-293-33/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-2c5efa61-1f02-4e74-bfeb-1ca3cd5028bd-for-git_pi-release-4301718 snap-temp-L56500000097146696android-build-team Robot2017-08-282-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-729bcc05-d3c5-4aa4-9c1d-7a9e6ee59f06-for-git_pi-release-4296206 snap-temp-L10900000096312436android-build-team Robot2017-08-242-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-c3d19af8-7ed9-4d42-9f37-c34f7f76db73-for-git_pi-release-4293790 snap-temp-L31600000095939746android-build-team Robot2017-08-2310-273/+146
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-38d4765e-6779-4912-a79f-25f77b8184a7-for-git_pi-release-4288638 snap-temp-L71800000095143664android-build-team Robot2017-08-2024-279/+477
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-5c36fbeb-1180-4a77-94d2-968e28da8f1f-for-git_pi-release-4280901 snap-temp-L36900000094197597android-build-team Robot2017-08-173-5/+37
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-8c6f0e6c-413f-4241-b3dc-c159fdcc7655-for-git_pi-release-4273687 snap-temp-L51400000093075386android-build-team Robot2017-08-151-236/+292
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-release-4269836 snap-temp-L23500000092503827android-build-team Robot2017-08-1315-128/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-0b474cbb-ff20-424d-a570-a0a7b83a7705-for-git_pi-release-4262110 snap-temp-L42700000091449286android-build-team Robot2017-08-102-32/+53
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-999b130a-24cf-4106-967e-4713076535ff-for-git_pi-release-4257729 snap-temp-L14600000090822884android-build-team Robot2017-08-091-4/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-64fc473b-7e45-48f5-b2f7-3c916e338608-for-git_pi-release-4249735 snap-temp-L34700000089732387android-build-team Robot2017-08-067-409/+799
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-d4f45cf4-9d73-4828-baa4-f73aa4280cd0-for-git_pi-release-4241208 snap-temp-L10800000088711883android-build-team Robot2017-08-032-1/+162
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Add constness to Draw- functions." am: 47b650b588 am: a9e8c76fefTao Bao2018-10-245-19/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Add constness to Draw- functions." am: 47b650b588Tao Bao2018-10-245-19/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Add constness to Draw- functions."Tao Bao2018-10-245-19/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Add constness to Draw- functions."Treehugger Robot2018-10-245-19/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Add constness to Draw- functions.Tao Bao2018-10-235-19/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a function to construct the GRSurface in test" am: ee9c65a38e am: e100c9f491Tianjie Xu2018-10-231-3/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a function to construct the GRSurface in test" am: ee9c65a38eTianjie Xu2018-10-231-3/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a function to construct the GRSurface in test"Tianjie Xu2018-10-231-3/+14
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a function to construct the GRSurface in test"Tianjie Xu2018-10-231-3/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function to construct the GRSurface in testTianjie Xu2018-10-231-3/+14
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add function to show localized rescue party menu" am: 06ccd00ef5 am: 8bac38a0d6Tianjie Xu2018-10-238-66/+196
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add function to show localized rescue party menu" am: 06ccd00ef5Tianjie Xu2018-10-238-66/+196
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add function to show localized rescue party menu"Tianjie Xu2018-10-238-66/+196
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add function to show localized rescue party menu"Tianjie Xu2018-10-238-66/+196
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add function to show localized rescue party menuTianjie Xu2018-10-238-66/+196
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move GRSurface into a class." am: 66a576b79c am: 040335059eTao Bao2018-10-2311-115/+190
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move GRSurface into a class." am: 66a576b79cTao Bao2018-10-2311-115/+190
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move GRSurface into a class."Tao Bao2018-10-2311-115/+190
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move GRSurface into a class."Tao Bao2018-10-2311-115/+190
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui: Move GRSurface into a class.Tao Bao2018-10-2311-115/+190
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recovery now expects public keys in zipfile" am: bfc7d43c00 am: 9008b2c7dfTianjie Xu2018-10-231-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recovery now expects public keys in zipfile" am: bfc7d43c00Tianjie Xu2018-10-231-5/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recovery now expects public keys in zipfile"Tianjie Xu2018-10-231-5/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recovery now expects public keys in zipfile"Tianjie Xu2018-10-231-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery now expects public keys in zipfileTianjie Xu2018-10-221-5/+5
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix instrumentation_for to refer to name of module" am: 24ead5672b am: 3463839772Colin Cross2018-10-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix instrumentation_for to refer to name of module" am: 24ead5672bColin Cross2018-10-191-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix instrumentation_for to refer to name of module"Colin Cross2018-10-191-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix instrumentation_for to refer to name of module"Treehugger Robot2018-10-191-1/+1
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix instrumentation_for to refer to name of moduleColin Cross2018-10-181-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Load X509 keys from ziparchive" am: a39b2baf12 am: 81ef25aadaTianjie Xu2018-10-194-7/+144
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Load X509 keys from ziparchive" am: a39b2baf12Tianjie Xu2018-10-194-7/+144
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Load X509 keys from ziparchive"Tianjie Xu2018-10-194-7/+144
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Load X509 keys from ziparchive"Tianjie Xu2018-10-194-7/+144
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load X509 keys from ziparchiveTianjie Xu2018-10-184-7/+144
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix ioctl direction for F2FS_IOC_GET_PIN_FILE" am: b5564f37be am: c9649eba5cTao Bao2018-10-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix ioctl direction for F2FS_IOC_GET_PIN_FILE" am: b5564f37beTao Bao2018-10-161-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix ioctl direction for F2FS_IOC_GET_PIN_FILE"Tao Bao2018-10-161-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix ioctl direction for F2FS_IOC_GET_PIN_FILE"Tao Bao2018-10-161-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncrypt: fix ioctl direction for F2FS_IOC_GET_PIN_FILEDevin Kim2018-09-121-1/+1
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implement the graphic menus" am: 06b1a89d72 am: 14177116caTianjie Xu2018-10-144-128/+351
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implement the graphic menus" am: 06b1a89d72Tianjie Xu2018-10-144-128/+351
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implement the graphic menus"Tianjie Xu2018-10-144-128/+351
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implement the graphic menus"Tianjie Xu2018-10-144-128/+351
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the graphic menusTianjie Xu2018-10-134-128/+351
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use a host java program to generate the background text" am: e4e929ce53 am: a74581a635Tianjie Xu2018-10-134-0/+438
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use a host java program to generate the background text" am: e4e929ce53Tianjie Xu2018-10-134-0/+438
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use a host java program to generate the background text"Tianjie Xu2018-10-134-0/+438
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use a host java program to generate the background text"Tianjie Xu2018-10-134-0/+438
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a host java program to generate the background textTianjie Xu2018-10-134-0/+438
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add function to load the key from x509.pem file" am: ff89e0004f am: 3e4e6b3d68Tianjie Xu2018-10-123-0/+158
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add function to load the key from x509.pem file" am: ff89e0004fTianjie Xu2018-10-123-0/+158
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add function to load the key from x509.pem file"Tianjie Xu2018-10-123-0/+158
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add function to load the key from x509.pem file"Tianjie Xu2018-10-123-0/+158
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add function to load the key from x509.pem fileTianjie Xu2018-10-123-0/+158
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: deprecate check for ro.build.system_root_image" am: a67e9424c3 am: 9320e18f5dMark Salyzyn2018-10-112-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: deprecate check for ro.build.system_root_image" am: a67e9424c3Mark Salyzyn2018-10-112-5/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: deprecate check for ro.build.system_root_image"Mark Salyzyn2018-10-112-5/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: deprecate check for ro.build.system_root_image"Treehugger Robot2018-10-112-5/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: deprecate check for ro.build.system_root_imageMark Salyzyn2018-10-112-5/+7
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively" am: 1a4d234daa am: 70f3689a70Tom Cherry2018-10-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively" am: 1a4d234daaTom Cherry2018-10-071-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively"Tom Cherry2018-10-071-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively"Tom Cherry2018-10-071-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use only signed/unsigned numbers with ParseInt/ParseUint respectivelyTom Cherry2018-10-051-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev am: 7f1b33e94c am: fc311bb706 am: 31e8b44c9e am: ad81bd64c2Tianjie Xu2018-10-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev am: 7f1b33e94c am: fc311bb706 am: 31e8b44c9eTianjie Xu2018-10-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev am: 7f1b33e94c am: fc311bb706Tianjie Xu2018-10-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev am: 7f1b33e94cTianjie Xu2018-10-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-devTianjie Xu2018-10-060-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-devTianjie Xu2018-10-050-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: 2050579b79Android Build Merger (Role)2018-10-040-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Initialize the ZipArchive to zero before parsingTianjie Xu2018-10-042-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev am: 2c28ae3933 am: d142b28c2b am: a5860449c1 am: 3c46516f9eTianjie Xu2018-10-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev am: 2c28ae3933 am: d142b28c2b am: a5860449c1Tianjie Xu2018-10-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev am: 2c28ae3933 am: d142b28c2bTianjie Xu2018-10-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev am: 2c28ae3933Tianjie Xu2018-10-060-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-devTianjie Xu2018-10-060-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-devTianjie Xu2018-10-050-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103 skipped: cce521e439 skipped: 4a53559e98Android Build Merger (Role)2018-09-080-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103 skipped: cce521e439Android Build Merger (Role)2018-09-080-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103Android Build Merger (Role)2018-09-080-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Initialize the ZipArchive to zero before parsingTianjie Xu2018-09-082-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15 am: 274945cb5b -s ours am: 71b2447163Tianjie Xu2018-10-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15 am: 274945cb5b -s oursTianjie Xu2018-10-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15Tianjie Xu2018-10-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62Tianjie Xu2018-10-060-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0ebTianjie Xu2018-10-060-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0ebAndroid Build Merger (Role)2018-09-080-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fceAndroid Build Merger (Role)2018-09-080-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16Android Build Merger (Role)2018-09-080-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412Android Build Merger (Role)2018-09-080-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351Android Build Merger (Role)2018-09-080-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Initialize the ZipArchive to zero before parsingTianjie Xu2018-09-082-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Compare the fingerprint before reading the partition" am: 81da8b12d2 am: 1cfe8098baTianjie Xu2018-10-063-29/+140
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Compare the fingerprint before reading the partition" am: 81da8b12d2Tianjie Xu2018-10-063-29/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Compare the fingerprint before reading the partition"Tianjie Xu2018-10-063-29/+140
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Compare the fingerprint before reading the partition"Tianjie Xu2018-10-053-29/+140
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compare the fingerprint before reading the partitionTianjie Xu2018-10-053-29/+140
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency."" am: f89067ab97 am: 6ab02efb27Jayant Chowdhary2018-10-031-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency."" am: f89067ab97Jayant Chowdhary2018-10-021-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency.""Jayant Chowdhary2018-10-021-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency.""Jayant Chowdhary2018-10-021-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reland: "recovery_test_component: Add libbinderthreadstate as static Jayant Chowdhary2018-10-021-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move to new isolation test runner." am: d87a79a947 am: e4f6fa690cChristopher Ferris2018-10-022-8/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move to new isolation test runner." am: d87a79a947Christopher Ferris2018-10-022-8/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move to new isolation test runner."Christopher Ferris2018-10-022-8/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move to new isolation test runner."Christopher Ferris2018-10-022-8/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move to new isolation test runner.Christopher Ferris2018-10-012-8/+5
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5b am: 76eaa35201Remi NGUYEN VAN2018-09-281-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5bRemi NGUYEN VAN2018-09-281-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency.""Remi NGUYEN VAN2018-09-281-2/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency.""Remi NGUYEN VAN2018-09-281-2/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "recovery_test_component: Add libbinderthreadstate as static dependency."Remi NGUYEN VAN2018-09-281-2/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88f am: 20eb921f47Jayant Chowdhary2018-09-271-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88fJayant Chowdhary2018-09-271-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery_test_component: Add libbinderthreadstate as static dependency."Jayant Chowdhary2018-09-271-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery_test_component: Add libbinderthreadstate as static dependency."Jayant Chowdhary2018-09-271-1/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery_test_component: Add libbinderthreadstate as static dependency.Jayant Chowdhary2018-09-271-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable fingerprint in care_map" am: f3d0e4783f am: 881f4225f2Tianjie Xu2018-09-271-10/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable fingerprint in care_map" am: f3d0e4783fTianjie Xu2018-09-271-10/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable fingerprint in care_map"Tianjie Xu2018-09-271-10/+29
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable fingerprint in care_map"Tianjie Xu2018-09-271-10/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable fingerprint in care_mapTianjie Xu2018-09-271-10/+29
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload." am: b32bd8a333 am: f4bf630200Tao Bao2018-09-271-10/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload." am: b32bd8a333Tao Bao2018-09-271-10/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload."Tao Bao2018-09-271-10/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload."Tao Bao2018-09-271-10/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload.katao2018-09-271-10/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410c am: 4e30d0d687Hridya Valsaraju2018-09-241-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410cHridya Valsaraju2018-09-241-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enter into userspace fastboot only if the device supports it"Hridya Valsaraju2018-09-241-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enter into userspace fastboot only if the device supports it"Treehugger Robot2018-09-241-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enter into userspace fastboot only if the device supports itHridya Valsaraju2018-09-201-1/+2
| | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Refactor update_verifier into a class" am: ff29eb7f12 am: 4c65ab54c1Tianjie Xu2018-09-215-95/+175
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Refactor update_verifier into a class" am: ff29eb7f12Tianjie Xu2018-09-215-95/+175
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Refactor update_verifier into a class"Tianjie Xu2018-09-215-95/+175
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Refactor update_verifier into a class"Tianjie Xu2018-09-215-95/+175
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor update_verifier into a classTianjie Xu2018-09-215-95/+175
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the parse of last_install to recovery-persist" am: 6c8c7c1975 am: d671cc136fTianjie Xu2018-09-218-16/+274
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the parse of last_install to recovery-persist" am: 6c8c7c1975Tianjie Xu2018-09-218-16/+274
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the parse of last_install to recovery-persist"Tianjie Xu2018-09-218-16/+274
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the parse of last_install to recovery-persist"Tianjie Xu2018-09-208-16/+274
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the parse of last_install to recovery-persistTianjie Xu2018-09-138-16/+274
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd" am: 9c675b0964 am: 1c0e985407Hridya Valsaraju2018-09-191-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd" am: 9c675b0964Hridya Valsaraju2018-09-191-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd"Hridya Valsaraju2018-09-191-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd"Treehugger Robot2018-09-191-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'Enter Fastboot' menu item only if device supports fastbootdHridya Valsaraju2018-09-181-0/+4
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Trigger the logging when prompting for wipe." am: 49dc0fed26 am: cda59a70f2Tao Bao2018-09-181-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Trigger the logging when prompting for wipe." am: 49dc0fed26Tao Bao2018-09-181-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Trigger the logging when prompting for wipe."Tao Bao2018-09-181-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Trigger the logging when prompting for wipe."Treehugger Robot2018-09-181-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger the logging when prompting for wipe.Tao Bao2018-09-171-0/+3
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow switch to fastbootd when userdata wipe is required" am: 16147d1bd6 am: 20b29bbbbdHridya Valsaraju2018-09-132-9/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow switch to fastbootd when userdata wipe is required" am: 16147d1bd6Hridya Valsaraju2018-09-132-9/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow switch to fastbootd when userdata wipe is required"Hridya Valsaraju2018-09-132-9/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow switch to fastbootd when userdata wipe is required"Treehugger Robot2018-09-132-9/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow switch to fastbootd when userdata wipe is requiredHridya Valsaraju2018-09-122-9/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track the name change to minui related properties." am: da46f9067a am: 3d95692b5eTao Bao2018-09-111-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track the name change to minui related properties." am: da46f9067aTao Bao2018-09-111-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track the name change to minui related properties."Tao Bao2018-09-111-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track the name change to minui related properties."Tao Bao2018-09-111-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui: Track the name change to minui related properties.Tao Bao2018-09-061-3/+3
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix sideload for user devices by adding a new sideload config" am: 1254e15e50 am: 94e5553f4eHridya Valsaraju2018-09-105-50/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix sideload for user devices by adding a new sideload config" am: 1254e15e50Hridya Valsaraju2018-09-105-50/+47
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix sideload for user devices by adding a new sideload config"Hridya Valsaraju2018-09-105-50/+47
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix sideload for user devices by adding a new sideload config"Treehugger Robot2018-09-105-50/+47
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sideload for user devices by adding a new sideload configHridya Valsaraju2018-09-085-50/+47
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove res-560dpi symlink." am: 02986d381e am: 75dd6f652dTao Bao2018-09-061-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove res-560dpi symlink." am: 02986d381eTao Bao2018-09-061-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove res-560dpi symlink."Tao Bao2018-09-061-1/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove res-560dpi symlink."Tao Bao2018-09-061-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove res-560dpi symlink.Tao Bao2018-09-061-1/+0
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "support mounting f2fs in recovery mode" am: a062fae9d7 am: 15e957d3f6Tao Bao2018-09-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "support mounting f2fs in recovery mode" am: a062fae9d7Tao Bao2018-09-041-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "support mounting f2fs in recovery mode"Tao Bao2018-09-041-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "support mounting f2fs in recovery mode"Tao Bao2018-09-041-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support mounting f2fs in recovery modeLianjun Huang2018-09-031-1/+1
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: {Load,Save}FileContents return bool values." am: bae5f1a846 am: baa841ed04Tao Bao2018-09-013-23/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: {Load,Save}FileContents return bool values." am: bae5f1a846Tao Bao2018-09-013-23/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: {Load,Save}FileContents return bool values."Tao Bao2018-09-013-23/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: {Load,Save}FileContents return bool values."Tao Bao2018-09-013-23/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: {Load,Save}FileContents return bool values.Tao Bao2018-08-313-23/+22
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Refactor applypatch()." am: af522672a2 am: 37521a9623Tao Bao2018-08-317-515/+396
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Refactor applypatch()." am: af522672a2Tao Bao2018-08-317-515/+396
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Refactor applypatch()."Tao Bao2018-08-317-515/+396
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Refactor applypatch()."Tao Bao2018-08-317-515/+396
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Refactor applypatch().Tao Bao2018-08-317-515/+396
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable c++17 in recovery_defaults." am: 6a333cde10 am: 287881d558Tao Bao2018-08-283-44/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable c++17 in recovery_defaults." am: 6a333cde10Tao Bao2018-08-283-44/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable c++17 in recovery_defaults."Tao Bao2018-08-283-44/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable c++17 in recovery_defaults."Tao Bao2018-08-283-44/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable c++17 in recovery_defaults.Tao Bao2018-08-283-44/+42
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove otafault" am: a1e3d67bd7 am: 3f288e4389Tianjie Xu2018-08-2816-750/+112
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove otafault" am: a1e3d67bd7Tianjie Xu2018-08-2816-750/+112
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove otafault"Tianjie Xu2018-08-2816-750/+112
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove otafault"Tianjie Xu2018-08-2816-750/+112
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove otafaultTianjie Xu2018-08-2816-750/+112
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: Depend on commonly used shared libs." am: 9d7f918506 am: 9d595b13f9Tao Bao2018-08-231-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: Depend on commonly used shared libs." am: 9d7f918506Tao Bao2018-08-231-5/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: Depend on commonly used shared libs."Tao Bao2018-08-231-5/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: Depend on commonly used shared libs."Treehugger Robot2018-08-231-5/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncrypt: Depend on commonly used shared libs.Tao Bao2018-08-231-5/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too." am: 11f766af4e am: a35802b71dElliott Hughes2018-08-231-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too." am: 11f766af4eElliott Hughes2018-08-231-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too."Elliott Hughes2018-08-231-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too."Treehugger Robot2018-08-231-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too.Elliott Hughes2018-08-231-0/+4
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move ab_streaming_metadata under ab_config." am: ab7e652484 am: e30a243d0aZhomart Mukhamejanov2018-08-2211-103/+115
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move ab_streaming_metadata under ab_config." am: ab7e652484Zhomart Mukhamejanov2018-08-2211-103/+115
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move ab_streaming_metadata under ab_config."Zhomart Mukhamejanov2018-08-2211-103/+115
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move ab_streaming_metadata under ab_config."Zhomart Mukhamejanov2018-08-2211-103/+115
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move ab_streaming_metadata under ab_config.Zhomart Mukhamejanov2018-08-2211-103/+115
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add "boot-fastboot" command to BCB." am: 0115b79cbd am: 4ba5c3c7deDavid Anderson2018-08-221-1/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add "boot-fastboot" command to BCB." am: 0115b79cbdDavid Anderson2018-08-221-1/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add "boot-fastboot" command to BCB."David Anderson2018-08-221-1/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add "boot-fastboot" command to BCB."Treehugger Robot2018-08-221-1/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Add "boot-fastboot" command to BCB.David Anderson2018-08-221-1/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Depend on mke2fs.conf.recovery." am: aa536568b3 am: e6c86871f4Tao Bao2018-08-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Depend on mke2fs.conf.recovery." am: aa536568b3Tao Bao2018-08-221-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Depend on mke2fs.conf.recovery."Tao Bao2018-08-221-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Depend on mke2fs.conf.recovery."Tao Bao2018-08-221-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depend on mke2fs.conf.recovery.Tao Bao2018-08-211-1/+1
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Remove {old,new}.file." am: 09ce7686f2 am: 14d87881d8Tao Bao2018-08-204-50/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Remove {old,new}.file." am: 09ce7686f2Tao Bao2018-08-204-50/+55
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Remove {old,new}.file."Tao Bao2018-08-204-50/+55
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Remove {old,new}.file."Treehugger Robot2018-08-204-50/+55
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Remove {old,new}.file.Tao Bao2018-08-204-50/+55
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add TransferList class." am: 102d14d6d1 am: 5cf27834f3Tao Bao2018-08-174-10/+186
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add TransferList class." am: 102d14d6d1Tao Bao2018-08-174-10/+186
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add TransferList class."Tao Bao2018-08-174-10/+186
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add TransferList class."Tao Bao2018-08-174-10/+186
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Add TransferList class.Tao Bao2018-08-174-10/+186
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a python binary to generate the protobuf for care_map" am: fae0881528 am: 0901a08fc2Tianjie Xu2018-08-172-1/+140
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a python binary to generate the protobuf for care_map" am: fae0881528Tianjie Xu2018-08-172-1/+140
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a python binary to generate the protobuf for care_map"Tianjie Xu2018-08-172-1/+140
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a python binary to generate the protobuf for care_map"Tianjie Xu2018-08-172-1/+140
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a python binary to generate the protobuf for care_mapTianjie Xu2018-08-172-1/+140
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Only set brightness when needed." am: cf01f7dcbe am: d03842982fTao Bao2018-08-171-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Only set brightness when needed." am: cf01f7dcbeTao Bao2018-08-171-4/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Only set brightness when needed."Tao Bao2018-08-171-4/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Only set brightness when needed."Tao Bao2018-08-161-4/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Only set brightness when needed.Tao Bao2018-08-161-4/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}." am: d460afe963 am: 559d01ff16Tao Bao2018-08-173-0/+212
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}." am: d460afe963Tao Bao2018-08-173-0/+212
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}."Tao Bao2018-08-173-0/+212
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}."Tao Bao2018-08-163-0/+212
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}.Tao Bao2018-08-163-0/+212
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add the missing tests in applypatch_modes_test.cpp." am: f83d9f6b71 am: d9067aed88Tao Bao2018-08-161-19/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add the missing tests in applypatch_modes_test.cpp." am: f83d9f6b71Tao Bao2018-08-161-19/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add the missing tests in applypatch_modes_test.cpp."Tao Bao2018-08-161-19/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add the missing tests in applypatch_modes_test.cpp."Tao Bao2018-08-161-19/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Add the missing tests in applypatch_modes_test.cpp.Tao Bao2018-08-161-19/+2
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixing the Mac SDK build" am: 0b66e96da5 am: f13b38ca72Tao Bao2018-08-161-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixing the Mac SDK build" am: 0b66e96da5Tao Bao2018-08-161-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixing the Mac SDK build"Tao Bao2018-08-161-0/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixing the Mac SDK build"Tao Bao2018-08-161-0/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the Mac SDK buildAndreas Huber2018-08-161-0/+7
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Further compress the recovery animation file" am: c8e0292b61 am: 5c1b333bdeTianjie Xu2018-08-16455-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Further compress the recovery animation file" am: c8e0292b61Tianjie Xu2018-08-16455-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Further compress the recovery animation file"Tianjie Xu2018-08-16455-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Further compress the recovery animation file"Tianjie Xu2018-08-16455-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further compress the recovery animation fileTianjie Xu2018-08-15455-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Move to Android.bp." am: b1ff1bc43b am: 6956957499Tao Bao2018-08-1511-252/+253
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Move to Android.bp." am: b1ff1bc43bTao Bao2018-08-1511-252/+253
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Move to Android.bp."Tao Bao2018-08-1511-252/+253
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Move to Android.bp."Tao Bao2018-08-1511-252/+253
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Move to Android.bp.Tao Bao2018-08-1511-252/+253
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Track the change to update_engine_sideload path." am: 97de9c3d3e am: 07c78fe446Tao Bao2018-08-152-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Track the change to update_engine_sideload path." am: 97de9c3d3eTao Bao2018-08-152-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Track the change to update_engine_sideload path."Tao Bao2018-08-152-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Track the change to update_engine_sideload path."Tao Bao2018-08-152-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track the change to update_engine_sideload path.Tao Bao2018-08-142-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add fastboot mode to recovery" am: 19a5316412 am: b0851cf8c4Hridya Valsaraju2018-08-158-41/+324
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add fastboot mode to recovery" am: 19a5316412Hridya Valsaraju2018-08-158-41/+324
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add fastboot mode to recovery"Hridya Valsaraju2018-08-158-41/+324
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add fastboot mode to recovery"Treehugger Robot2018-08-148-41/+324
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fastboot mode to recoveryHridya Valsaraju2018-08-148-41/+324
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery uses IHealth::getService" am: ce2f0d85fb am: c7c56f0e90Yifan Hong2018-08-153-63/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery uses IHealth::getService" am: ce2f0d85fbYifan Hong2018-08-153-63/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery uses IHealth::getService"Yifan Hong2018-08-153-63/+33
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery uses IHealth::getService"Yifan Hong2018-08-143-63/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery uses IHealth::getServiceYifan Hong2018-08-143-63/+33
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Move libupdater to Soong." am: c205dd9d43 am: d1386d8385Tao Bao2018-08-144-37/+81
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Move libupdater to Soong." am: c205dd9d43Tao Bao2018-08-144-37/+81
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Move libupdater to Soong."Tao Bao2018-08-144-37/+81
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Move libupdater to Soong."Tao Bao2018-08-144-37/+81
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Move libupdater to Soong.Tao Bao2018-08-134-37/+81
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Drop the dependency on libcrypto_utils.so and libsparse.so." am: 19d002d33f am: 3eceebf7ebTao Bao2018-08-141-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Drop the dependency on libcrypto_utils.so and libsparse.so." am: 19d002d33fTao Bao2018-08-141-2/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Drop the dependency on libcrypto_utils.so and libsparse.so."Tao Bao2018-08-141-2/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Drop the dependency on libcrypto_utils.so and libsparse.so."Tao Bao2018-08-141-2/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Drop the dependency on libcrypto_utils.so and libsparse.so.Tao Bao2018-08-141-2/+0
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add the hash_tree_info class in Command" am: c0195801dc am: 9b64295f3eTianjie Xu2018-08-143-1/+113
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add the hash_tree_info class in Command" am: c0195801dcTianjie Xu2018-08-143-1/+113
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add the hash_tree_info class in Command"Tianjie Xu2018-08-143-1/+113
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add the hash_tree_info class in Command"Tianjie Xu2018-08-143-1/+113
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the hash_tree_info class in CommandTianjie Xu2018-08-143-1/+113
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reland "Build and use minadbd as a shared library."" am: 337bd80b78 am: 7785eec4f2Tao Bao2018-08-143-13/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reland "Build and use minadbd as a shared library."" am: 337bd80b78Tao Bao2018-08-143-13/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reland "Build and use minadbd as a shared library.""Tao Bao2018-08-143-13/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reland "Build and use minadbd as a shared library.""Tao Bao2018-08-143-13/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reland "Build and use minadbd as a shared library."Tao Bao2018-08-133-13/+10
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove TODO for b/112462307" am: 1914bd0f4b am: a681afc358Colin Cross2018-08-141-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove TODO for b/112462307" am: 1914bd0f4bColin Cross2018-08-141-5/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove TODO for b/112462307"Colin Cross2018-08-131-5/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove TODO for b/112462307"Colin Cross2018-08-131-5/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove TODO for b/112462307Colin Cross2018-08-131-5/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build `recovery` with Soong." am: df264e0186 am: 24b16491db am: 287ce6ebeaTao Bao2018-08-134-189/+140
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build `recovery` with Soong." am: df264e0186 am: 24b16491dbTao Bao2018-08-134-189/+140
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build `recovery` with Soong." am: df264e0186Tao Bao2018-08-134-189/+140
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build `recovery` with Soong."Tao Bao2018-08-134-189/+140
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build `recovery` with Soong."Tao Bao2018-08-134-189/+140
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build `recovery` with Soong.Tao Bao2018-08-104-189/+140
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165 am: e5734c014f am: 9c2145d297Tao Bao2018-08-137-5/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165 am: e5734c014fTao Bao2018-08-137-5/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165Tao Bao2018-08-137-5/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Create res-testdata for testdata pickup."Tao Bao2018-08-137-5/+11
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Create res-testdata for testdata pickup."Tao Bao2018-08-137-5/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Create res-testdata for testdata pickup.Tao Bao2018-08-137-5/+11
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build boot control HAL with Android.bp" am: bbe881693a am: b5e9049476 am: 1303267b32Hridya Valsaraju2018-08-113-34/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build boot control HAL with Android.bp" am: bbe881693a am: b5e9049476Hridya Valsaraju2018-08-113-34/+37
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build boot control HAL with Android.bp" am: bbe881693aHridya Valsaraju2018-08-113-34/+37
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build boot control HAL with Android.bp"Hridya Valsaraju2018-08-113-34/+37
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build boot control HAL with Android.bp"Treehugger Robot2018-08-113-34/+37
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build boot control HAL with Android.bpHridya Valsaraju2018-08-103-34/+37
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Move to Soong." am: afa16480aa am: e98bdd979c am: ab3a4688b1Tao Bao2018-08-106-73/+76
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Move to Soong." am: afa16480aa am: e98bdd979cTao Bao2018-08-106-73/+76
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Move to Soong." am: afa16480aaTao Bao2018-08-106-73/+76
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Move to Soong."Tao Bao2018-08-106-73/+76
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Move to Soong."Tao Bao2018-08-106-73/+76
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Move to Soong.Tao Bao2018-08-106-73/+76
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "`recovery` uses more shared libraries." am: 3c5e2c1c7e am: f8f53fd04c am: 14acf82585Tao Bao2018-08-105-23/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "`recovery` uses more shared libraries." am: 3c5e2c1c7e am: f8f53fd04cTao Bao2018-08-105-23/+54
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "`recovery` uses more shared libraries." am: 3c5e2c1c7eTao Bao2018-08-105-23/+54
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "`recovery` uses more shared libraries."Tao Bao2018-08-105-23/+54
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "`recovery` uses more shared libraries."Tao Bao2018-08-105-23/+54
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `recovery` uses more shared libraries.Tao Bao2018-08-085-23/+54
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f am: 60e218cb5e am: 60fafd50d3Tao Bao2018-08-084-18/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f am: 60e218cb5eTao Bao2018-08-084-18/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2fTao Bao2018-08-084-18/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Build and use minadbd as a shared library.""Tao Bao2018-08-084-18/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Build and use minadbd as a shared library.""Tao Bao2018-08-084-18/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Build and use minadbd as a shared library."Tao Bao2018-08-084-18/+10
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track libsync module name change." am: 60924fa89a am: 7c42dc7284 am: 2217000e87Tao Bao2018-08-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track libsync module name change." am: 60924fa89a am: 7c42dc7284Tao Bao2018-08-081-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track libsync module name change." am: 60924fa89aTao Bao2018-08-081-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track libsync module name change."Tao Bao2018-08-081-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Track libsync module name change."Tao Bao2018-08-081-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui: Track libsync module name change.Tao Bao2018-08-071-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477 am: e0ded949e6 am: d6a445c1b5Tao Bao2018-08-081-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477 am: e0ded949e6Tao Bao2018-08-081-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477Tao Bao2018-08-081-3/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat"Tao Bao2018-08-081-3/+7
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat"Tao Bao2018-08-071-3/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the DRM_FORMAT match with corresponding PixelFormattangrobin2018-08-071-3/+7
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build and use minadbd as a shared library." am: ea38c4160a am: 479dd68d9e am: 4bdb7b3c33Tao Bao2018-08-084-10/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build and use minadbd as a shared library." am: ea38c4160a am: 479dd68d9eTao Bao2018-08-084-10/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build and use minadbd as a shared library." am: ea38c4160aTao Bao2018-08-084-10/+18
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build and use minadbd as a shared library."Tao Bao2018-08-084-10/+18
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build and use minadbd as a shared library."Tao Bao2018-08-074-10/+18
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build and use minadbd as a shared library.Tao Bao2018-08-074-10/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: 9791b21c1f am: 555802b108 am: 1f642fcc6aXin Li2018-08-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: 9791b21c1f am: 555802b108Xin Li2018-08-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: 9791b21c1fXin Li2018-08-080-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-070-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-079-25/+105
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge Android Pie into masterXin Li2018-08-079-25/+105
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ueventd is now at /system/bin/ueventd" am: aceb244401 am: 89048728f3 am: 9001c159b3Tom Cherry2018-08-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ueventd is now at /system/bin/ueventd" am: aceb244401 am: 89048728f3Tom Cherry2018-08-071-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ueventd is now at /system/bin/ueventd" am: aceb244401Tom Cherry2018-08-071-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ueventd is now at /system/bin/ueventd"Tom Cherry2018-08-071-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ueventd is now at /system/bin/ueventd"Tom Cherry2018-08-071-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ueventd is now at /system/bin/ueventdTom Cherry2018-07-251-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432 am: f82ff97029Tianjie Xu2018-08-078-18/+216
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432Tianjie Xu2018-08-078-18/+216
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add an updater function to compute hash tree" am: dbe4420325Tianjie Xu2018-08-078-18/+216
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add an updater function to compute hash tree"Tianjie Xu2018-08-078-18/+216
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add an updater function to compute hash tree"Tianjie Xu2018-08-078-18/+216
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an updater function to compute hash treeTianjie Xu2018-08-068-18/+216
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 am: 75acf24207 am: 39259af890Tao Bao2018-08-074-8/+111
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 am: 75acf24207Tao Bao2018-08-074-8/+111
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9Tao Bao2018-08-074-8/+111
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dynamically load device-specific recovery UI lib."Tao Bao2018-08-074-8/+111
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dynamically load device-specific recovery UI lib."Tao Bao2018-08-064-8/+111
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically load device-specific recovery UI lib.Tao Bao2018-08-064-8/+111
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move to Soong." am: f2bc68cfe1 am: ea105889a5 am: bf40c42766Tao Bao2018-08-063-60/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move to Soong." am: f2bc68cfe1 am: ea105889a5Tao Bao2018-08-063-60/+46
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move to Soong." am: f2bc68cfe1Tao Bao2018-08-063-60/+46
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move to Soong."Tao Bao2018-08-063-60/+46
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Move to Soong."Tao Bao2018-08-063-60/+46
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui: Move to Soong.Tao Bao2018-08-053-60/+46
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a am: ce0409a560 am: 8f545f4c8cTao Bao2018-08-046-64/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a am: ce0409a560Tao Bao2018-08-046-64/+69
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7aTao Bao2018-08-046-64/+69
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Use runtime properties instead of build time vars."Tao Bao2018-08-046-64/+69
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Use runtime properties instead of build time vars."Tao Bao2018-08-036-64/+69
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui: Use runtime properties instead of build time vars.Tao Bao2018-08-026-64/+69
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518 am: 814468deb5Tao Bao2018-08-049-107/+83
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518Tao Bao2018-08-049-107/+83
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07Tao Bao2018-08-049-107/+83
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Read custom recovery UI values via system property."Tao Bao2018-08-049-107/+83
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Read custom recovery UI values via system property."Tao Bao2018-08-039-107/+83
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Read custom recovery UI values via system property.Tao Bao2018-08-019-107/+83
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6 am: e9775341beZhomart Mukhamejanov2018-08-021-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6Zhomart Mukhamejanov2018-08-021-6/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove non-A/B mention from README." am: f8b04fe48dZhomart Mukhamejanov2018-08-021-6/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove non-A/B mention from README."Zhomart Mukhamejanov2018-08-021-6/+6
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove non-A/B mention from README."Zhomart Mukhamejanov2018-08-021-6/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove non-A/B mention from README.Zhomart Mukhamejanov2018-08-021-6/+6
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Clean up the use of `rotation`." am: a9ef617aa7 am: f22aeefaed am: f4e7bec485Tao Bao2018-08-012-27/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Clean up the use of `rotation`." am: a9ef617aa7 am: f22aeefaedTao Bao2018-08-012-27/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Clean up the use of `rotation`." am: a9ef617aa7Tao Bao2018-08-012-27/+50
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Clean up the use of `rotation`."Tao Bao2018-08-012-27/+50
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Clean up the use of `rotation`."Tao Bao2018-08-012-27/+50
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui: Clean up the use of `rotation`.Tao Bao2018-08-012-27/+50
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6 am: 4adfcf962fJaegeuk Kim2018-08-011-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6Jaegeuk Kim2018-08-011-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370Jaegeuk Kim2018-08-011-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file"Jaegeuk Kim2018-08-011-1/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file"Treehugger Robot2018-08-011-1/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncrypt: fix f2fs ioctl argument for pin_fileJaegeuk Kim2018-08-011-1/+2
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409 am: 9e9ef363fbJerry Zhang2018-07-316-33/+163
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409Jerry Zhang2018-07-316-33/+163
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to interrupt UI" am: 561ee9362cJerry Zhang2018-07-316-33/+163
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to interrupt UI"Jerry Zhang2018-07-316-33/+163
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to interrupt UI"Treehugger Robot2018-07-316-33/+163
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Add ability to interrupt UIJerry Zhang2018-07-306-33/+163
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6 am: 3bef3a72bdJosh Gao2018-07-281-22/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6Josh Gao2018-07-281-22/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811aJosh Gao2018-07-281-22/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: avoid overrriding services_to_fd."Josh Gao2018-07-281-22/+8
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: avoid overrriding services_to_fd."Josh Gao2018-07-281-22/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minadbd: avoid overrriding services_to_fd.Josh Gao2018-07-271-22/+8
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b am: dcc5fa4d4fHridya Valsaraju2018-07-273-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9bHridya Valsaraju2018-07-273-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery from /sbin to /system/bin" am: 4c80768796Hridya Valsaraju2018-07-273-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery from /sbin to /system/bin"Hridya Valsaraju2018-07-273-3/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery from /sbin to /system/bin"Treehugger Robot2018-07-273-3/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move recovery from /sbin to /system/binHridya Valsaraju2018-07-273-3/+3
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2 am: 2a047b9ff3Tianjie Xu2018-07-266-45/+191
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2Tianjie Xu2018-07-266-45/+191
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add proto3 support for care_map" am: 8d9b3aec3dTianjie Xu2018-07-266-45/+191
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add proto3 support for care_map"Tianjie Xu2018-07-266-45/+191
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add proto3 support for care_map"Tianjie Xu2018-07-266-45/+191
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add proto3 support for care_mapTianjie Xu2018-07-256-45/+191
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23 am: 39e5bdaedb am: f2e7b1757aTao Bao2018-07-261-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23 am: 39e5bdaedbTao Bao2018-07-261-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23Tao Bao2018-07-261-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "bootloader_message: Build libbootloader_message as shared lib."Tao Bao2018-07-261-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "bootloader_message: Build libbootloader_message as shared lib."Tao Bao2018-07-261-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootloader_message: Build libbootloader_message as shared lib.Tao Bao2018-07-251-2/+2
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master am: 85b714c876Xin Li2018-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-masterXin Li2018-07-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-masterXin Li2018-07-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li2018-07-230-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master am: 5c9e580f4f am: 56ba447c57Hridya Valsaraju2018-07-236-27/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master am: 5c9e580f4fHridya Valsaraju2018-07-236-27/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-masterHridya Valsaraju2018-07-236-27/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-masterTreeHugger Robot2018-07-236-27/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Make recovery libraries shared / recovery_available"Hridya Valsaraju2018-07-236-27/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942 am: 4ad9995b5bTao Bao2018-07-216-338/+252
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942Tao Bao2018-07-216-338/+252
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15Tao Bao2018-07-216-338/+252
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change applypatch command-line arguments."Tao Bao2018-07-216-338/+252
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change applypatch command-line arguments."Tao Bao2018-07-216-338/+252
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Change applypatch command-line arguments.Tao Bao2018-07-206-338/+252
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3 am: 393a97ff8b am: d275207d9dKarl Shaffer2018-07-201-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3 am: 393a97ff8bKarl Shaffer2018-07-201-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3Karl Shaffer2018-07-201-0/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Updates Wear UI to Display Localized Recovery Text."Karl Shaffer2018-07-201-0/+7
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Updates Wear UI to Display Localized Recovery Text."Treehugger Robot2018-07-201-0/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates Wear UI to Display Localized Recovery Text.Karl Shaffer2018-07-201-0/+7
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Make recovery libraries shared / recovery_available am: c936a69619 am: 3e8262d633Jerry Zhang2018-07-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make recovery libraries shared / recovery_available am: c936a69619Jerry Zhang2018-07-206-8/+27
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make recovery libraries shared / recovery_availableJerry Zhang2018-07-206-8/+27
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make recovery libraries shared / recovery_availableJerry Zhang2018-07-206-8/+27
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make recovery libraries shared / recovery_availableJerry Zhang2018-07-206-8/+27
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the arguments passed to getopt_long(3)." am: 29932e7bcc am: 2f9d61ad25Tao Bao2018-07-185-10/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the arguments passed to getopt_long(3)." am: 29932e7bccTao Bao2018-07-185-10/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the arguments passed to getopt_long(3)."Tao Bao2018-07-175-10/+32
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the arguments passed to getopt_long(3)."Tao Bao2018-07-175-10/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the arguments passed to getopt_long(3).Tao Bao2018-07-175-10/+32
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." am: 624b6b6cd5 am: 603b7ed470Tao Bao2018-07-135-25/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." am: 624b6b6cd5Tao Bao2018-07-135-25/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()."Tao Bao2018-07-135-25/+16
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()."Tao Bao2018-07-135-25/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache().Tao Bao2018-07-135-25/+16
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Clean up the temporary dirs post-run." am: b46e565fd8 am: d8e96f4b4dTao Bao2018-07-132-21/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Clean up the temporary dirs post-run." am: b46e565fd8Tao Bao2018-07-132-21/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Clean up the temporary dirs post-run."Tao Bao2018-07-132-21/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Clean up the temporary dirs post-run."Tao Bao2018-07-132-21/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Clean up the temporary dirs post-run.Tao Bao2018-07-122-21/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the return type of FreeSpaceForFile()." am: 90c9e4f55c am: c9f676bc64Tao Bao2018-07-134-25/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the return type of FreeSpaceForFile()." am: 90c9e4f55cTao Bao2018-07-134-25/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the return type of FreeSpaceForFile()."Tao Bao2018-07-134-25/+51
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the return type of FreeSpaceForFile()."Tao Bao2018-07-134-25/+51
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Fix the return type of FreeSpaceForFile().Tao Bao2018-07-124-25/+51
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch freecache.cpp to libbase logging." am: a0b2aad0f8 am: cea180895cTao Bao2018-07-121-21/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch freecache.cpp to libbase logging." am: a0b2aad0f8Tao Bao2018-07-121-21/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch freecache.cpp to libbase logging."Tao Bao2018-07-121-21/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch freecache.cpp to libbase logging."Tao Bao2018-07-121-21/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Switch freecache.cpp to libbase logging.Tao Bao2018-07-121-21/+17
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the debug code for bspatch flakiness" am: a9f9acca91 am: 04a6af06fbTao Bao2018-07-123-98/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the debug code for bspatch flakiness" am: a9f9acca91Tao Bao2018-07-123-98/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the debug code for bspatch flakiness"Tao Bao2018-07-123-98/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the debug code for bspatch flakiness"Tao Bao2018-07-123-98/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the debug code for bspatch flakinessTianjie Xu2018-07-113-98/+4
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Let read_file() return Value::Type::STRING." am: ac234b4493 am: e089c1a149Tao Bao2018-07-102-5/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Let read_file() return Value::Type::STRING." am: ac234b4493Tao Bao2018-07-102-5/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Let read_file() return Value::Type::STRING."Tao Bao2018-07-102-5/+28
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Let read_file() return Value::Type::STRING."Tao Bao2018-07-102-5/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Let read_file() return Value::Type::STRING.Tao Bao2018-07-102-5/+28
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706e am: 17cda674f3Tao Bao2018-07-105-74/+71
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706eTao Bao2018-07-105-74/+71
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Rename parse_string to ParseString and let it take std::string."Tao Bao2018-07-105-74/+71
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Rename parse_string to ParseString and let it take std::string."Tao Bao2018-07-105-74/+71
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edify: Rename parse_string to ParseString and let it take std::string.Tao Bao2018-07-105-74/+71
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043 am: d8a2c2682aTao Bao2018-07-108-85/+82
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043Tao Bao2018-07-108-85/+82
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class."Tao Bao2018-07-108-85/+82
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class."Tao Bao2018-07-108-85/+82
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edify: Remove VAL_INVALID and move ValueType into Value class.Tao Bao2018-07-108-85/+82
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Restrict applypatch_check to eMMC targets." am: e02cbaaa62 am: 254d43a3b9Tao Bao2018-07-104-99/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Restrict applypatch_check to eMMC targets." am: e02cbaaa62Tao Bao2018-07-104-99/+66
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Restrict applypatch_check to eMMC targets."Tao Bao2018-07-104-99/+66
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Restrict applypatch_check to eMMC targets."Tao Bao2018-07-104-99/+66
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Restrict applypatch_check to eMMC targets.Tao Bao2018-07-104-99/+66
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58c am: 471053ba87Tao Bao2018-07-101-4/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58cTao Bao2018-07-101-4/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix a potential nullptr dereferencing."Tao Bao2018-07-101-4/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix a potential nullptr dereferencing."Tao Bao2018-07-101-4/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Fix a potential nullptr dereferencing.Tao Bao2018-07-101-4/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the support for sha1_check()." am: fbc0f6062c am: e2136c46cbTao Bao2018-07-102-82/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the support for sha1_check()." am: fbc0f6062cTao Bao2018-07-102-82/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the support for sha1_check()."Tao Bao2018-07-102-82/+29
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the support for sha1_check()."Tao Bao2018-07-102-82/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Remove the support for sha1_check().Tao Bao2018-07-092-82/+29
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add ABORT command." am: c059b6c1c6 am: b450952d6aTao Bao2018-07-095-4/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add ABORT command." am: c059b6c1c6Tao Bao2018-07-095-4/+69
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add ABORT command."Tao Bao2018-07-095-4/+69
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add ABORT command."Tao Bao2018-07-095-4/+69
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Add ABORT command.Tao Bao2018-07-075-4/+69
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Split unit tests out of component/applypatch_test.cpp." am: cf1f9bdb12 am: cac6932cf4Tao Bao2018-07-063-289/+331
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Split unit tests out of component/applypatch_test.cpp." am: cf1f9bdb12Tao Bao2018-07-063-289/+331
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Split unit tests out of component/applypatch_test.cpp."Tao Bao2018-07-063-289/+331
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Split unit tests out of component/applypatch_test.cpp."Tao Bao2018-07-063-289/+331
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Split unit tests out of component/applypatch_test.cpp.Tao Bao2018-07-063-289/+331
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui/drm: wait for page flip completion" am: d419966730 am: d3e023c265Jeremy Compostella2018-07-041-1/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui/drm: wait for page flip completion" am: d419966730Jeremy Compostella2018-07-041-1/+38
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui/drm: wait for page flip completion"Jeremy Compostella2018-07-041-1/+38
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui/drm: wait for page flip completion"Treehugger Robot2018-07-041-1/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui/drm: wait for page flip completionJeremy Compostella2018-07-031-1/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "No longer print hash for stashed blocks during verification of retry" am: 0a84d7260b am: 65419746cbTianjie Xu2018-07-031-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "No longer print hash for stashed blocks during verification of retry" am: 0a84d7260bTianjie Xu2018-07-031-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "No longer print hash for stashed blocks during verification of retry"Tianjie Xu2018-07-031-1/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "No longer print hash for stashed blocks during verification of retry"Tianjie Xu2018-07-031-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer print hash for stashed blocks during verification of retryTianjie Xu2018-07-031-1/+3
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Check the number of args in Command::Parse." am: 95b8d2b064 am: 42f96e5516Tao Bao2018-06-262-9/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Check the number of args in Command::Parse." am: 95b8d2b064Tao Bao2018-06-262-9/+41
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Check the number of args in Command::Parse."Tao Bao2018-06-262-9/+41
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Check the number of args in Command::Parse."Tao Bao2018-06-262-9/+41
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Check the number of args in Command::Parse.Tao Bao2018-06-252-9/+41
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add Command parsing codes." am: afc2962e60 am: e6604307f6Tao Bao2018-06-265-17/+798
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add Command parsing codes." am: afc2962e60Tao Bao2018-06-265-17/+798
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add Command parsing codes."Tao Bao2018-06-265-17/+798
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add Command parsing codes."Tao Bao2018-06-265-17/+798
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Add Command parsing codes.Tao Bao2018-06-255-17/+798
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." am: b4181566f9 am: 839c40513aTao Bao2018-06-254-18/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." am: b4181566f9Tao Bao2018-06-254-18/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string."Tao Bao2018-06-254-18/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string."Tao Bao2018-06-254-18/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: {Load,Save}FileContents and ParseSha1 take std::string.Tao Bao2018-06-204-18/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to libbase logging." am: bd76709827 am: 513c7fb9e0Tao Bao2018-06-242-113/+118
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to libbase logging." am: bd76709827Tao Bao2018-06-242-113/+118
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to libbase logging."Tao Bao2018-06-242-113/+118
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to libbase logging."Treehugger Robot2018-06-242-113/+118
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Move to libbase logging.Tao Bao2018-06-202-113/+118
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f am: 681ae40d41Jiyong Park2018-06-213-14/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20fJiyong Park2018-06-213-14/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition"Jiyong Park2018-06-213-14/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition"Treehugger Robot2018-06-213-14/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2fsdroid and mke2fs are dynamic executable in recovery partitionJiyong Park2018-06-203-14/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up the function comments." am: 24e1321bc3 am: d4c1045d4eTao Bao2018-06-202-116/+105
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up the function comments." am: 24e1321bc3Tao Bao2018-06-202-116/+105
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up the function comments."Tao Bao2018-06-202-116/+105
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up the function comments."Tao Bao2018-06-202-116/+105
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Clean up the function comments.Tao Bao2018-06-202-116/+105
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Defer the creation of the new data writer." am: ddc81680e6 am: ae3e472a43Tao Bao2018-06-201-24/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Defer the creation of the new data writer." am: ddc81680e6Tao Bao2018-06-201-24/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Defer the creation of the new data writer."Tao Bao2018-06-201-24/+24
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Defer the creation of the new data writer."Tao Bao2018-06-201-24/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Defer the creation of the new data writer.Tao Bao2018-06-181-24/+24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add privileged system app docs" am: 4a2c2d8102 am: 9b4d364409Zhomart Mukhamejanov2018-06-203-29/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add privileged system app docs" am: 4a2c2d8102Zhomart Mukhamejanov2018-06-203-29/+57
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add privileged system app docs"Zhomart Mukhamejanov2018-06-203-29/+57
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add privileged system app docs"Zhomart Mukhamejanov2018-06-203-29/+57
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add privileged system app docsZhomart Mukhamejanov2018-06-183-29/+57
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop the dependency on AB_OTA_UPDATER flag." am: 9fb0d89583 am: a855c33880Tao Bao2018-06-197-127/+126
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop the dependency on AB_OTA_UPDATER flag." am: 9fb0d89583Tao Bao2018-06-197-127/+126
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop the dependency on AB_OTA_UPDATER flag."Tao Bao2018-06-197-127/+126
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop the dependency on AB_OTA_UPDATER flag."Tao Bao2018-06-197-127/+126
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the dependency on AB_OTA_UPDATER flag.Tao Bao2018-06-197-127/+126
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: run as a systemp app" am: 6b788b1848 am: bb1c6bf7ccZhomart Mukhamejanov2018-06-192-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: run as a systemp app" am: 6b788b1848Zhomart Mukhamejanov2018-06-192-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: run as a systemp app"Zhomart Mukhamejanov2018-06-192-1/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: run as a systemp app"Zhomart Mukhamejanov2018-06-192-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: run as a systemp appZhomart Mukhamejanov2018-06-182-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add proguard.flags" am: 5af63a45d9 am: 468ad1d965Zhomart Mukhamejanov2018-06-193-5/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add proguard.flags" am: 5af63a45d9Zhomart Mukhamejanov2018-06-193-5/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add proguard.flags"Zhomart Mukhamejanov2018-06-193-5/+28
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add proguard.flags"Zhomart Mukhamejanov2018-06-193-5/+28
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add proguard.flagsZhomart Mukhamejanov2018-06-183-5/+28
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478 am: c48f0b6923Zhomart Mukhamejanov2018-06-141-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478Zhomart Mukhamejanov2018-06-141-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add metadata mismatch error code"Zhomart Mukhamejanov2018-06-141-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add metadata mismatch error code"Zhomart Mukhamejanov2018-06-141-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add metadata mismatch error codeZhomart Mukhamejanov2018-06-141-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3 am: c7b4418a80Tao Bao2018-06-141-1/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3Tao Bao2018-06-141-1/+38
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure."Tao Bao2018-06-141-1/+38
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure."Tao Bao2018-06-141-1/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Skip ScreenRecoveryUITest on gr_init failure.Tao Bao2018-06-141-1/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8 am: 888dae6c13Ian Pedowitz2018-06-143-28/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8Ian Pedowitz2018-06-143-28/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "updater_sample: add proguard.flags""Ian Pedowitz2018-06-143-28/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "updater_sample: add proguard.flags""Ian Pedowitz2018-06-143-28/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "updater_sample: add proguard.flags"Ian Pedowitz2018-06-143-28/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Move the call to gr_init() into Init()." am: 4264ee890e am: 2a3c46a068Tao Bao2018-06-141-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Move the call to gr_init() into Init()." am: 4264ee890eTao Bao2018-06-141-2/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Move the call to gr_init() into Init()."Tao Bao2018-06-141-2/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Move the call to gr_init() into Init()."Tao Bao2018-06-141-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Move the call to gr_init() into Init().Tao Bao2018-06-141-2/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 am: 52a702181eTao Bao2018-06-141-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0Tao Bao2018-06-141-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Call gr_exit() from dtor."Tao Bao2018-06-141-0/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Call gr_exit() from dtor."Treehugger Robot2018-06-141-0/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Call gr_exit() from dtor.Tao Bao2018-06-141-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recovery image is self-contained" am: 397e8f2279 am: 93ea306913Jiyong Park2018-06-143-17/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recovery image is self-contained" am: 397e8f2279Jiyong Park2018-06-143-17/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recovery image is self-contained"Jiyong Park2018-06-143-17/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recovery image is self-contained"Treehugger Robot2018-06-143-17/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recovery image is self-containedJiyong Park2018-06-073-17/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add proguard.flags" am: 5ced47d120 am: 9b6a9aceaeZhomart Mukhamejanov2018-06-143-6/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add proguard.flags" am: 5ced47d120Zhomart Mukhamejanov2018-06-143-6/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add proguard.flags"Zhomart Mukhamejanov2018-06-143-6/+28
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add proguard.flags"Zhomart Mukhamejanov2018-06-143-6/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add proguard.flagsZhomart Mukhamejanov2018-06-133-6/+28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe am: cc08655e65Tao Bao2018-06-142-20/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8feTao Bao2018-06-142-20/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}."Tao Bao2018-06-142-20/+31
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}."Tao Bao2018-06-142-20/+31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui: Add constness to GRSurface* in gr_get_{width,height}.Tao Bao2018-06-132-20/+31
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a am: 941d3ab754Tao Bao2018-06-091-12/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382aTao Bao2018-06-091-12/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()."Tao Bao2018-06-091-12/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()."Tao Bao2018-06-091-12/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3().Tao Bao2018-06-081-12/+10
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master am: d8a411c90aXin Li2018-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-masterXin Li2018-06-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-masterXin Li2018-06-099-25/+105
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-089-25/+105
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d am: 165a197cdfTao Bao2018-06-082-11/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06dTao Bao2018-06-082-11/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the redundant check on line count."Tao Bao2018-06-082-11/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove the redundant check on line count."Tao Bao2018-06-082-11/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Remove the redundant check on line count.Tao Bao2018-06-072-11/+24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update README.md" am: 1cb7222784 am: fc824cb998Zhomart Mukhamejanov2018-06-081-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update README.md" am: 1cb7222784Zhomart Mukhamejanov2018-06-081-3/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update README.md"Zhomart Mukhamejanov2018-06-081-3/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update README.md"Zhomart Mukhamejanov2018-06-081-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: update README.mdZhomart Mukhamejanov2018-06-081-3/+5
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix payload spec tests" am: 684d7216e6 am: 7c8e5b6ee8Zhomart Mukhamejanov2018-06-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix payload spec tests" am: 684d7216e6Zhomart Mukhamejanov2018-06-081-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix payload spec tests"Zhomart Mukhamejanov2018-06-081-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix payload spec tests"Zhomart Mukhamejanov2018-06-081-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: fix payload spec testsZhomart Mukhamejanov2018-06-071-1/+1
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: change gen_update_config args" am: eeabbecb64 am: 493e6cb9e0Zhomart Mukhamejanov2018-06-071-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: change gen_update_config args" am: eeabbecb64Zhomart Mukhamejanov2018-06-071-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: change gen_update_config args"Zhomart Mukhamejanov2018-06-071-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: change gen_update_config args"Zhomart Mukhamejanov2018-06-071-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: change gen_update_config argsZhomart Mukhamejanov2018-06-071-3/+3
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add suspend/resume update" am: 382691fbb0 am: f4c1420742Zhomart Mukhamejanov2018-06-074-13/+80
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add suspend/resume update" am: 382691fbb0Zhomart Mukhamejanov2018-06-074-13/+80
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add suspend/resume update"Zhomart Mukhamejanov2018-06-074-13/+80
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add suspend/resume update"Zhomart Mukhamejanov2018-06-074-13/+80
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Add suspend/resume updateZhomart Mukhamejanov2018-06-054-13/+80
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Replace the reference arguments with pointers." am: cef8431fed am: 9c22d924e8Tao Bao2018-06-071-102/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Replace the reference arguments with pointers." am: cef8431fedTao Bao2018-06-071-102/+101
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Replace the reference arguments with pointers."Tao Bao2018-06-071-102/+101
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Replace the reference arguments with pointers."Tao Bao2018-06-071-102/+101
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Replace the reference arguments with pointers.Tao Bao2018-06-051-102/+101
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Handle the failures from the drm backend in gr_init" am: 0e2d900739 am: c8d9d6ca17Tianjie Xu2018-06-073-7/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Handle the failures from the drm backend in gr_init" am: 0e2d900739Tianjie Xu2018-06-073-7/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Handle the failures from the drm backend in gr_init"Tianjie Xu2018-06-063-7/+16
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minui: Handle the failures from the drm backend in gr_init"Tianjie Xu2018-06-063-7/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui: Handle the failures from the drm backend in gr_initTianjie Xu2018-06-063-7/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: join only if joinable." am: 2454b2493a am: ccff03d196Tao Bao2018-06-063-2/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: join only if joinable." am: 2454b2493aTao Bao2018-06-063-2/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: join only if joinable."Tao Bao2018-06-063-2/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: join only if joinable."Tao Bao2018-06-063-2/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: join only if joinable.Tao Bao2018-06-063-2/+11
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0 am: d770790a8fTao Bao2018-06-062-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0Tao Bao2018-06-062-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Specify the death test style to avoid flakiness."Tao Bao2018-06-062-0/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Specify the death test style to avoid flakiness."Tao Bao2018-06-062-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Specify the death test style to avoid flakiness.Tao Bao2018-06-052-0/+5
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add UI docs to README" am: e36b6ec97c am: 321a7134e9Zhomart Mukhamejanov2018-06-051-0/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add UI docs to README" am: e36b6ec97cZhomart Mukhamejanov2018-06-051-0/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add UI docs to README"Zhomart Mukhamejanov2018-06-051-0/+25
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add UI docs to README"Zhomart Mukhamejanov2018-06-051-0/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Add UI docs to READMEZhomart Mukhamejanov2018-06-051-0/+25
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: improve updater state handling" am: 269be9f22d am: 188190cc8cZhomart Mukhamejanov2018-06-058-167/+307
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: improve updater state handling" am: 269be9f22dZhomart Mukhamejanov2018-06-058-167/+307
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: improve updater state handling"Zhomart Mukhamejanov2018-06-058-167/+307
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: improve updater state handling"Zhomart Mukhamejanov2018-06-058-167/+307
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: improve updater state handlingZhomart Mukhamejanov2018-06-048-167/+307
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add ResumableUpdaterTest." am: a21a63bf56 am: 1d33962b86Tao Bao2018-06-052-0/+228
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add ResumableUpdaterTest." am: a21a63bf56Tao Bao2018-06-052-0/+228
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add ResumableUpdaterTest."Tao Bao2018-06-042-0/+228
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add ResumableUpdaterTest."Tao Bao2018-06-042-0/+228
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Add ResumableUpdaterTest.Tao Bao2018-06-042-0/+228
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: validate state only once" am: 02ee7bf29d am: 8bb3085865Zhomart Mukhamejanov2018-06-011-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: validate state only once" am: 02ee7bf29dZhomart Mukhamejanov2018-06-011-1/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: validate state only once"Zhomart Mukhamejanov2018-06-011-1/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: validate state only once"Zhomart Mukhamejanov2018-06-011-1/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: validate state only onceZhomart Mukhamejanov2018-06-011-1/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Let gr_init proceed even if we failed to load a font file" am: 2d85a0f6f7 am: 80918c9773Tianjie Xu2018-06-012-4/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Let gr_init proceed even if we failed to load a font file" am: 2d85a0f6f7Tianjie Xu2018-06-012-4/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Let gr_init proceed even if we failed to load a font file"Tianjie Xu2018-06-012-4/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Let gr_init proceed even if we failed to load a font file"Treehugger Robot2018-06-012-4/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let gr_init proceed even if we failed to load a font fileTianjie Xu2018-06-012-4/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176 am: b0d9b3594bDavid Anderson2018-06-014-1/+203
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176David Anderson2018-06-014-1/+203
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: add --fsck_unshare_blocks option for adb remount"David Anderson2018-06-014-1/+203
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: add --fsck_unshare_blocks option for adb remount"Treehugger Robot2018-06-014-1/+203
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: add --fsck_unshare_blocks option for adb remountDavid Anderson2018-05-304-1/+203
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add @GuardedBy" am: 2759733136 am: a37a085a11Zhomart Mukhamejanov2018-06-012-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add @GuardedBy" am: 2759733136Zhomart Mukhamejanov2018-06-012-1/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add @GuardedBy"Zhomart Mukhamejanov2018-06-012-1/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add @GuardedBy"Zhomart Mukhamejanov2018-06-012-1/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Add @GuardedByZhomart Mukhamejanov2018-06-012-1/+8
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Improve update completion handling" am: 9455173f87 am: 86f05074d2Zhomart Mukhamejanov2018-06-013-1/+147
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Improve update completion handling" am: 9455173f87Zhomart Mukhamejanov2018-06-013-1/+147
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Improve update completion handling"Zhomart Mukhamejanov2018-06-013-1/+147
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Improve update completion handling"Zhomart Mukhamejanov2018-06-013-1/+147
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Improve update completion handlingZhomart Mukhamejanov2018-05-313-1/+147
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7 am: 838f30a8f7Tao Bao2018-06-011-15/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7Tao Bao2018-06-011-15/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Drop the 'blocks' parameter in LoadStash()."Tao Bao2018-06-011-15/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Drop the 'blocks' parameter in LoadStash()."Tao Bao2018-05-311-15/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Drop the 'blocks' parameter in LoadStash().Tao Bao2018-05-311-15/+8
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add UpdaterState" am: 721f6d851f am: b2a0611ea7Zhomart Mukhamejanov2018-05-304-68/+128
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add UpdaterState" am: 721f6d851fZhomart Mukhamejanov2018-05-304-68/+128
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add UpdaterState"Zhomart Mukhamejanov2018-05-304-68/+128
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add UpdaterState"Zhomart Mukhamejanov2018-05-304-68/+128
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add UpdaterStateZhomart Mukhamejanov2018-05-264-68/+128
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add UpdateData" am: 8f15a82229 am: 8dd98e8c45Zhomart Mukhamejanov2018-05-301-29/+121
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add UpdateData" am: 8f15a82229Zhomart Mukhamejanov2018-05-301-29/+121
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add UpdateData"Zhomart Mukhamejanov2018-05-301-29/+121
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add UpdateData"Zhomart Mukhamejanov2018-05-301-29/+121
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add UpdateDataZhomart Mukhamejanov2018-05-261-29/+121
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: c++ify pthread use in UI" am: 85a007c47c am: 956580b139Jerry Zhang2018-05-305-127/+87
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: c++ify pthread use in UI" am: 85a007c47cJerry Zhang2018-05-305-127/+87
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: c++ify pthread use in UI"Jerry Zhang2018-05-305-127/+87
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: c++ify pthread use in UI"Jerry Zhang2018-05-305-127/+87
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: c++ify pthread use in UIJerry Zhang2018-05-305-127/+87
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Use std::thread to create input/progress threads." am: b8634ca793 am: 4fcc200272Tao Bao2018-05-295-66/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Use std::thread to create input/progress threads." am: b8634ca793Tao Bao2018-05-295-66/+64
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Use std::thread to create input/progress threads."Tao Bao2018-05-295-66/+64
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Use std::thread to create input/progress threads."Tao Bao2018-05-295-66/+64
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Use std::thread to create input/progress threads.Tao Bao2018-05-225-66/+64
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add Commmand class to manage BBOTA commands." am: a488bd992f am: 89d65805c6Tao Bao2018-05-296-63/+171
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add Commmand class to manage BBOTA commands." am: a488bd992fTao Bao2018-05-296-63/+171
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add Commmand class to manage BBOTA commands."Tao Bao2018-05-296-63/+171
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add Commmand class to manage BBOTA commands."Tao Bao2018-05-296-63/+171
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Add Commmand class to manage BBOTA commands.Tao Bao2018-05-266-63/+171
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tools: Move to Soong." am: 6b16093b29 am: 9016deefe4Tao Bao2018-05-296-37/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tools: Move to Soong." am: 6b16093b29Tao Bao2018-05-296-37/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tools: Move to Soong."Tao Bao2018-05-296-37/+50
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tools: Move to Soong."Tao Bao2018-05-296-37/+50
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tools: Move to Soong.Tao Bao2018-05-176-37/+50
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add OWNERS." am: 44e857390a am: 101af85e34Tao Bao2018-05-251-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add OWNERS." am: 44e857390aTao Bao2018-05-251-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add OWNERS."Tao Bao2018-05-251-0/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add OWNERS."Treehugger Robot2018-05-251-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Add OWNERS.Tao Bao2018-05-251-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add updater state" am: c290e088ed am: 4e17087235Zhomart Mukhamejanov2018-05-255-43/+186
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add updater state" am: c290e088edZhomart Mukhamejanov2018-05-255-43/+186
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add updater state"Zhomart Mukhamejanov2018-05-255-43/+186
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add updater state"Zhomart Mukhamejanov2018-05-255-43/+186
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add updater stateZhomart Mukhamejanov2018-05-255-43/+186
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6 am: 17d46f2551Tao Bao2018-05-251-13/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6Tao Bao2018-05-251-13/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Setup last_command_file for UpdaterTest."Tao Bao2018-05-251-13/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Setup last_command_file for UpdaterTest."Tao Bao2018-05-251-13/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Setup last_command_file for UpdaterTest.Tao Bao2018-05-251-13/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark as recovery_available:true" am: ddf2947359 am: 6d81f8732cJiyong Park2018-05-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark as recovery_available:true" am: ddf2947359Jiyong Park2018-05-251-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark as recovery_available:true"Jiyong Park2018-05-251-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark as recovery_available:true"Treehugger Robot2018-05-251-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark as recovery_available:trueJiyong Park2018-05-241-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Refactor the common lines in UpdaterTest." am: faa47854f4 am: 83e341e754Tao Bao2018-05-251-286/+182
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Refactor the common lines in UpdaterTest." am: faa47854f4Tao Bao2018-05-251-286/+182
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Refactor the common lines in UpdaterTest."Tao Bao2018-05-251-286/+182
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Refactor the common lines in UpdaterTest."Tao Bao2018-05-251-286/+182
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Refactor the common lines in UpdaterTest.Tao Bao2018-05-241-286/+182
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert deflate image chunks to raw if the raw data is smaller" am: fc0f04cba7 am: 8e72eb7077Tianjie Xu2018-05-256-35/+80
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert deflate image chunks to raw if the raw data is smaller" am: fc0f04cba7Tianjie Xu2018-05-256-35/+80
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert deflate image chunks to raw if the raw data is smaller"Tianjie Xu2018-05-256-35/+80
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert deflate image chunks to raw if the raw data is smaller"Tianjie Xu2018-05-256-35/+80
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert deflate image chunks to raw if the raw data is smallerTianjie Xu2018-05-246-35/+80
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: create UpdateManager" am: 2a0b23bdf6 am: dd885ab568Zhomart Mukhamejanov2018-05-259-243/+492
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: create UpdateManager" am: 2a0b23bdf6Zhomart Mukhamejanov2018-05-249-243/+492
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: create UpdateManager"Zhomart Mukhamejanov2018-05-249-243/+492
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: create UpdateManager"Zhomart Mukhamejanov2018-05-249-243/+492
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: create UpdateManagerZhomart Mukhamejanov2018-05-249-243/+492
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Use a bool to indicate if allowed to skip a command." am: 3a8b348936 am: 082733b555Tao Bao2018-05-221-22/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Use a bool to indicate if allowed to skip a command." am: 3a8b348936Tao Bao2018-05-221-22/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Use a bool to indicate if allowed to skip a command."Tao Bao2018-05-221-22/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Use a bool to indicate if allowed to skip a command."Tao Bao2018-05-221-22/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Use a bool to indicate if allowed to skip a command.Tao Bao2018-05-221-22/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to set title lines" am: cba047f944 am: 6283f64568Jerry Zhang2018-05-225-5/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to set title lines" am: cba047f944Jerry Zhang2018-05-225-5/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to set title lines"Jerry Zhang2018-05-225-5/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Add ability to set title lines"Jerry Zhang2018-05-225-5/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Add ability to set title linesJerry Zhang2018-05-225-5/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up the header lines computation." am: a5735e9b5f am: 1e29bb6717Tao Bao2018-05-221-6/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up the header lines computation." am: a5735e9b5fTao Bao2018-05-221-6/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up the header lines computation."Tao Bao2018-05-221-6/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up the header lines computation."Tao Bao2018-05-221-6/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Clean up the header lines computation.Tao Bao2018-05-211-6/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Move stuff from recovery into librecovery." am: 901f0c3516 am: dd88112054 -s oursTao Bao2018-05-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Move stuff from recovery into librecovery." am: 901f0c3516Tao Bao2018-05-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move stuff from recovery into librecovery."Tao Bao2018-05-222-43/+40
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move stuff from recovery into librecovery."Tao Bao2018-05-222-43/+40
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move stuff from recovery into librecovery.Tao Bao2018-05-172-43/+40
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move stuff from recovery into librecovery." into pi-dev-plus-aospTao Bao2018-05-222-57/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move stuff from recovery into librecovery." into pi-dev-plus-aospTao Bao2018-05-222-57/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move stuff from recovery into librecovery.Tao Bao2018-05-172-57/+66
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_config: make utils/PayloadSpecs non-static" am: 928f2cbf9b am: 3714929c32Zhomart Mukhamejanov2018-05-214-13/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_config: make utils/PayloadSpecs non-static" am: 928f2cbf9bZhomart Mukhamejanov2018-05-214-13/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_config: make utils/PayloadSpecs non-static"Zhomart Mukhamejanov2018-05-214-13/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_config: make utils/PayloadSpecs non-static"Zhomart Mukhamejanov2018-05-214-13/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_config: make utils/PayloadSpecs non-staticZhomart Mukhamejanov2018-05-184-13/+17
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Reset optind to 1 after getopt" am: 38d90316b2 am: 25d31c9f9cJerry Zhang2018-05-172-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Reset optind to 1 after getopt" am: 38d90316b2Jerry Zhang2018-05-172-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Reset optind to 1 after getopt"Jerry Zhang2018-05-172-0/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Reset optind to 1 after getopt"Treehugger Robot2018-05-172-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Reset optind to 1 after getoptJerry Zhang2018-05-172-0/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add switch slot demo" am: 2ddc54f5fd am: 4f26e44969Tao Bao2018-05-1711-16/+210
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add switch slot demo" am: 2ddc54f5fdTao Bao2018-05-1711-16/+210
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add switch slot demo"Tao Bao2018-05-1711-16/+210
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add switch slot demo"Tao Bao2018-05-1711-16/+210
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add switch slot demoZhomart Mukhamejanov2018-05-1711-16/+210
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58b am: 0abc18d520 -s oursTao Bao2018-05-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58bTao Bao2018-05-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Refactor common setup into main()"Tao Bao2018-05-174-171/+235
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Refactor common setup into main()"Tao Bao2018-05-174-171/+235
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Refactor common setup into main()Jerry Zhang2018-05-164-171/+235
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Last command file should be updated after a command finishes" am: 6dfc54cae1 am: 45b7dbea74Tianjie Xu2018-05-171-11/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Last command file should be updated after a command finishes" am: 6dfc54cae1Tianjie Xu2018-05-171-11/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Last command file should be updated after a command finishes"Tianjie Xu2018-05-171-11/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Last command file should be updated after a command finishes"Tianjie Xu2018-05-171-11/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last command file should be updated after a command finishesTianjie Xu2018-05-161-11/+7
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Refactor common setup into main()" into pi-dev-plus-aospJerry Zhang2018-05-164-171/+235
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Refactor common setup into main()" into pi-dev-plus-aospJerry Zhang2018-05-164-171/+235
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Refactor common setup into main()Jerry Zhang2018-05-164-171/+235
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38 am: b730743b40Tao Bao2018-05-162-8/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38Tao Bao2018-05-162-8/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Address a TODO regarding {intro,loop}_frames."Tao Bao2018-05-162-8/+53
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Address a TODO regarding {intro,loop}_frames."Tao Bao2018-05-162-8/+53
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wear_ui: Address a TODO regarding {intro,loop}_frames.Tao Bao2018-05-142-8/+53
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0 am: 0c2998ffe3Tao Bao2018-05-122-72/+122
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0Tao Bao2018-05-122-72/+122
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up the Makefile for recovery and tests."Tao Bao2018-05-122-72/+122
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up the Makefile for recovery and tests."Tao Bao2018-05-122-72/+122
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the Makefile for recovery and tests.Tao Bao2018-05-122-72/+122
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix an issue in RTL locale detection." am: 13d56e9bed am: 0e42c5680cTao Bao2018-05-122-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix an issue in RTL locale detection." am: 13d56e9bedTao Bao2018-05-112-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix an issue in RTL locale detection."Tao Bao2018-05-112-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix an issue in RTL locale detection."Treehugger Robot2018-05-112-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Fix an issue in RTL locale detection.Tao Bao2018-05-092-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move device.cpp into librecovery_ui." am: db6dc14bff am: fb8636f48fTao Bao2018-05-121-7/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move device.cpp into librecovery_ui." am: db6dc14bffTao Bao2018-05-111-7/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move device.cpp into librecovery_ui."Tao Bao2018-05-111-7/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move device.cpp into librecovery_ui."Tao Bao2018-05-111-7/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move device.cpp into librecovery_ui.Tao Bao2018-05-111-7/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36 am: ca88c67135Tao Bao2018-05-1110-11/+202
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36Tao Bao2018-05-1110-11/+202
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for ScreenRecoveryUI."Tao Bao2018-05-1110-12/+202
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for ScreenRecoveryUI."Tao Bao2018-05-1110-12/+202
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Add tests for ScreenRecoveryUI.Tao Bao2018-05-0910-12/+202
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Configure device menu based on runtime info." am: e498ef2f03 am: bd32e1b50bTao Bao2018-05-114-46/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Configure device menu based on runtime info." am: e498ef2f03Tao Bao2018-05-114-46/+48
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Configure device menu based on runtime info."Tao Bao2018-05-114-46/+48
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Configure device menu based on runtime info."Tao Bao2018-05-114-46/+48
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Configure device menu based on runtime info.Tao Bao2018-05-114-46/+48
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add HAL compatibility check" am: 563d34f712 am: 0045e76c7cZhomart Mukhamejanov2018-05-112-27/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add HAL compatibility check" am: 563d34f712Zhomart Mukhamejanov2018-05-112-27/+60
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add HAL compatibility check"Zhomart Mukhamejanov2018-05-112-27/+60
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add HAL compatibility check"Zhomart Mukhamejanov2018-05-112-27/+60
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add HAL compatibility checkZhomart Mukhamejanov2018-05-102-27/+60
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Document the clang-format usage." am: 797550fb8b am: cc71d271c1Tao Bao2018-05-111-0/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Document the clang-format usage." am: 797550fb8bTao Bao2018-05-111-0/+30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Document the clang-format usage."Tao Bao2018-05-111-0/+30
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Document the clang-format usage."Tao Bao2018-05-111-0/+30
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the clang-format usage.Tao Bao2018-05-101-0/+30
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Device owns the RecoveryUI instance." am: 6df846e337 am: 8d593973d6Tao Bao2018-05-116-29/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Device owns the RecoveryUI instance." am: 6df846e337Tao Bao2018-05-116-29/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Device owns the RecoveryUI instance."Tao Bao2018-05-116-29/+26
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Device owns the RecoveryUI instance."Tao Bao2018-05-116-29/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device owns the RecoveryUI instance.Tao Bao2018-05-106-29/+26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix UpdateConfig" am: 7217e7045d am: 48294e3d86Zhomart Mukhamejanov2018-05-113-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix UpdateConfig" am: 7217e7045dZhomart Mukhamejanov2018-05-113-4/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix UpdateConfig"Zhomart Mukhamejanov2018-05-103-4/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix UpdateConfig"Zhomart Mukhamejanov2018-05-103-4/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: fix UpdateConfigZhomart Mukhamejanov2018-05-103-4/+8
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add http header demo" am: fe5b3e2b2d am: 319e191238Zhomart Mukhamejanov2018-05-104-13/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add http header demo" am: fe5b3e2b2dZhomart Mukhamejanov2018-05-104-13/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add http header demo"Zhomart Mukhamejanov2018-05-104-13/+51
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add http header demo"Zhomart Mukhamejanov2018-05-104-13/+51
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add http header demoZhomart Mukhamejanov2018-05-104-13/+51
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix an issue when displaying wrapped text." am: 1d4ef4ba4b am: ae4b00c427Tao Bao2018-05-092-7/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix an issue when displaying wrapped text." am: 1d4ef4ba4bTao Bao2018-05-092-7/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix an issue when displaying wrapped text."Tao Bao2018-05-092-7/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix an issue when displaying wrapped text."Tao Bao2018-05-092-7/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Fix an issue when displaying wrapped text.Tao Bao2018-05-092-7/+10
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update tools" am: daa86e9024 am: 9fdeb57ab0Zhomart Mukhamejanov2018-05-097-93/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update tools" am: daa86e9024Zhomart Mukhamejanov2018-05-097-93/+74
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update tools"Zhomart Mukhamejanov2018-05-097-93/+74
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update tools"Zhomart Mukhamejanov2018-05-097-93/+74
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: update toolsZhomart Mukhamejanov2018-05-087-93/+74
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add streaming support" am: c23a53c272 am: e88d4682eaZhomart Mukhamejanov2018-05-096-20/+266
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add streaming support" am: c23a53c272Zhomart Mukhamejanov2018-05-096-20/+266
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add streaming support"Zhomart Mukhamejanov2018-05-096-20/+266
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add streaming support"Zhomart Mukhamejanov2018-05-096-20/+266
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add streaming supportZhomart Mukhamejanov2018-05-086-20/+266
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove unneeded include of minui.h." am: 0a2c4e260f am: 5004300d6fTao Bao2018-05-081-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove unneeded include of minui.h." am: 0a2c4e260fTao Bao2018-05-081-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove unneeded include of minui.h."Tao Bao2018-05-081-1/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove unneeded include of minui.h."Tao Bao2018-05-081-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Remove unneeded include of minui.h.Tao Bao2018-05-081-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." am: 1f3a9c0a43 am: 730d541588android-build-prod (mdb)2018-05-083-6/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." am: 1f3a9c0a43android-build-prod (mdb)2018-05-083-6/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages."android-build-prod (mdb)2018-05-083-6/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages."android-build-prod (mdb)2018-05-083-6/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Drop the parameter in CheckBackgroundTextImages.Tao Bao2018-05-083-6/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Get UI and locale from device." am: d8abd2bd70 am: 07bf50a51dTao Bao2018-05-086-5/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Get UI and locale from device." am: d8abd2bd70Tao Bao2018-05-086-5/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Get UI and locale from device."Tao Bao2018-05-086-5/+23
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Get UI and locale from device."Tao Bao2018-05-086-5/+23
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Get UI and locale from device.Jerry Zhang2018-05-086-5/+23
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4 am: 260d4ba55f -s oursTao Bao2018-05-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4Tao Bao2018-05-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Refactor logging code into logging.cpp"Tao Bao2018-05-0810-251/+280
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Refactor logging code into logging.cpp"Tao Bao2018-05-0810-251/+280
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Refactor logging code into logging.cppJerry Zhang2018-05-0710-251/+280
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Skip an updated partition on retry." am: 0ffe13b56f am: 83906f75bbTao Bao2018-05-081-39/+77
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Skip an updated partition on retry." am: 0ffe13b56fTao Bao2018-05-081-39/+77
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Skip an updated partition on retry."Tao Bao2018-05-081-39/+77
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Skip an updated partition on retry."Tao Bao2018-05-081-39/+77
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Skip an updated partition on retry.Tao Bao2018-05-081-39/+77
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an issue when resuming an update." am: 1dc9e2ddef am: 47bf5e68e6Tao Bao2018-05-081-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an issue when resuming an update." am: 1dc9e2ddefTao Bao2018-05-081-3/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an issue when resuming an update."Tao Bao2018-05-081-3/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an issue when resuming an update."Tao Bao2018-05-081-3/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Fix an issue when resuming an update.Tao Bao2018-05-081-3/+6
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Refactor logging code into logging.cppJerry Zhang2018-05-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Refactor logging code into logging.cppJerry Zhang2018-05-0710-251/+280
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Refactor logging code into logging.cppJerry Zhang2018-05-0710-251/+280
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4 am: c4ba6b738fandroid-build-prod (mdb)2018-05-0419-40/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4android-build-prod (mdb)2018-05-0419-40/+41
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I1cc5d702,I32ab9854android-build-prod (mdb)2018-05-0419-40/+41
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I1cc5d702,I32ab9854android-build-prod (mdb)2018-05-0419-40/+41
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move reboot() from common.h into otautil/sysutil.h.Tao Bao2018-05-048-20/+21
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otautil: Rename dir/sys/thermal utils.Tao Bao2018-05-0416-20/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Only build the needed files for host build." am: 5818e894df am: d7d087f31cTao Bao2018-05-041-7/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Only build the needed files for host build." am: 5818e894dfTao Bao2018-05-041-7/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Only build the needed files for host build."Tao Bao2018-05-041-7/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Only build the needed files for host build."Tao Bao2018-05-041-7/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otautil: Only build the needed files for host build.Tao Bao2018-05-041-7/+10
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move menu headers/items to std::vector<std::string>." am: fb86bb2a07 am: 0d9ed29541Tao Bao2018-05-0410-141/+147
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move menu headers/items to std::vector<std::string>." am: fb86bb2a07Tao Bao2018-05-0410-141/+147
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move menu headers/items to std::vector<std::string>."Tao Bao2018-05-0410-141/+147
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move menu headers/items to std::vector<std::string>."Tao Bao2018-05-0410-141/+147
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move menu headers/items to std::vector<std::string>.Tao Bao2018-05-0310-141/+147
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update tests" am: 219445a320 am: f3d1e58163Zhomart Mukhamejanov2018-05-043-15/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update tests" am: 219445a320Zhomart Mukhamejanov2018-05-043-15/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update tests"Zhomart Mukhamejanov2018-05-043-15/+29
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update tests"Zhomart Mukhamejanov2018-05-043-15/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: update testsZhomart Mukhamejanov2018-05-033-15/+29
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update ui and README, clean-up" am: 9c544a2bc6 am: c36f5ff1c7Zhomart Mukhamejanov2018-05-037-98/+151
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update ui and README, clean-up" am: 9c544a2bc6Zhomart Mukhamejanov2018-05-037-98/+151
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update ui and README, clean-up"Zhomart Mukhamejanov2018-05-037-98/+151
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: update ui and README, clean-up"Zhomart Mukhamejanov2018-05-037-98/+151
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: update ui and README, clean-upZhomart Mukhamejanov2018-05-037-98/+151
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Merge Menu::Start() into its ctor." am: 0cabcd0126 am: bcf8beaeedandroid-build-prod (mdb)2018-05-034-48/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Merge Menu::Start() into its ctor." am: 0cabcd0126android-build-prod (mdb)2018-05-034-48/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Merge Menu::Start() into its ctor."android-build-prod (mdb)2018-05-034-48/+29
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Merge Menu::Start() into its ctor."android-build-prod (mdb)2018-05-034-48/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Merge Menu::Start() into its ctor.Tao Bao2018-05-034-48/+29
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add streaming to PayloadSpec" am: 3a79b36377 am: 98837bdcd1Zhomart Mukhamejanov2018-05-039-26/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add streaming to PayloadSpec" am: 3a79b36377Zhomart Mukhamejanov2018-05-039-26/+56
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add streaming to PayloadSpec"Zhomart Mukhamejanov2018-05-039-26/+56
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Add streaming to PayloadSpec"Zhomart Mukhamejanov2018-05-039-26/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Add streaming to PayloadSpecZhomart Mukhamejanov2018-05-029-26/+56
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ce am: a9d78d45d6android-build-prod (mdb)2018-05-035-49/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ceandroid-build-prod (mdb)2018-05-035-49/+62
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Use std::string in DrawTextLine() and siblings."android-build-prod (mdb)2018-05-035-49/+62
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Use std::string in DrawTextLine() and siblings."android-build-prod (mdb)2018-05-035-49/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Use std::string in DrawTextLine() and siblings.Tao Bao2018-05-035-49/+62
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8 am: 30f2775b37Tao Bao2018-05-035-11/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8Tao Bao2018-05-025-11/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Drop the dependency on common.h."Tao Bao2018-05-025-11/+14
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Drop the dependency on common.h."Tao Bao2018-05-025-11/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Drop the dependency on common.h.Tao Bao2018-05-025-11/+14
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513 am: a2f44ebd09Tao Bao2018-05-016-83/+102
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513Tao Bao2018-05-016-83/+102
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add ScreenRecoveryUI::ShowMenu()."Tao Bao2018-05-016-83/+102
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add ScreenRecoveryUI::ShowMenu()."Tao Bao2018-05-016-83/+102
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ScreenRecoveryUI::ShowMenu().Tao Bao2018-05-016-83/+102
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add FileDownloader" am: 5c119482b3 am: 013098f6d2Zhomart Mukhamejanov2018-05-012-0/+173
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add FileDownloader" am: 5c119482b3Zhomart Mukhamejanov2018-05-012-0/+173
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add FileDownloader"Zhomart Mukhamejanov2018-05-012-0/+173
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: add FileDownloader"Zhomart Mukhamejanov2018-05-012-0/+173
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: add FileDownloaderZhomart Mukhamejanov2018-05-012-0/+173
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Improve UpdateConfig" am: af5958818a am: 0b54d77832Zhomart Mukhamejanov2018-05-019-47/+140
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Improve UpdateConfig" am: af5958818aZhomart Mukhamejanov2018-05-019-47/+140
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Improve UpdateConfig"Zhomart Mukhamejanov2018-05-019-47/+140
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Improve UpdateConfig"Zhomart Mukhamejanov2018-05-019-47/+140
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Improve UpdateConfigZhomart Mukhamejanov2018-05-019-47/+140
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073 am: 17f6c1b041 -s oursTao Bao2018-05-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073Tao Bao2018-05-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Split main() into recovery_main.cpp."Tao Bao2018-05-015-135/+192
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Split main() into recovery_main.cpp."Tao Bao2018-05-015-135/+192
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / recovery: Split main() into recovery_main.cpp.Tao Bao2018-05-015-135/+192
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Split main() into recovery_main.cpp.Tao Bao2018-05-015-134/+191
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Split main() into recovery_main.cpp.Tao Bao2018-05-015-134/+191
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142 am: 7e61191258Tao Bao2018-05-012-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142Tao Bao2018-05-012-1/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop '#include "ui.h"' from device.h."Tao Bao2018-05-012-1/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop '#include "ui.h"' from device.h."Tao Bao2018-05-012-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop '#include "ui.h"' from device.h.Tao Bao2018-05-012-1/+4
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I78839ed4,I75ac0e26 am: e4d65b681a am: 040674586bTao Bao2018-04-301-61/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I78839ed4,I75ac0e26 am: e4d65b681aTao Bao2018-04-301-61/+56
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I78839ed4,I75ac0e26Tao Bao2018-04-301-61/+56
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I78839ed4,I75ac0e26Tao Bao2018-04-301-61/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Move a few constants closer to their uses.Tao Bao2018-04-301-53/+48
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Fix the return value when failing to convert to FBE.Tao Bao2018-04-301-8/+8
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge libmounts into libotautil." am: 686353215f am: cddf5dbf67android-build-prod (mdb)2018-04-289-61/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge libmounts into libotautil." am: 686353215fandroid-build-prod (mdb)2018-04-289-61/+46
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge libmounts into libotautil."android-build-prod (mdb)2018-04-289-61/+46
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge libmounts into libotautil."android-build-prod (mdb)2018-04-289-61/+46
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge libmounts into libotautil.Tao Bao2018-04-289-61/+46
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Revoke (most of) short options." am: 3de3756081 am: 29c9690864Tao Bao2018-04-281-55/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Revoke (most of) short options." am: 3de3756081Tao Bao2018-04-281-55/+46
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Revoke (most of) short options."Tao Bao2018-04-281-55/+46
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Revoke (most of) short options."Tao Bao2018-04-281-55/+46
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Revoke (most of) short options.Tao Bao2018-04-271-55/+46
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Save the target file when applypatch tests fail" am: 957c1abfba am: 7ad3e673baTianjie Xu2018-04-272-14/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Save the target file when applypatch tests fail" am: 957c1abfbaTianjie Xu2018-04-272-14/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Save the target file when applypatch tests fail"Tianjie Xu2018-04-272-14/+18
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Save the target file when applypatch tests fail"Tianjie Xu2018-04-272-14/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save the target file when applypatch tests failTianjie Xu2018-04-272-14/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c am: 811baa37d3Zhomart Mukhamejanov2018-04-274-27/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1cZhomart Mukhamejanov2018-04-274-27/+89
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix gen_update_config.py"Zhomart Mukhamejanov2018-04-274-27/+89
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: fix gen_update_config.py"Zhomart Mukhamejanov2018-04-274-27/+89
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: fix gen_update_config.pyZhomart Mukhamejanov2018-04-274-27/+89
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964 am: b73e921a27 -s oursandroid-build-prod (mdb)2018-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964android-build-prod (mdb)2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Print the actually required battery level."android-build-prod (mdb)2018-04-271-60/+62
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Print the actually required battery level."android-build-prod (mdb)2018-04-271-60/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Print the actually required battery level.Tao Bao2018-04-271-60/+62
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Print the actually required battery level." into pi-dev-plus-aospTao Bao2018-04-271-15/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Print the actually required battery level." into pi-dev-plus-aospTao Bao2018-04-271-15/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Print the actually required battery level.Tao Bao2018-04-271-15/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Mark ui_print with __printflike." am: 220b531e3d am: a742fb0994 -s oursTao Bao2018-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Mark ui_print with __printflike." am: 220b531e3dTao Bao2018-04-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark ui_print with __printflike."Tao Bao2018-04-272-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark ui_print with __printflike."Tao Bao2018-04-272-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark ui_print with __printflike.Tao Bao2018-04-262-2/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark ui_print with __printflike." into pi-dev-plus-aospTao Bao2018-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark ui_print with __printflike." into pi-dev-plus-aospTao Bao2018-04-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark ui_print with __printflike.Tao Bao2018-04-261-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Mark ui_print with __printflike."TreeHugger Robot2018-04-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark ui_print with __printflike.Tao Bao2018-04-261-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: create tools/gen_update_config.py" am: 6bd1d9b8d9 am: 9882160d8dZhomart Mukhamejanov2018-04-263-8/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: create tools/gen_update_config.py" am: 6bd1d9b8d9Zhomart Mukhamejanov2018-04-263-8/+189
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: create tools/gen_update_config.py"Zhomart Mukhamejanov2018-04-263-8/+189
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: create tools/gen_update_config.py"Zhomart Mukhamejanov2018-04-263-8/+189
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sample_updater: create tools/gen_update_config.pyZhomart Mukhamejanov2018-04-263-8/+189
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: add tests resources" am: 7d064166ce am: 6131d00348Zhomart Mukhamejanov2018-04-263-0/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: add tests resources" am: 7d064166ceZhomart Mukhamejanov2018-04-263-0/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: add tests resources"Zhomart Mukhamejanov2018-04-263-0/+49
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: add tests resources"Zhomart Mukhamejanov2018-04-263-0/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sample_updater: add tests resourcesZhomart Mukhamejanov2018-04-263-0/+49
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dump the uncompressed data's SHA1 to debug flaky tests" am: cc8587b508 am: 247821648fTianjie Xu2018-04-262-3/+75
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dump the uncompressed data's SHA1 to debug flaky tests" am: cc8587b508Tianjie Xu2018-04-262-3/+75
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dump the uncompressed data's SHA1 to debug flaky tests"Tianjie Xu2018-04-262-3/+75
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dump the uncompressed data's SHA1 to debug flaky tests"Tianjie Xu2018-04-262-3/+75
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump the uncompressed data's SHA1 to debug flaky testsTianjie Xu2018-04-262-3/+75
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename CacheLocation to Paths." am: 49c7f1cec3 am: ce562bacfdandroid-build-prod (mdb)2018-04-2616-213/+230
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename CacheLocation to Paths." am: 49c7f1cec3android-build-prod (mdb)2018-04-2616-213/+230
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename CacheLocation to Paths."android-build-prod (mdb)2018-04-2616-213/+230
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename CacheLocation to Paths."android-build-prod (mdb)2018-04-2616-213/+230
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename CacheLocation to Paths.Tao Bao2018-04-2616-213/+230
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Use stubs libs for android.test.base / runner." am: d97b643de4 am: 23d17302b1Zhomart Mukhamejanov2018-04-261-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Use stubs libs for android.test.base / runner." am: d97b643de4Zhomart Mukhamejanov2018-04-261-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Use stubs libs for android.test.base / runner."Zhomart Mukhamejanov2018-04-261-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater_sample: Use stubs libs for android.test.base / runner."Zhomart Mukhamejanov2018-04-261-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater_sample: Use stubs libs for android.test.base / runner.Tao Bao2018-04-261-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename the dir for SystemUpdaterSample." am: a544bfab2b am: 4b52553cbbandroid-build-prod (mdb)2018-04-2627-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename the dir for SystemUpdaterSample." am: a544bfab2bandroid-build-prod (mdb)2018-04-2627-5/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename the dir for SystemUpdaterSample."android-build-prod (mdb)2018-04-2627-5/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename the dir for SystemUpdaterSample."android-build-prod (mdb)2018-04-2627-5/+5
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the dir for SystemUpdaterSample.Tao Bao2018-04-2627-5/+5
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: add non-streaming demo" am: 4816fc1c46 am: a399c289bbZhomart Mukhamejanov2018-04-2526-97/+1723
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: add non-streaming demo" am: 4816fc1c46Zhomart Mukhamejanov2018-04-2526-97/+1723
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: add non-streaming demo"Zhomart Mukhamejanov2018-04-2526-97/+1723
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "sample_updater: add non-streaming demo"Zhomart Mukhamejanov2018-04-2526-97/+1723
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sample_updater: add non-streaming demoZhomart Mukhamejanov2018-04-2526-97/+1723
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Wipe the metadata partition when we wipe data. am: 723056a83f -s oursPaul Crowley2018-04-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Wipe the metadata partition when we wipe data.Paul Crowley2018-04-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wipe the metadata partition when we wipe data.Paul Crowley2018-04-251-5/+14
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove an unneeded strdup()." am: ab3c24bd51 am: 76f0edc05eandroid-build-prod (mdb)2018-04-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove an unneeded strdup()." am: ab3c24bd51android-build-prod (mdb)2018-04-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove an unneeded strdup()."android-build-prod (mdb)2018-04-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Remove an unneeded strdup()."android-build-prod (mdb)2018-04-251-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updater: Remove an unneeded strdup().Tao Bao2018-04-251-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2 am: 62fd21b9bbPaul Crowley2018-04-251-5/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2Paul Crowley2018-04-251-5/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Wipe the metadata partition when we wipe data."Paul Crowley2018-04-251-5/+14
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Wipe the metadata partition when we wipe data."Treehugger Robot2018-04-251-5/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wipe the metadata partition when we wipe data.Paul Crowley2018-04-251-5/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dump debug information for apply_patch unit tests" am: fe527cced4 am: 943c2057adTianjie Xu2018-04-243-1/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dump debug information for apply_patch unit tests" am: fe527cced4Tianjie Xu2018-04-243-1/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dump debug information for apply_patch unit tests"Tianjie Xu2018-04-243-1/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Dump debug information for apply_patch unit tests"Tianjie Xu2018-04-243-1/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump debug information for apply_patch unit testsTianjie Xu2018-04-243-1/+22
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Move to Soong." am: ed022fccdf am: 9bc286dd71Tao Bao2018-04-243-70/+83
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Move to Soong." am: ed022fccdfTao Bao2018-04-243-70/+83
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Move to Soong."Tao Bao2018-04-243-70/+83
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Move to Soong."Tao Bao2018-04-243-70/+83
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Move to Soong.Tao Bao2018-04-203-70/+83
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make update_verifier generic across verified boot versions." am: ea63f59469 am: abcac8e1e7Tao Bao2018-04-244-48/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make update_verifier generic across verified boot versions." am: ea63f59469Tao Bao2018-04-244-48/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make update_verifier generic across verified boot versions."Tao Bao2018-04-244-48/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make update_verifier generic across verified boot versions."Tao Bao2018-04-244-48/+22
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make update_verifier generic across verified boot versions.Tao Bao2018-04-204-48/+22
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239c am: 4cf3bc1875Tao Bao2018-04-205-37/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239cTao Bao2018-04-205-37/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch."Tao Bao2018-04-205-37/+24
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch."Treehugger Robot2018-04-205-37/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch.Tao Bao2018-04-205-37/+24
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Dump patch info on mismatching patching result." am: d2c32b281b am: ea70fd7d1dTao Bao2018-04-202-1/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Dump patch info on mismatching patching result." am: d2c32b281bTao Bao2018-04-192-1/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Dump patch info on mismatching patching result."Tao Bao2018-04-192-1/+21
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Dump patch info on mismatching patching result."Tao Bao2018-04-192-1/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Dump patch info on mismatching patching result.Tao Bao2018-04-192-1/+21
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777 am: 11e31203a6Zhomart Mukhamejanov2018-04-181-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777Zhomart Mukhamejanov2018-04-181-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add sample_updater style check to PREUPLOAD.cfg"Zhomart Mukhamejanov2018-04-181-0/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add sample_updater style check to PREUPLOAD.cfg"Zhomart Mukhamejanov2018-04-181-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sample_updater style check to PREUPLOAD.cfgZhomart Mukhamejanov2018-04-181-0/+5
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Move ResourcesTest into component test." am: 07d0032def am: 9adbc572a3Tao Bao2018-04-173-101/+126
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Move ResourcesTest into component test." am: 07d0032defTao Bao2018-04-173-101/+126
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Move ResourcesTest into component test."Tao Bao2018-04-173-101/+126
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Move ResourcesTest into component test."Treehugger Robot2018-04-173-101/+126
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Move ResourcesTest into component test.Tao Bao2018-04-163-101/+126
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable lld where it fails." am: 0c8eea86f9 am: dd2277a9bdChih-Hung Hsieh2018-04-161-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable lld where it fails." am: 0c8eea86f9Chih-Hung Hsieh2018-04-161-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable lld where it fails."Chih-Hung Hsieh2018-04-161-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable lld where it fails."Treehugger Robot2018-04-161-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable lld where it fails.Chih-Hung Hsieh2018-04-161-0/+4
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Expose PngHandler via resources.h." am: 3c8fdf3274 am: c41aba80b7Tao Bao2018-04-153-153/+152
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Expose PngHandler via resources.h." am: 3c8fdf3274Tao Bao2018-04-153-153/+152
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Expose PngHandler via resources.h."Tao Bao2018-04-153-153/+152
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Expose PngHandler via resources.h."Treehugger Robot2018-04-143-153/+152
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose PngHandler via resources.h.Tao Bao2018-04-143-153/+152
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: track signature change of service_to_fd." am: 5ac8cfe1ed am: 959f010f7bJosh Gao2018-04-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: track signature change of service_to_fd." am: 5ac8cfe1edJosh Gao2018-04-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: track signature change of service_to_fd."Josh Gao2018-04-151-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: track signature change of service_to_fd."Treehugger Robot2018-04-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minadbd: track signature change of service_to_fd.Josh Gao2018-04-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: track signature change of service_to_fd." into pi-dev am: eacb9c0697Josh Gao2018-04-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: track signature change of service_to_fd." into pi-devJosh Gao2018-04-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: track signature change of service_to_fd." into pi-devTreeHugger Robot2018-04-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minadbd: track signature change of service_to_fd.Josh Gao2018-04-141-1/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the old log files if cache space is insufficient for OTA" am: 0b3e25719d am: 8982db6ae1Tianjie Xu2018-04-136-60/+271
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the old log files if cache space is insufficient for OTA" am: 0b3e25719dTianjie Xu2018-04-136-60/+271
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the old log files if cache space is insufficient for OTA"Tianjie Xu2018-04-136-60/+271
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the old log files if cache space is insufficient for OTA"Tianjie Xu2018-04-136-60/+271
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the old log files if cache space is insufficient for OTATianjie Xu2018-04-136-60/+271
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: enable fsverity feature bit" into pi-dev am: 257dd337daJaegeuk Kim2018-04-112-6/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: enable fsverity feature bit" into pi-devJaegeuk Kim2018-04-112-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: enable fsverity feature bit" into pi-devTreeHugger Robot2018-04-112-6/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: enable fsverity feature bitJaegeuk Kim2018-04-062-6/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the non-LTO, non-PGO version of libhwbinder am: 2ca4a403e7Pirama Arumuga Nainar2018-04-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the non-LTO, non-PGO version of libhwbinderPirama Arumuga Nainar2018-04-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the non-LTO, non-PGO version of libhwbinderPirama Arumuga Nainar2018-04-091-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use non-LTO variant of libhwbinder" into pi-dev am: 7fdb6355e4Yi Kong2018-04-061-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use non-LTO variant of libhwbinder" into pi-devYi Kong2018-04-061-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use non-LTO variant of libhwbinder" into pi-devTreeHugger Robot2018-04-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use non-LTO variant of libhwbinderYi Kong2018-04-031-1/+1
| | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install: mkfs.f2fs: specify sector size for target image size am: 1224544806Jaegeuk Kim2018-04-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install: mkfs.f2fs: specify sector size for target image sizeJaegeuk Kim2018-04-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install: mkfs.f2fs: specify sector size for target image sizeJaegeuk Kim2018-04-051-0/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "install: mkfs.f2fs: specify sector size for target image size" am: ea8a6a9af2 am: 70ac7ea78fJaegeuk Kim2018-04-051-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "install: mkfs.f2fs: specify sector size for target image size" am: ea8a6a9af2Jaegeuk Kim2018-04-051-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "install: mkfs.f2fs: specify sector size for target image size"Jaegeuk Kim2018-04-051-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "install: mkfs.f2fs: specify sector size for target image size"Treehugger Robot2018-04-051-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install: mkfs.f2fs: specify sector size for target image sizeJaegeuk Kim2018-04-051-0/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] f2fs: support f2fs by setting unmovable bit for package file am: 848f227eea -s oursJaegeuk Kim2018-04-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] f2fs: support f2fs by setting unmovable bit for package fileJaegeuk Kim2018-04-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2fs: support f2fs by setting unmovable bit for package fileJaegeuk Kim2018-04-051-4/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] mkfs.f2fs: specify sector size for target image size am: 4358262b75 -s oursJaegeuk Kim2018-04-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] mkfs.f2fs: specify sector size for target image sizeJaegeuk Kim2018-04-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mkfs.f2fs: specify sector size for target image sizeJaegeuk Kim2018-04-041-5/+20
| | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319 am: fc0f970c93Jaegeuk Kim2018-04-041-5/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319Jaegeuk Kim2018-04-041-5/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "mkfs.f2fs: specify sector size for target image size"Jaegeuk Kim2018-04-041-5/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "mkfs.f2fs: specify sector size for target image size"Treehugger Robot2018-04-041-5/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mkfs.f2fs: specify sector size for target image sizeJaegeuk Kim2018-04-041-5/+20
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28 am: 8028dc1ce4Tao Bao2018-04-034-62/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28Tao Bao2018-04-034-62/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Pick up testdata with LOCAL_TEST_DATA."Tao Bao2018-04-034-62/+25
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Pick up testdata with LOCAL_TEST_DATA."Treehugger Robot2018-04-034-62/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Pick up testdata with LOCAL_TEST_DATA.Tao Bao2018-04-024-62/+25
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not skip the update installation if it's a retry" am: e566168c94 am: 2e0ac38d40Tianjie Xu2018-04-031-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not skip the update installation if it's a retry" am: e566168c94Tianjie Xu2018-04-031-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not skip the update installation if it's a retry"Tianjie Xu2018-04-031-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not skip the update installation if it's a retry"Tianjie Xu2018-04-031-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not skip the update installation if it's a retryTianjie Xu2018-04-021-2/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create the SystemUpdate activity class." am: c506482abc am: c974a1f404Jiachen Zhao2018-04-024-4/+104
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create the SystemUpdate activity class." am: c506482abcJiachen Zhao2018-04-024-4/+104
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create the SystemUpdate activity class."Jiachen Zhao2018-04-024-4/+104
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create the SystemUpdate activity class."Jiachen Zhao2018-04-024-4/+104
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the SystemUpdate activity class.Jiachen Zhao2018-04-014-4/+104
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move a few modules to Soong." am: d408a865af am: 47be7bcdbaTao Bao2018-04-022-83/+145
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move a few modules to Soong." am: d408a865afTao Bao2018-04-022-83/+145
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move a few modules to Soong."Tao Bao2018-04-022-83/+145
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move a few modules to Soong."Treehugger Robot2018-04-022-83/+145
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move a few modules to Soong.Tao Bao2018-03-272-83/+145
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create folder for SystemUpdate sample app." am: f0e2811092 am: c6152041fdJiachen Zhao2018-03-314-0/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create folder for SystemUpdate sample app." am: f0e2811092Jiachen Zhao2018-03-314-0/+48
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create folder for SystemUpdate sample app."Jiachen Zhao2018-03-314-0/+48
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create folder for SystemUpdate sample app."Jiachen Zhao2018-03-314-0/+48
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create folder for SystemUpdate sample app.Jiachen Zhao2018-03-314-0/+48
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete mkfont.c and font_10x18.h" am: 8b9faa0008 am: dea56f6531Tianjie Xu2018-03-303-300/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete mkfont.c and font_10x18.h" am: 8b9faa0008Tianjie Xu2018-03-303-300/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete mkfont.c and font_10x18.h"Tianjie Xu2018-03-303-300/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete mkfont.c and font_10x18.h"Tianjie Xu2018-03-303-300/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the obsolete mkfont.c and font_10x18.hTianjie Xu2018-03-303-300/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189 am: 1da2937623 -s oursTao Bao2018-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189Tao Bao2018-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Specify a default module for TARGET_RECOVERY_UI_LIB."Tao Bao2018-03-271-12/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Specify a default module for TARGET_RECOVERY_UI_LIB."Treehugger Robot2018-03-271-12/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify a default module for TARGET_RECOVERY_UI_LIB.Tao Bao2018-03-271-12/+20
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify a default module for TARGET_RECOVERY_UI_LIB.Tao Bao2018-03-271-11/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify a default module for TARGET_RECOVERY_UI_LIB.Tao Bao2018-03-271-11/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65 am: baf619c21c -s oursTianjie Xu2018-03-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65Tianjie Xu2018-03-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Factor out a menu class for screen ui"Tianjie Xu2018-03-247-185/+472
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Factor out a menu class for screen ui"Tianjie Xu2018-03-247-185/+472
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out a menu class for screen uiTianjie Xu2018-03-247-185/+472
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out a menu class for screen uiTianjie Xu2018-03-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out a menu class for screen uiTianjie Xu2018-03-247-184/+471
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Support verifying product partition." am: ab8d782bd4 am: 7ce215d3b9Tao Bao2018-03-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Support verifying product partition." am: ab8d782bd4Tao Bao2018-03-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Support verifying product partition."Tao Bao2018-03-242-14/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Support verifying product partition."Treehugger Robot2018-03-232-14/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Support verifying product partition.Tao Bao2018-03-232-14/+11
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Factor out a menu class for screen ui"Tianjie Xu2018-03-247-184/+471
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out a menu class for screen uiTianjie Xu2018-03-237-184/+471
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Support verifying product partition. am: 454d8cb805Tao Bao2018-03-242-14/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Support verifying product partition.Tao Bao2018-03-242-14/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Support verifying product partition.Tao Bao2018-03-232-14/+11
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "f2fs: support f2fs by setting unmovable bit for package file" am: 28dcad554c am: a0e2a1aa8bJaegeuk Kim2018-03-221-4/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "f2fs: support f2fs by setting unmovable bit for package file" am: 28dcad554cJaegeuk Kim2018-03-221-4/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "f2fs: support f2fs by setting unmovable bit for package file"Jaegeuk Kim2018-03-221-4/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "f2fs: support f2fs by setting unmovable bit for package file"Jaegeuk Kim2018-03-221-4/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2fs: support f2fs by setting unmovable bit for package fileJaegeuk Kim2018-03-221-4/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test. am: d26f95287a -s oursTao Bao2018-03-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test.Tao Bao2018-03-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test.Tao Bao2018-03-201-0/+51
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." am: e0b05ba553 am: 40bfff9159Tao Bao2018-03-201-45/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." am: e0b05ba553Tao Bao2018-03-201-45/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget."Tao Bao2018-03-201-45/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget."Treehugger Robot2018-03-201-45/+74
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Split ApplyPatchModesTest.PatchModeEmmcTarget.Tao Bao2018-03-201-45/+74
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: add libhidl-gen-utils depedency am: 91b48f9161 -s oursYifan Hong2018-03-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: add libhidl-gen-utils depedencyYifan Hong2018-03-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: add libhidl-gen-utils depedencyYifan Hong2018-03-132-0/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." am: 3537a2659e am: 20d9c8ea5aTao Bao2018-03-131-0/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." am: 3537a2659eTao Bao2018-03-131-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test."Tao Bao2018-03-131-0/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test."Treehugger Robot2018-03-131-0/+51
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test.Tao Bao2018-03-131-0/+51
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: add libhidl-gen-utils depedency" am: fc39f3ffd7 am: da5bb13507Yifan Hong2018-03-122-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: add libhidl-gen-utils depedency" am: fc39f3ffd7Yifan Hong2018-03-122-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: add libhidl-gen-utils depedency"Yifan Hong2018-03-122-0/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: add libhidl-gen-utils depedency"Yifan Hong2018-03-122-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: add libhidl-gen-utils depedencyYifan Hong2018-03-082-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set the update locations to default in CacheLocation's constructor" am: 0acbdac82b am: 7120c687a5Tianjie Xu2018-03-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set the update locations to default in CacheLocation's constructor" am: 0acbdac82bTianjie Xu2018-03-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set the update locations to default in CacheLocation's constructor"Tianjie Xu2018-03-093-13/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set the update locations to default in CacheLocation's constructor"Tianjie Xu2018-03-093-13/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the update locations to default in CacheLocation's constructorTianjie Xu2018-03-083-13/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the update locations to default in CacheLocation's constructor am: 01daebbe68Tianjie Xu2018-03-093-13/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the update locations to default in CacheLocation's constructorTianjie Xu2018-03-093-13/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the update locations to default in CacheLocation's constructorTianjie Xu2018-03-083-13/+5
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Export fuse_sideload.h for libfusesideload." am: ddf93c0055 am: 9b0c133ff5Tao Bao2018-03-075-13/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Export fuse_sideload.h for libfusesideload." am: ddf93c0055Tao Bao2018-03-075-13/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Export fuse_sideload.h for libfusesideload."Tao Bao2018-03-075-13/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Export fuse_sideload.h for libfusesideload."Treehugger Robot2018-03-075-13/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export fuse_sideload.h for libfusesideload.Tao Bao2018-03-075-13/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop the no-op Android.bp." am: 242d41b808 am: 2d62142fffTao Bao2018-03-071-8/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop the no-op Android.bp." am: 242d41b808Tao Bao2018-03-071-8/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop the no-op Android.bp."Tao Bao2018-03-071-8/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop the no-op Android.bp."Treehugger Robot2018-03-071-8/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the no-op Android.bp.Tao Bao2018-03-071-8/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: Move to Soong." am: 56160b2b03 am: 734f76fc38Tao Bao2018-03-073-56/+78
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: Move to Soong." am: 56160b2b03Tao Bao2018-03-073-56/+78
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: Move to Soong."Tao Bao2018-03-073-56/+78
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: Move to Soong."Treehugger Robot2018-03-073-56/+78
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / minadbd: Move to Soong.Tao Bao2018-03-073-56/+78
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a singleton CacheLocation to replace the hard coded locations" am: 47cd789eed am: a72f93d6daTianjie Xu2018-03-0111-27/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a singleton CacheLocation to replace the hard coded locations" am: 47cd789eedTianjie Xu2018-03-0111-27/+139
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a singleton CacheLocation to replace the hard coded locations"Tianjie Xu2018-03-0111-27/+139
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a singleton CacheLocation to replace the hard coded locations"Tianjie Xu2018-03-0111-27/+139
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a singleton CacheLocation to replace the hard coded locationsTianjie Xu2018-02-2811-27/+139
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "Fix the behavior of undefined commands in BlockImageVerify" am: ac4818d6af am: 7b9a92c1e2Tianjie Xu2018-02-281-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the behavior of undefined commands in BlockImageVerify" am: ac4818d6afTianjie Xu2018-02-281-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the behavior of undefined commands in BlockImageVerify"Tianjie Xu2018-02-281-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the behavior of undefined commands in BlockImageVerify"Tianjie Xu2018-02-281-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the behavior of undefined commands in BlockImageVerifyTianjie Xu2018-02-281-2/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the assumption of target chunk size in imgdiff" am: cc3446a7f7 am: a306d7bc55Tianjie Xu2018-02-233-20/+131
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the assumption of target chunk size in imgdiff" am: cc3446a7f7Tianjie Xu2018-02-233-20/+131
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the assumption of target chunk size in imgdiff"Tianjie Xu2018-02-233-20/+131
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the assumption of target chunk size in imgdiff"Treehugger Robot2018-02-233-20/+131
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the assumption of target chunk size in imgdiffTianjie Xu2018-02-233-20/+131
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Replace vfork() with fork()." am: 21b381622d am: 44f2cb2d67George Burgess IV2018-02-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Replace vfork() with fork()." am: 21b381622dGeorge Burgess IV2018-02-231-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Replace vfork() with fork()."George Burgess IV2018-02-231-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Replace vfork() with fork()."Treehugger Robot2018-02-231-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace vfork() with fork().George Burgess IV2018-02-231-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-02-222-0/+18
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set LOCAL_SDK_VERSION where possible." am: bf52b7e00b am: cd06b1696dhansson2018-02-211-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set LOCAL_SDK_VERSION where possible." am: bf52b7e00bhansson2018-02-211-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set LOCAL_SDK_VERSION where possible."hansson2018-02-211-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set LOCAL_SDK_VERSION where possible."hansson2018-02-211-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set LOCAL_SDK_VERSION where possible.Anton Hansson2018-02-211-0/+1
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "Disable building libapplypatch on mac" am: c1e1d7e711 am: 2754916f01Tianjie Xu2018-02-182-0/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable building libapplypatch on mac" am: c1e1d7e711Tianjie Xu2018-02-182-0/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable building libapplypatch on mac"Tianjie Xu2018-02-182-0/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Disable building libapplypatch on mac"Treehugger Robot2018-02-182-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable building libapplypatch on macTianjie Xu2018-02-182-0/+12
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Skip the cache size check on host" am: 31bcd7c002 am: fb8496e3aaTianjie Xu2018-02-174-3/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Skip the cache size check on host" am: 31bcd7c002Tianjie Xu2018-02-174-3/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Skip the cache size check on host"Tianjie Xu2018-02-174-3/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Skip the cache size check on host"Tianjie Xu2018-02-174-3/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip the cache size check on hostTianjie Xu2018-02-134-3/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Porting screensave mode for new platform." am: 15e376d792 am: 470b4fef7fTao Bao2018-02-162-6/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Porting screensave mode for new platform." am: 15e376d792Tao Bao2018-02-162-6/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Porting screensave mode for new platform."Tao Bao2018-02-162-6/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Porting screensave mode for new platform."Tao Bao2018-02-162-6/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: Porting screensave mode for new platform.katao2017-12-142-6/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reorder the functions in updater/install.cpp" am: 9818283da7 am: 576d2754eeTianjie Xu2018-02-131-239/+244
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reorder the functions in updater/install.cpp" am: 9818283da7Tianjie Xu2018-02-131-239/+244
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reorder the functions in updater/install.cpp"Tianjie Xu2018-02-131-239/+244
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Reorder the functions in updater/install.cpp"Tianjie Xu2018-02-131-239/+244
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder the functions in updater/install.cppTianjie Xu2018-02-121-239/+244
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Log the last command to cache" am: 6a3646fc03 am: 6d78bb5236Tianjie Xu2018-02-083-9/+392
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Log the last command to cache" am: 6a3646fc03Tianjie Xu2018-02-083-9/+392
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Log the last command to cache"Tianjie Xu2018-02-083-9/+392
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Log the last command to cache"Tianjie Xu2018-02-083-9/+392
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log the last command to cacheTianjie Xu2018-02-073-9/+392
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Document instructions for using adb under recovery." am: 7ee7e27400 am: 41186e13b7Tao Bao2018-02-081-0/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Document instructions for using adb under recovery." am: 7ee7e27400Tao Bao2018-02-081-0/+91
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Document instructions for using adb under recovery."Tao Bao2018-02-081-0/+91
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Document instructions for using adb under recovery."Treehugger Robot2018-02-081-0/+91
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document instructions for using adb under recovery.Tao Bao2018-02-081-0/+91
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "Avoid overwrite of the error message in AbortFn" am: bded087f7d am: 20af3722d8Tianjie Xu2018-01-303-23/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Avoid overwrite of the error message in AbortFn" am: bded087f7dTianjie Xu2018-01-303-23/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Avoid overwrite of the error message in AbortFn"Tianjie Xu2018-01-303-23/+26
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Avoid overwrite of the error message in AbortFn"Tianjie Xu2018-01-303-23/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid overwrite of the error message in AbortFnTianjie Xu2018-01-293-23/+26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_channel field to bootloader_message_ab." am: 63eb1a4444 am: 7441ee7affSen Jiang2018-01-261-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_channel field to bootloader_message_ab." am: 63eb1a4444Sen Jiang2018-01-261-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_channel field to bootloader_message_ab."Sen Jiang2018-01-261-1/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_channel field to bootloader_message_ab."Sen Jiang2018-01-261-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add update_channel field to bootloader_message_ab.Sen Jiang2018-01-231-1/+5
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Statically link with libhealthstoragedefaultHridya Valsaraju2018-01-121-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "StartsWith allows a std::string prefix now." am: 80ccac2fff am: bd870377b4Elliott Hughes2017-12-212-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "StartsWith allows a std::string prefix now." am: 80ccac2fffElliott Hughes2017-12-212-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "StartsWith allows a std::string prefix now."Elliott Hughes2017-12-212-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "StartsWith allows a std::string prefix now."Treehugger Robot2017-12-212-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StartsWith allows a std::string prefix now.Elliott Hughes2017-12-202-2/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "Let update_verifier work on non-AB update devices" am: 3fe230a1e4 am: 4b7ed5a71bIsaac Chen2017-12-141-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Let update_verifier work on non-AB update devices" am: 3fe230a1e4Isaac Chen2017-12-141-0/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Let update_verifier work on non-AB update devices"Isaac Chen2017-12-141-0/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Let update_verifier work on non-AB update devices"Isaac Chen2017-12-141-0/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let update_verifier work on non-AB update devicesIsaac Chen2017-12-141-0/+9
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the 'st' field from FileContents." am: 9203e77e7d am: 710712f235Tao Bao2017-12-092-17/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the 'st' field from FileContents." am: 9203e77e7dTao Bao2017-12-092-17/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the 'st' field from FileContents."Tao Bao2017-12-092-17/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the 'st' field from FileContents."Tao Bao2017-12-092-17/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Remove the 'st' field from FileContents.Tao Bao2017-12-072-17/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "add sload.f2fs for recovery format" am: 4eaf7a157d am: 3d4359d3aeJaegeuk Kim2017-12-083-7/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "add sload.f2fs for recovery format" am: 4eaf7a157dJaegeuk Kim2017-12-083-7/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "add sload.f2fs for recovery format"Jaegeuk Kim2017-12-083-7/+23
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "add sload.f2fs for recovery format"Jaegeuk Kim2017-12-083-7/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add sload.f2fs for recovery formatJaegeuk Kim2017-12-053-7/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a /bin symlink for consistency." am: ed369101ba am: 13b751ed84Elliott Hughes2017-12-081-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a /bin symlink for consistency." am: ed369101baElliott Hughes2017-12-071-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a /bin symlink for consistency."Elliott Hughes2017-12-071-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a /bin symlink for consistency."Elliott Hughes2017-12-071-0/+1
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a /bin symlink for consistency.Elliott Hughes2017-12-061-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Detect interrupted update due to power off" am: d8fadfb606 am: d9caba2bbeTianjie Xu2017-12-012-269/+302
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Detect interrupted update due to power off" am: d8fadfb606Tianjie Xu2017-12-012-269/+302
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Detect interrupted update due to power off"Tianjie Xu2017-12-012-269/+302
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Detect interrupted update due to power off"Treehugger Robot2017-12-012-269/+302
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect interrupted update due to power offTianjie Xu2017-12-012-269/+302
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "is_battery_ok use health 2.0 HAL"Yifan Hong2017-11-202-53/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is_battery_ok use health 2.0 HALYifan Hong2017-11-142-53/+84
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c am: 25e27f48dbJin Qian2017-11-201-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355cJin Qian2017-11-201-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "root: Fix an issue when volume length from fs_mgr is negative."Jin Qian2017-11-201-4/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "root: Fix an issue when volume length from fs_mgr is negative."Treehugger Robot2017-11-201-4/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root: Fix an issue when volume length from fs_mgr is negative.Jin Qian2017-11-191-4/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922 am: 086202e30dTianjie Xu2017-11-171-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922Tianjie Xu2017-11-171-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libbrotli as a dependency when building applypatch binary"Tianjie Xu2017-11-171-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libbrotli as a dependency when building applypatch binary"Tianjie Xu2017-11-171-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add libbrotli as a dependency when building applypatch binaryTianjie Xu2017-11-031-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch imgdiff to libbase logging" am: fd9c25e636 am: 47c8c290ecTianjie Xu2017-11-172-97/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch imgdiff to libbase logging" am: fd9c25e636Tianjie Xu2017-11-172-97/+109
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch imgdiff to libbase logging"Tianjie Xu2017-11-172-97/+109
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch imgdiff to libbase logging"Tianjie Xu2017-11-172-97/+109
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch imgdiff to libbase loggingTianjie Xu2017-11-162-97/+109
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 am: 345f350540Tao Bao2017-11-161-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: Remove two warning options." am: 7bd61f0cc0Tao Bao2017-11-161-3/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: Remove two warning options."Tao Bao2017-11-161-3/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "minadbd: Remove two warning options."Tao Bao2017-11-151-3/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minadbd: Remove two warning options.Tao Bao2017-11-151-3/+1
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd am: c418bfeae2Jaegeuk Kim2017-11-142-5/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fddJaegeuk Kim2017-11-142-5/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: format f2fs with encrypt/quota"Jaegeuk Kim2017-11-142-5/+13
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: format f2fs with encrypt/quota"Treehugger Robot2017-11-142-5/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: format f2fs with encrypt/quotaJaegeuk Kim2017-11-132-5/+13
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03 am: e2296b7a25Tao Bao2017-11-115-47/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03Tao Bao2017-11-115-47/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch."Tao Bao2017-11-115-47/+49
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch."Tao Bao2017-11-115-47/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch.Tao Bao2017-11-105-47/+49
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Include bspatch.h from bsdiff/" am: 29cd3215ec am: e73bca40dcAlex Deymo2017-11-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Include bspatch.h from bsdiff/" am: 29cd3215ecAlex Deymo2017-11-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Include bspatch.h from bsdiff/"Alex Deymo2017-11-101-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Include bspatch.h from bsdiff/"Alex Deymo2017-11-101-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include bspatch.h from bsdiff/Alex Deymo2017-11-081-1/+1
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: Move to Soong." am: 992bccfef4 am: e6250057b8Tao Bao2017-11-104-32/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: Move to Soong." am: 992bccfef4Tao Bao2017-11-104-32/+40
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: Move to Soong."Tao Bao2017-11-104-32/+40
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "uncrypt: Move to Soong."Tao Bao2017-11-104-32/+40
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncrypt: Move to Soong.Tao Bao2017-11-094-32/+40
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "Load-balancing update_verifier worker threads." am: f1e70b93f1 am: 1d8cb3659aTao Bao2017-11-095-27/+154
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Load-balancing update_verifier worker threads." am: f1e70b93f1Tao Bao2017-11-095-27/+154
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Load-balancing update_verifier worker threads."Tao Bao2017-11-095-27/+154
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Load-balancing update_verifier worker threads."Treehugger Robot2017-11-095-27/+154
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load-balancing update_verifier worker threads.Tao Bao2017-11-095-27/+154
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "otautil: Remove the aborts in RangeSet::Parse()." am: 16b8b8fd1c am: 236a7261cbTao Bao2017-11-084-55/+170
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Remove the aborts in RangeSet::Parse()." am: 16b8b8fd1cTao Bao2017-11-084-55/+170
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Remove the aborts in RangeSet::Parse()."Tao Bao2017-11-084-55/+170
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Remove the aborts in RangeSet::Parse()."Tao Bao2017-11-084-55/+170
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otautil: Remove the aborts in RangeSet::Parse().Tao Bao2017-11-074-55/+170
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch to bionic gtest in bootable/recovery" am: bf41f2aa23 am: c1ab2bb535Tianjie Xu2017-11-0610-275/+188
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch to bionic gtest in bootable/recovery" am: bf41f2aa23Tianjie Xu2017-11-0610-275/+188
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch to bionic gtest in bootable/recovery"Tianjie Xu2017-11-0610-275/+188
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch to bionic gtest in bootable/recovery"Tianjie Xu2017-11-0610-275/+188
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to bionic gtest in bootable/recoveryTianjie Xu2017-11-0310-275/+188
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up fuse_sideload and add a testcase." am: 73dca3e983 am: 6d61e2123bTao Bao2017-11-047-387/+409
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up fuse_sideload and add a testcase." am: 73dca3e983Tao Bao2017-11-047-387/+409
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up fuse_sideload and add a testcase."Tao Bao2017-11-047-387/+409
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up fuse_sideload and add a testcase."Tao Bao2017-11-047-387/+409
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up fuse_sideload and add a testcase.Tao Bao2017-11-047-387/+409
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: remove make_ext4fs from updater" am: 3f06512714 am: 59b20d6565Jin Qian2017-11-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: remove make_ext4fs from updater" am: 3f06512714Jin Qian2017-11-041-9/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: remove make_ext4fs from updater"Jin Qian2017-11-041-9/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: remove make_ext4fs from updater"Treehugger Robot2017-11-041-9/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: remove make_ext4fs from updaterJin Qian2017-11-031-9/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: fix library dependency" am: 0da645fefa am: 4d079261e5Jin Qian2017-11-031-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: fix library dependency" am: 0da645fefaJin Qian2017-11-031-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: fix library dependency"Jin Qian2017-11-031-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: fix library dependency"Treehugger Robot2017-11-031-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: fix library dependencyJin Qian2017-11-031-2/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Clean up the files in TemporaryDir." am: 2cf44d08cf am: fc8066feedTao Bao2017-11-031-5/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Clean up the files in TemporaryDir." am: 2cf44d08cfTao Bao2017-11-031-5/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Clean up the files in TemporaryDir."Tao Bao2017-11-031-5/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Clean up the files in TemporaryDir."Treehugger Robot2017-11-031-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Clean up the files in TemporaryDir.Tao Bao2017-11-021-5/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a repohook to clang-format changes." am: 439263cb83 am: f3e2017309Tao Bao2017-11-031-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a repohook to clang-format changes." am: 439263cb83Tao Bao2017-11-031-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a repohook to clang-format changes."Tao Bao2017-11-031-0/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a repohook to clang-format changes."Tao Bao2017-11-031-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a repohook to clang-format changes.Tao Bao2017-11-031-0/+6
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-master am: 04a8b2b532Xin Li2017-11-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-masterXin Li2017-11-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' fromXin Li2017-11-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "recovery: remove make_ext4fs from updater"TreeHugger Robot2017-11-021-9/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: remove make_ext4fs from updaterJin Qian2017-11-021-9/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libbrotli as a dependency for libbsdiff" am: 43f194c8bc am: 57e16e4f77Tianjie Xu2017-11-022-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libbrotli as a dependency for libbsdiff" am: 43f194c8bcTianjie Xu2017-11-022-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libbrotli as a dependency for libbsdiff"Tianjie Xu2017-11-022-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libbrotli as a dependency for libbsdiff"Tianjie Xu2017-11-022-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add libbrotli as a dependency for libbsdiffTianjie Xu2017-11-012-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Fix the wrong computation with group_range_count. am: 559a6d1d2aTao Bao2017-11-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Fix the wrong computation with group_range_count.Tao Bao2017-11-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Fix the wrong computation with group_range_count.Tao Bao2017-10-301-3/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the size mismatch in imgdiff" am: dec77a454e am: ff7c186f66Tianjie Xu2017-11-014-53/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the size mismatch in imgdiff" am: dec77a454eTianjie Xu2017-11-014-53/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the size mismatch in imgdiff"Tianjie Xu2017-11-014-53/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the size mismatch in imgdiff"Tianjie Xu2017-11-014-53/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the size mismatch in imgdiffTianjie Xu2017-11-014-53/+36
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Fix the wrong computation with group_range_count." am: 011af6e1a9 am: 78fa902920Tao Bao2017-10-301-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Fix the wrong computation with group_range_count." am: 011af6e1a9Tao Bao2017-10-301-3/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Fix the wrong computation with group_range_count."Tao Bao2017-10-301-3/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Fix the wrong computation with group_range_count."Treehugger Robot2017-10-301-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Fix the wrong computation with group_range_count.Tao Bao2017-10-291-3/+5
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "tests: Take the ownership of the FD when calling fdopen." am: 166479b259 am: 450918158dTao Bao2017-10-272-29/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Take the ownership of the FD when calling fdopen." am: 166479b259Tao Bao2017-10-272-29/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Take the ownership of the FD when calling fdopen."Tao Bao2017-10-272-29/+29
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Take the ownership of the FD when calling fdopen."Treehugger Robot2017-10-262-29/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: Take the ownership of the FD when calling fdopen.Tao Bao2017-10-262-29/+29
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix a memory leak in ApplyImagePatch()." am: 1bc0117755 am: dcc1fa1ce8Tao Bao2017-10-251-17/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix a memory leak in ApplyImagePatch()." am: 1bc0117755Tao Bao2017-10-251-17/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix a memory leak in ApplyImagePatch()."Tao Bao2017-10-251-17/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix a memory leak in ApplyImagePatch()."Treehugger Robot2017-10-241-17/+22
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Fix a memory leak in ApplyImagePatch().Tao Bao2017-10-241-17/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer." am: 3d24b7bca6 am: d8ecad7896Alex Deymo2017-10-243-8/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer." am: 3d24b7bca6Alex Deymo2017-10-243-8/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer."Alex Deymo2017-10-243-8/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer."Treehugger Robot2017-10-243-8/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer.Alex Deymo2017-10-243-8/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libdrm_platform is now libdrm" am: d830858952 am: 3b4e2ebf2cDan Willemsen2017-10-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libdrm_platform is now libdrm" am: d830858952Dan Willemsen2017-10-231-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libdrm_platform is now libdrm"Dan Willemsen2017-10-231-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libdrm_platform is now libdrm"Treehugger Robot2017-10-231-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libdrm_platform is now libdrmDan Willemsen2017-10-201-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" am: ec9ac55949 am: 0bda7a02c2 am: 988b21ec05 -s oursDan Willemsen2017-10-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" am: ec9ac55949 am: 0bda7a02c2Dan Willemsen2017-10-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" am: ec9ac55949Dan Willemsen2017-10-211-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION"Dan Willemsen2017-10-211-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION"Dan Willemsen2017-10-211-1/+1
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build libminui with BOARD_VNDK_VERSIONJiyong Park2017-10-201-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Finish the new data receiver when update fails" am: 9831ef389b am: 85fca1fc57 am: 4609778204Tianjie Xu2017-10-212-103/+174
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Finish the new data receiver when update fails" am: 9831ef389b am: 85fca1fc57Tianjie Xu2017-10-212-103/+174
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Finish the new data receiver when update fails" am: 9831ef389bTianjie Xu2017-10-202-103/+174
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Finish the new data receiver when update fails"Tianjie Xu2017-10-202-103/+174
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Finish the new data receiver when update fails"Tianjie Xu2017-10-202-103/+174
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finish the new data receiver when update failsTianjie Xu2017-10-202-103/+174
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Import translations. DO NOT MERGE am: 9bc56553dd -s ours am: 63405d5d1c -s oursBill Yi2017-10-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9bc56553dd -s oursBill Yi2017-10-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-10-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-10-204-9/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "rotate_logs: Clean up the header includes." am: 30ec005104 am: c8eba4a036 am: 41763a5dbbTao Bao2017-10-182-78/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "rotate_logs: Clean up the header includes." am: 30ec005104 am: c8eba4a036Tao Bao2017-10-182-78/+64
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "rotate_logs: Clean up the header includes." am: 30ec005104Tao Bao2017-10-182-78/+64
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "rotate_logs: Clean up the header includes."Tao Bao2017-10-182-78/+64
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "rotate_logs: Clean up the header includes."Tao Bao2017-10-182-78/+64
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotate_logs: Clean up the header includes.Tao Bao2017-10-182-78/+64
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8 am: f63dbde3ef am: 6f4f528419Tao Bao2017-10-176-151/+220
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8 am: f63dbde3efTao Bao2017-10-176-151/+220
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8Tao Bao2017-10-176-151/+220
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp."Tao Bao2017-10-176-151/+220
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp."Tao Bao2017-10-176-151/+220
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otautil: Move RangeSet implementation into rangeset.cpp.Tao Bao2017-10-166-151/+220
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix owner email address." am: b4a8c6abd9 am: 97d9ae086a am: bb971cce89Chih-hung Hsieh2017-10-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix owner email address." am: b4a8c6abd9 am: 97d9ae086aChih-hung Hsieh2017-10-121-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix owner email address." am: b4a8c6abd9Chih-hung Hsieh2017-10-121-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix owner email address."Chih-hung Hsieh2017-10-121-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix owner email address."Chih-hung Hsieh2017-10-121-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix owner email address.Chih-Hung Hsieh2017-10-121-1/+1
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to Soong." am: b058c5c481 am: 7722d8255c am: cc11f66cfdTao Bao2017-10-124-197/+196
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to Soong." am: b058c5c481 am: 7722d8255cTao Bao2017-10-124-197/+196
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to Soong." am: b058c5c481Tao Bao2017-10-124-197/+196
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to Soong."Tao Bao2017-10-124-197/+196
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Move to Soong."Tao Bao2017-10-124-197/+196
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Move to Soong.Tao Bao2017-10-124-197/+196
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff am: 92964b3b94 am: a7b8be564aTao Bao2017-10-122-39/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff am: 92964b3b94Tao Bao2017-10-122-39/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabffTao Bao2017-10-122-39/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS."Tao Bao2017-10-122-39/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS."Tao Bao2017-10-122-39/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Remove the Makefile for building imgdiff in Chrome OS.Tao Bao2017-10-122-39/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop -Wno-unused-parameter." am: a0e9742796 am: 6cadc73dea am: 44ddef71dcTao Bao2017-10-1210-49/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop -Wno-unused-parameter." am: a0e9742796 am: 6cadc73deaTao Bao2017-10-1210-49/+62
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop -Wno-unused-parameter." am: a0e9742796Tao Bao2017-10-1210-49/+62
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop -Wno-unused-parameter."Tao Bao2017-10-1210-49/+62
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop -Wno-unused-parameter."Tao Bao2017-10-1210-49/+62
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop -Wno-unused-parameter.Tao Bao2017-10-1210-49/+62
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add missing includes." am: 3c4e270123 am: b23cfd43da am: 57caa90f74Dan Albert2017-10-121-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add missing includes." am: 3c4e270123 am: b23cfd43daDan Albert2017-10-121-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add missing includes." am: 3c4e270123Dan Albert2017-10-121-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add missing includes."Dan Albert2017-10-121-0/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add missing includes."Treehugger Robot2017-10-121-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing includes.Dan Albert2017-10-111-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Add the missing #include <string>." am: 489155c44b am: 9e232f9f2a am: a27f973999Tao Bao2017-10-121-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Add the missing #include <string>." am: 489155c44b am: 9e232f9f2aTao Bao2017-10-111-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Add the missing #include <string>." am: 489155c44bTao Bao2017-10-111-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Add the missing #include <string>."Tao Bao2017-10-111-0/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Add the missing #include <string>."Tao Bao2017-10-111-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otafault: Add the missing #include <string>.Tao Bao2017-10-111-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." am: 1bf842471c am: 7861ec16a0 am: a2fb941a32Tao Bao2017-10-121-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." am: 1bf842471c am: 7861ec16a0Tao Bao2017-10-111-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." am: 1bf842471cTao Bao2017-10-111-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY."Tao Bao2017-10-111-0/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY."Tao Bao2017-10-111-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otautil: #include <errno.h> for TEMP_FAILURE_RETRY.Tao Bao2017-10-111-0/+1
| | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7e am: 491880ed2f am: e353274491Tao Bao2017-10-121-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7e am: 491880ed2fTao Bao2017-10-111-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7eTao Bao2017-10-111-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared lib for libbz."Tao Bao2017-10-111-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared lib for libbz."Tao Bao2017-10-111-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Use shared lib for libbz.Tao Bao2017-10-111-2/+2
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604 am: a3e032c549 am: 9bfdc55472Tao Bao2017-10-111-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604 am: a3e032c549Tao Bao2017-10-111-5/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604Tao Bao2017-10-111-5/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive."Tao Bao2017-10-111-5/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive."Tao Bao2017-10-111-5/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive.Tao Bao2017-10-111-6/+3
| | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2 am: 28f6938862 am: 684f239b4bTao Bao2017-10-1115-40/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2 am: 28f6938862Tao Bao2017-10-1115-40/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2Tao Bao2017-10-1115-40/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil."Tao Bao2017-10-1115-40/+42
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil."Tao Bao2017-10-1115-40/+42
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move rangeset.h and print_sha1.h into otautil.Tao Bao2017-10-1115-40/+42
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Fix mac build." am: eb8a064066 am: bc131ef1bd am: 814f05d853Tao Bao2017-10-102-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Fix mac build." am: eb8a064066 am: bc131ef1bdTao Bao2017-10-102-3/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Fix mac build." am: eb8a064066Tao Bao2017-10-102-3/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Fix mac build."Tao Bao2017-10-102-3/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Fix mac build."Tao Bao2017-10-102-3/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otautil: Fix mac build.Tao Bao2017-10-102-3/+4
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge changes from topic "libedify-header" am: abade5af15 am: 28e8a2c43a am: eaf3e895feTao Bao2017-10-1019-67/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "libedify-header" am: abade5af15 am: 28e8a2c43aTao Bao2017-10-1019-67/+64
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "libedify-header" am: abade5af15Tao Bao2017-10-1019-67/+64
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "libedify-header"Tao Bao2017-10-1019-67/+64
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "libedify-header"Tao Bao2017-10-1019-67/+64
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edify: Export the header and move to Soong.Tao Bao2017-10-099-57/+50
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Move error_code.h into otautil.""Tao Bao2017-10-0914-13/+17
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e am: b7c0ce4201 am: b53d8c6062Tao Bao2017-10-105-2/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e am: b7c0ce4201Tao Bao2017-10-095-2/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8eTao Bao2017-10-095-2/+24
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Forward declare struct Value."Tao Bao2017-10-095-2/+24
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Forward declare struct Value."Tao Bao2017-10-095-2/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applypatch: Forward declare struct Value.Tao Bao2017-10-095-2/+24
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1 am: e196918f54 am: 3bc65953abTao Bao2017-10-064-26/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1 am: e196918f54Tao Bao2017-10-064-26/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1Tao Bao2017-10-064-26/+28
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't include "error_code.h" in edify/expr.h."Tao Bao2017-10-064-26/+28
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't include "error_code.h" in edify/expr.h."Tao Bao2017-10-064-26/+28
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't include "error_code.h" in edify/expr.h.Tao Bao2017-10-054-26/+28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "vr_ui: drawing changes" am: 9a874a4e5f am: 3b3f2f5711 am: 0a5e39f180Tao Bao2017-10-064-30/+97
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "vr_ui: drawing changes" am: 9a874a4e5f am: 3b3f2f5711Tao Bao2017-10-064-30/+97
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "vr_ui: drawing changes" am: 9a874a4e5fTao Bao2017-10-064-30/+97
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "vr_ui: drawing changes"Tao Bao2017-10-064-30/+97
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "vr_ui: drawing changes"Tao Bao2017-10-064-30/+97
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vr_ui: drawing changesLuke Song2017-10-054-30/+97
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "graphics: add rotation logic" am: 9baa19012a am: 284df0abcd am: ab19506094Tao Bao2017-10-053-221/+280
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "graphics: add rotation logic" am: 9baa19012a am: 284df0abcdTao Bao2017-10-053-221/+280
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "graphics: add rotation logic" am: 9baa19012aTao Bao2017-10-053-221/+280
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "graphics: add rotation logic"Tao Bao2017-10-053-221/+280
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "graphics: add rotation logic"Tao Bao2017-10-053-221/+280
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | graphics: add rotation logicLuke Song2017-09-283-221/+280
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Move error_code.h into otautil."" am: b23d29642d am: b87edb00dc am: 4f63cc5e09Tao Bao2017-10-0512-19/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Move error_code.h into otautil."" am: b23d29642d am: b87edb00dcTao Bao2017-10-0512-19/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Move error_code.h into otautil."" am: b23d29642dTao Bao2017-10-0512-19/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Move error_code.h into otautil.""Tao Bao2017-10-0512-19/+11
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Move error_code.h into otautil.""Tao Bao2017-10-0512-19/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Move error_code.h into otautil."Tao Bao2017-10-0512-19/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move error_code.h into otautil." am: 916e155bab am: 73831e0636 am: 63876d765aTao Bao2017-10-0512-11/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move error_code.h into otautil." am: 916e155bab am: 73831e0636Tao Bao2017-10-0512-11/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move error_code.h into otautil." am: 916e155babTao Bao2017-10-0512-11/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move error_code.h into otautil."Tao Bao2017-10-0512-11/+19
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move error_code.h into otautil."Tao Bao2017-10-0512-11/+19
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move error_code.h into otautil.Tao Bao2017-10-0412-11/+19
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "edify: Remove edify_parser." am: 281d4eefb1 am: dfbe70b79d am: 159db1dd49Tao Bao2017-10-042-99/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Remove edify_parser." am: 281d4eefb1 am: dfbe70b79dTao Bao2017-10-042-99/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Remove edify_parser." am: 281d4eefb1Tao Bao2017-10-042-99/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Remove edify_parser."Tao Bao2017-10-042-99/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "edify: Remove edify_parser."Tao Bao2017-10-042-99/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edify: Remove edify_parser.Tao Bao2017-10-032-99/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Export headers." am: 2cedab7af9 am: b50d7cf9c9 am: d284e36fc6Tao Bao2017-10-048-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Export headers." am: 2cedab7af9 am: b50d7cf9c9Tao Bao2017-10-048-4/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Export headers." am: 2cedab7af9Tao Bao2017-10-048-4/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Export headers."Tao Bao2017-10-048-4/+9
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Export headers."Treehugger Robot2017-10-048-4/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otautil: Export headers.Tao Bao2017-10-038-4/+9
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "screen_ui: stage marker positioning" am: 16817312a6 am: c6e12b5f43 am: dca0a20063Luke Song2017-10-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: stage marker positioning" am: 16817312a6 am: c6e12b5f43Luke Song2017-10-041-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: stage marker positioning" am: 16817312a6Luke Song2017-10-041-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: stage marker positioning"Luke Song2017-10-041-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: stage marker positioning"Treehugger Robot2017-10-041-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: stage marker positioningLuke Song2017-09-291-1/+1
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264 am: 8b8c7eb442 am: 24801a3438Tao Bao2017-10-024-5/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264 am: 8b8c7eb442Tao Bao2017-10-024-5/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264Tao Bao2017-10-024-5/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Fix an issue with volume_for_path()."Tao Bao2017-10-024-5/+11
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Fix an issue with volume_for_path()."Tao Bao2017-10-024-5/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | roots: Fix an issue with volume_for_path().Tao Bao2017-10-024-5/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use -Werror in bootable/recovery" am: 88aa128e22 am: b5437e3e1b am: e4be0899b2Chih-Hung Hsieh2017-10-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use -Werror in bootable/recovery" am: 88aa128e22 am: b5437e3e1bChih-Hung Hsieh2017-10-021-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use -Werror in bootable/recovery" am: 88aa128e22Chih-Hung Hsieh2017-10-021-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use -Werror in bootable/recovery"Chih-Hung Hsieh2017-10-021-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use -Werror in bootable/recovery"Treehugger Robot2017-10-021-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use -Werror in bootable/recoveryChih-Hung Hsieh2017-10-021-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Remove #include "common.h"." am: e8ee697364 am: 0fa08924c6 am: 61ec157f7dTao Bao2017-10-021-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Remove #include "common.h"." am: e8ee697364 am: 0fa08924c6Tao Bao2017-10-021-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Remove #include "common.h"." am: e8ee697364Tao Bao2017-10-021-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Remove #include "common.h"."Tao Bao2017-10-021-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: Remove #include "common.h"."Tao Bao2017-10-021-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | roots: Remove #include "common.h".Tao Bao2017-09-291-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move to soong." am: 475794a9af am: 2812e5d16b am: 3af1827bb5Tao Bao2017-09-304-54/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move to soong." am: 475794a9af am: 2812e5d16bTao Bao2017-09-304-54/+61
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move to soong." am: 475794a9afTao Bao2017-09-294-54/+61
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move to soong."Tao Bao2017-09-294-54/+61
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move to soong."Tao Bao2017-09-294-54/+61
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otafault: Move to soong.Tao Bao2017-09-294-54/+61
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move headers under otafault/." am: 4289deaf82 am: 0018b93b27 am: 540c16307aTao Bao2017-09-3010-14/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move headers under otafault/." am: 4289deaf82 am: 0018b93b27Tao Bao2017-09-3010-14/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move headers under otafault/." am: 4289deaf82Tao Bao2017-09-2910-14/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move headers under otafault/."Tao Bao2017-09-2910-14/+15
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Move headers under otafault/."Tao Bao2017-09-2910-14/+15
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otafault: Move headers under otafault/.Tao Bao2017-09-2910-14/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416 am: 408ee90b58Tianjie Xu2017-09-301-286/+279
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416Tianjie Xu2017-09-301-286/+279
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the png open and destroy functions into a class" am: e687c5a1e1Tianjie Xu2017-09-291-286/+279
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the png open and destroy functions into a class"Tianjie Xu2017-09-291-286/+279
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move the png open and destroy functions into a class"Tianjie Xu2017-09-291-286/+279
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the png open and destroy functions into a classTianjie Xu2017-09-291-286/+279
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e am: 8277230a98 am: d76a2e4c14Tao Bao2017-09-293-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e am: 8277230a98Tao Bao2017-09-293-4/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1eTao Bao2017-09-293-4/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."Tao Bao2017-09-293-4/+6
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."Tao Bao2017-09-293-4/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES.Tao Bao2017-09-293-4/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Clean up header inclusion." am: d9373cf621 am: ffc171c56d am: f541841037Tao Bao2017-09-296-20/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Clean up header inclusion." am: d9373cf621 am: ffc171c56dTao Bao2017-09-296-20/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Clean up header inclusion." am: d9373cf621Tao Bao2017-09-296-20/+18
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Clean up header inclusion."Tao Bao2017-09-296-20/+18
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "otafault: Clean up header inclusion."Tao Bao2017-09-296-20/+18
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otafault: Clean up header inclusion.Tao Bao2017-09-296-20/+18
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Integer overflow observed while formatting volume" am: 846f307c6f am: 4a20e8b68f am: 5f9defe3f2Abhishek Arpure2017-09-291-5/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Integer overflow observed while formatting volume" am: 846f307c6f am: 4a20e8b68fAbhishek Arpure2017-09-291-5/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Integer overflow observed while formatting volume" am: 846f307c6fAbhishek Arpure2017-09-291-5/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Integer overflow observed while formatting volume"Abhishek Arpure2017-09-291-5/+12
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Integer overflow observed while formatting volume"Treehugger Robot2017-09-291-5/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integer overflow observed while formatting volumeAbhishek Arpure2017-09-121-5/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655 am: fdbe272dc0 am: 3421fa1815Tao Bao2017-09-291-1/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655 am: fdbe272dc0Tao Bao2017-09-291-1/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655Tao Bao2017-09-291-1/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: volume_for_path() parses and tries prefixes."Tao Bao2017-09-291-1/+20
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "roots: volume_for_path() parses and tries prefixes."Tao Bao2017-09-281-1/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | roots: volume_for_path() parses and tries prefixes.Tao Bao2017-09-271-1/+20
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca am: 8874d3c309 am: 5e969aa10dTianjie Xu2017-09-277-21/+153
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca am: 8874d3c309Tianjie Xu2017-09-277-21/+153
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3caTianjie Xu2017-09-277-21/+153
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a new option in recovery menu to test the background texts"Tianjie Xu2017-09-277-21/+153
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a new option in recovery menu to test the background texts"Tianjie Xu2017-09-277-21/+153
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new option in recovery menu to test the background textsTianjie Xu2017-09-277-21/+153
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac am: fccf3bc0cf am: 88fd6aff38Tao Bao2017-09-271-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac am: fccf3bc0cfTao Bao2017-09-271-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820acTao Bao2017-09-271-1/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter."Tao Bao2017-09-271-1/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter."Tao Bao2017-09-271-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang-format: Remove the override of PenaltyExcessCharacter.Tao Bao2017-09-271-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841 am: eb5e194012 am: 448af2aa77Tianjie Xu2017-09-273-69/+174
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841 am: eb5e194012Tianjie Xu2017-09-273-69/+174
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841Tianjie Xu2017-09-273-69/+174
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Output split information for imgdiff when handling large apks"Tianjie Xu2017-09-273-69/+174
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Output split information for imgdiff when handling large apks"Tianjie Xu2017-09-273-69/+174
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output split information for imgdiff when handling large apksTianjie Xu2017-09-213-69/+174
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "update the recovery background image with new translation" am: c0123e0c3a am: 6a5204ac8d am: 9425dba5b3Tianjie Xu2017-09-2225-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update the recovery background image with new translation" am: c0123e0c3a am: 6a5204ac8dTianjie Xu2017-09-2225-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update the recovery background image with new translation" am: c0123e0c3aTianjie Xu2017-09-2225-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update the recovery background image with new translation"Tianjie Xu2017-09-2225-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "update the recovery background image with new translation"Tianjie Xu2017-09-2225-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update the recovery background image with new translationTianjie Xu2017-09-2025-0/+0
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "recovery: reduce overall boot time" am: a815d3fb59 am: 9da4179ee6 am: 4b8bbb95abMark Salyzyn2017-09-192-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: reduce overall boot time" am: a815d3fb59 am: 9da4179ee6Mark Salyzyn2017-09-192-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: reduce overall boot time" am: a815d3fb59Mark Salyzyn2017-09-192-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: reduce overall boot time"Mark Salyzyn2017-09-192-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: reduce overall boot time"Treehugger Robot2017-09-192-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery: reduce overall boot timeMark Salyzyn2017-09-182-2/+2
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307 am: 2cb1fb45c0 am: ed50c1817fTianjie Xu2017-09-171-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307 am: 2cb1fb45c0Tianjie Xu2017-09-171-6/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307Tianjie Xu2017-09-171-6/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff"Tianjie Xu2017-09-171-6/+9
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff"Tianjie Xu2017-09-171-6/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the dangling pointer when setting up arguments of imgdiffTianjie Xu2017-09-131-6/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: c9b0416842 -s oursBill Yi2017-09-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-09-161-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b am: ad878d5494 am: 34e7d45fb3Tao Bao2017-09-143-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b am: ad878d5494Tao Bao2017-09-143-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7bTao Bao2017-09-133-4/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros."Tao Bao2017-09-133-4/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros."Tao Bao2017-09-133-4/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove EXPAND/STRINGIFY macros.Tao Bao2017-09-133-4/+9
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Import translations. DO NOT MERGEBill Yi2017-09-131-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Close cmd_pipe properly after updater test finishes" am: 64307daf5b am: a11601da9b am: d83c0a8715Tianjie Xu2017-09-121-8/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Close cmd_pipe properly after updater test finishes" am: 64307daf5b am: a11601da9bTianjie Xu2017-09-121-8/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Close cmd_pipe properly after updater test finishes" am: 64307daf5bTianjie Xu2017-09-121-8/+14
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Close cmd_pipe properly after updater test finishes"Tianjie Xu2017-09-121-8/+14
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Close cmd_pipe properly after updater test finishes"Tianjie Xu2017-09-121-8/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Close cmd_pipe properly after updater test finishesTianjie Xu2017-09-111-8/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class." am: fc570c317b am: 166188c2c6 am: 547d5fd559Tao Bao2017-09-124-35/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class." am: fc570c317b am: 166188c2c6Tao Bao2017-09-124-35/+38
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class." am: fc570c317bTao Bao2017-09-124-35/+38
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class."Tao Bao2017-09-114-35/+38
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class."Tao Bao2017-09-114-35/+38
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Move locale and friends into ScreenRecoveryUI class.Tao Bao2017-09-114-35/+38
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Remove text_top_." am: 568644197f am: d96ce15139 am: cce9b2c96aTao Bao2017-09-113-12/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Remove text_top_." am: 568644197f am: d96ce15139Tao Bao2017-09-113-12/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Remove text_top_." am: 568644197fTao Bao2017-09-113-12/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Remove text_top_."Tao Bao2017-09-113-12/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Remove text_top_."Tao Bao2017-09-113-12/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Remove text_top_.Tao Bao2017-09-093-12/+4
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "ui: Refactor the declaration orders." am: 79a23b30d2 am: cb94b611cf am: bd9ef0ad1aTao Bao2017-09-113-76/+103
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Refactor the declaration orders." am: 79a23b30d2 am: cb94b611cfTao Bao2017-09-113-76/+103
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Refactor the declaration orders." am: 79a23b30d2Tao Bao2017-09-113-76/+103
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Refactor the declaration orders."Tao Bao2017-09-113-76/+103
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Refactor the declaration orders."Tao Bao2017-09-113-76/+103
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | ui: Refactor the declaration orders.Tao Bao2017-09-103-76/+103
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Manage menu_ with std::vector. am: 17fa5c7cabTao Bao2017-09-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Manage menu_ with std::vector.Tao Bao2017-09-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Manage menu_ with std::vector.Tao Bao2017-09-093-17/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." am: fa4f014063 am: 5f5ccacef7 am: 53bb5ff137Tao Bao2017-09-092-122/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." am: fa4f014063 am: 5f5ccacef7Tao Bao2017-09-082-122/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." am: fa4f014063Tao Bao2017-09-082-122/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()."Tao Bao2017-09-082-122/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()."Tao Bao2017-09-082-122/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | wear_ui: Remove Print()/ShowFile()/PutChar().Tao Bao2017-09-082-122/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Manage menu_ with std::vector." am: f51bb0f2d6 am: 4e3e42bed8 am: 77425c5e15Tao Bao2017-09-093-17/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Manage menu_ with std::vector." am: f51bb0f2d6 am: 4e3e42bed8Tao Bao2017-09-083-17/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Manage menu_ with std::vector." am: f51bb0f2d6Tao Bao2017-09-083-17/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Manage menu_ with std::vector."Tao Bao2017-09-083-17/+15
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ui: Manage menu_ with std::vector."Tao Bao2017-09-083-17/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | ui: Manage menu_ with std::vector.Tao Bao2017-09-083-17/+15
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "Improve imgdiff for large zip files" am: 9f48641784 am: e24e90f403 am: b2dac70423Tianjie Xu2017-09-083-24/+814
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve imgdiff for large zip files" am: 9f48641784 am: e24e90f403Tianjie Xu2017-09-083-24/+814
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve imgdiff for large zip files" am: 9f48641784Tianjie Xu2017-09-083-24/+814
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve imgdiff for large zip files"Tianjie Xu2017-09-083-24/+814
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve imgdiff for large zip files"Tianjie Xu2017-09-083-24/+814
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Improve imgdiff for large zip filesTianjie Xu2017-09-063-24/+814
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-09-061-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." am: 8c753f6253 am: 0cada4da99 am: 0f7d56fe81Tao Bao2017-09-022-36/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." am: 8c753f6253 am: 0cada4da99Tao Bao2017-09-022-36/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." am: 8c753f6253Tao Bao2017-09-022-36/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()."Tao Bao2017-09-022-36/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()."Tao Bao2017-09-022-36/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | wear_ui: Remove PrintOnScreenOnly() and PrintV().Tao Bao2017-09-012-36/+1
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 am: 3650e7c19b am: b457e24facTao Bao2017-09-012-40/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 am: 3650e7c19bTao Bao2017-09-012-40/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76Tao Bao2017-09-012-40/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove backgroundIcon."Tao Bao2017-09-012-40/+8
| | | |\| | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove backgroundIcon."Tao Bao2017-09-012-40/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | wear_ui: Remove backgroundIcon.Tao Bao2017-08-312-40/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for libedify" am: deb5de0bc1 am: 365059c61b am: 36983d8dd0Tianjie Xu2017-08-312-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for libedify" am: deb5de0bc1 am: 365059c61bTianjie Xu2017-08-312-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for libedify" am: deb5de0bc1Tianjie Xu2017-08-312-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for libedify"Tianjie Xu2017-08-312-2/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for libedify"Tianjie Xu2017-08-312-2/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | Turn on -Wall for libedifyTianjie Xu2017-08-312-2/+4
| | | | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: c16d222593 -s oursBill Yi2017-08-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-293-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-292-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-272-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for recovery modules" am: 11f68b6b69 am: 44d0b008c6 am: 447da69c14Tianjie Xu2017-08-2912-35/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for recovery modules" am: 11f68b6b69 am: 44d0b008c6Tianjie Xu2017-08-2912-35/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for recovery modules" am: 11f68b6b69Tianjie Xu2017-08-2912-35/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for recovery modules"Tianjie Xu2017-08-2912-35/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Wall for recovery modules"Tianjie Xu2017-08-2912-35/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | Turn on -Wall for recovery modulesTianjie Xu2017-08-2912-35/+34
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libasyncio." am: d179c923d8 am: d21fb1ece0 am: 4dc141e6baJerry Zhang2017-08-291-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libasyncio." am: d179c923d8 am: d21fb1ece0Jerry Zhang2017-08-291-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libasyncio." am: d179c923d8Jerry Zhang2017-08-291-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Add libasyncio."Jerry Zhang2017-08-291-0/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "Add libasyncio."Treehugger Robot2017-08-291-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | Add libasyncio.Jerry Zhang2017-07-181-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0 am: d92baf5988 am: 35d36d1fa6Tao Bao2017-08-282-24/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0 am: d92baf5988Tao Bao2017-08-282-24/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0Tao Bao2017-08-282-24/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_."Tao Bao2017-08-282-24/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_."Tao Bao2017-08-282-24/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_.Tao Bao2017-08-262-24/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f am: f351a576ce am: 813120749dTao Bao2017-08-282-9/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f am: f351a576ceTao Bao2017-08-282-9/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2fTao Bao2017-08-282-9/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'."Tao Bao2017-08-282-9/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'."Tao Bao2017-08-282-9/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | wear_ui: Remove dead 'self' and 'progress_t'.Tao Bao2017-08-262-9/+1
| | | | |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | / Merge "Add missing report of error code under recovery" am: 571855b0e6 am: 736be2f93e am: f134f0e5c0Tianjie Xu2017-08-252-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add missing report of error code under recovery" am: 571855b0e6 am: 736be2f93eTianjie Xu2017-08-252-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add missing report of error code under recovery" am: 571855b0e6Tianjie Xu2017-08-252-0/+6
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add missing report of error code under recovery"Tianjie Xu2017-08-252-0/+6
| | |/| | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add missing report of error code under recovery"Tianjie Xu2017-08-252-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Add missing report of error code under recoveryTianjie Xu2017-08-232-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-242-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5 am: 968ebdeefd am: 7379a5290dTianjie Xu2017-08-232-18/+73
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5 am: 968ebdeefdTianjie Xu2017-08-232-18/+73
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5Tianjie Xu2017-08-232-18/+73
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55Tianjie Xu2017-08-232-18/+73
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Allow comparison against multi serial nums for A/B package"Tianjie Xu2017-08-232-18/+73
| | | | |\| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | Merge "Allow comparison against multi serial nums for A/B package"Tianjie Xu2017-08-232-18/+73
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | Allow comparison against multi serial nums for A/B packageTianjie Xu2017-08-222-18/+73
| | | | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2b am: cdc6fcaa47 am: 0d0b6a0d2aTao Bao2017-08-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2b am: cdc6fcaa47Tao Bao2017-08-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2bTao Bao2017-08-228-255/+73
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206aTao Bao2017-08-228-255/+73
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge changes I5d7a6baa,Id0fb2d4eTao Bao2017-08-228-255/+73
| | | | |\| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | Merge changes I5d7a6baa,Id0fb2d4eTao Bao2017-08-228-255/+73
| | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | wear_ui: Expose menu_unusable_rows via Makefile var.Tao Bao2017-08-113-4/+11
| | | | | * | | | | | | | | | | | | | | | | | | | Allow customizing WearRecoveryUI via Makefile variables.Tao Bao2017-08-108-253/+64
* | | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "bug-64307776" into oc-mr1-dev am: 2e1b3a418eTao Bao2017-08-228-255/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "bug-64307776" into oc-mr1-devTao Bao2017-08-228-255/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge changes from topic "bug-64307776" into oc-mr1-devTao Bao2017-08-228-255/+73
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | wear_ui: Expose menu_unusable_rows via Makefile var.Tao Bao2017-08-133-4/+11
| | | * | | | | | | | | | | | | | | | | | | | | | Allow customizing WearRecoveryUI via Makefile variables.Tao Bao2017-08-138-253/+64
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09 am: f5e3cadeca am: fc569d1516Tianjie Xu2017-08-196-278/+325
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09 am: f5e3cadecaTianjie Xu2017-08-196-278/+325
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09Tianjie Xu2017-08-196-278/+325
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39Tianjie Xu2017-08-196-278/+325
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files"Tianjie Xu2017-08-196-278/+325
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files"Tianjie Xu2017-08-196-278/+325
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | Move Image/ImageChunk/PatchChunk declaration into header filesTianjie Xu2017-08-196-278/+325
| | | | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a am: 8c9c22a3a9 am: 14b3f5e5ccTianjie Xu2017-08-171-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a am: 8c9c22a3a9Tianjie Xu2017-08-171-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847aTianjie Xu2017-08-171-0/+6
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier now logs to kmesg" am: f7ad94313dTianjie Xu2017-08-171-0/+6
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "update_verifier now logs to kmesg"Tianjie Xu2017-08-171-0/+6
| | | | |\| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | Merge "update_verifier now logs to kmesg"Tianjie Xu2017-08-171-0/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | update_verifier now logs to kmesgTianjie Xu2017-08-151-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-08-1716-0/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-1716-0/+144
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Fix a case that may truncate the last char. am: 2cf6fe2cedTao Bao2017-08-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Fix a case that may truncate the last char.Tao Bao2017-08-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Fix a case that may truncate the last char.Tao Bao2017-08-171-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Word-wrap menu headers. am: ee6fefd2f2 -s oursTao Bao2017-08-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Word-wrap menu headers.Tao Bao2017-08-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | screen_ui: Word-wrap menu headers.Tao Bao2017-08-163-5/+37
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e am: 228a2f2a37 am: 7f7d9b2f37Tao Bao2017-08-171-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e am: 228a2f2a37Tao Bao2017-08-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360eTao Bao2017-08-171-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfdTao Bao2017-08-171-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char."Tao Bao2017-08-171-1/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char."Tao Bao2017-08-171-1/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | screen_ui: Fix a case that may truncate the last char.Tao Bao2017-08-161-1/+2
| | | | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 20fa1a92cc -s oursBill Yi2017-08-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-162-2/+11
| | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9 am: ae0af37111 am: f1397b597aTao Bao2017-08-163-5/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9 am: ae0af37111Tao Bao2017-08-163-5/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9Tao Bao2017-08-163-5/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "screen_ui: Word-wrap menu headers." am: 162b92323bTao Bao2017-08-163-5/+37
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "screen_ui: Word-wrap menu headers."Tao Bao2017-08-163-5/+37
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Merge "screen_ui: Word-wrap menu headers."Tao Bao2017-08-163-5/+37
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | screen_ui: Word-wrap menu headers.Tao Bao2017-08-163-5/+37
| | | | | | | |/ / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8 am: 96b490acec am: bfd3123a6aTianjie Xu2017-08-141-236/+292
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8 am: 96b490acecTianjie Xu2017-08-141-236/+292
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8Tianjie Xu2017-08-141-236/+292
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062Tianjie Xu2017-08-141-236/+292
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "Add a new PatchChunk class in imgdiff"Tianjie Xu2017-08-141-236/+292
| | | | |\| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Merge "Add a new PatchChunk class in imgdiff"Tianjie Xu2017-08-141-236/+292
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | Add a new PatchChunk class in imgdiffTianjie Xu2017-08-131-236/+292
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-1215-128/+2
* | | | | | | | | | | | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76 am: db9ec51c39David Zeuthen2017-08-100-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76David Zeuthen2017-08-100-0/+0
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'.David Zeuthen2017-08-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76 am: 9cf2e9798fDavid Zeuthen2017-08-100-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76David Zeuthen2017-08-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'.David Zeuthen2017-08-101-4/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'.David Zeuthen2017-08-091-4/+17
* | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4 am: 5156e24ccf am: 37b9d108a9Tao Bao2017-08-100-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4 am: 5156e24ccfTao Bao2017-08-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4Tao Bao2017-08-101-31/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "update_verifier: verify blocks in parallel" am: 0459799ea8Tao Bao2017-08-101-31/+51
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "update_verifier: verify blocks in parallel"Tao Bao2017-08-101-31/+51
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Merge "update_verifier: verify blocks in parallel"Tao Bao2017-08-101-31/+51
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | update_verifier: verify blocks in parallelWei Wang2017-08-101-31/+51
| | | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | / Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeee am: 46c13f3f05 am: 6f1c38c9adTao Bao2017-08-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeee am: 46c13f3f05Tao Bao2017-08-100-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeeeTao Bao2017-08-101-1/+2
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982adTao Bao2017-08-101-1/+2
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase."Tao Bao2017-08-101-1/+2
| | | | |\| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase."Tao Bao2017-08-101-1/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | tests: Add the missing dependency on libhidlbase.Tao Bao2017-08-101-1/+2
| | | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-dev am: 1f4229ff95Wei Wang2017-08-101-1/+2
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-devWei Wang2017-08-101-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-devWei Wang2017-08-101-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | tests: Add the missing dependency on libhidlbase.Tao Bao2017-08-101-1/+2
* | | | | | | | | | | | | | | | | | | | | update_verifier: verify blocks in parallel am: bd9664b5a0Wei Wang2017-08-101-31/+51
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | update_verifier: verify blocks in parallelWei Wang2017-08-101-31/+51
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | update_verifier: verify blocks in parallelWei Wang2017-08-091-31/+51
* | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534 am: bb8d04cd3c am: f2a8eba23c am: ade231287bDavid Zeuthen2017-08-081-4/+17
|\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534 am: bb8d04cd3c am: f2a8eba23cDavid Zeuthen2017-08-081-4/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534 am: bb8d04cd3cDavid Zeuthen2017-08-081-4/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534David Zeuthen2017-08-081-4/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'."David Zeuthen2017-08-081-4/+17
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'."Treehugger Robot2017-08-081-4/+17
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'.David Zeuthen2017-08-081-4/+17
| | | | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5c2bc51bf2 -s oursBill Yi2017-08-060-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-08-061-0/+9
* | | | | | | | | | | | | | | | | | | ui: Check for bootreason=recovery_ui. am: 937e884ca1Tao Bao2017-08-040-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | ui: Check for bootreason=recovery_ui.Tao Bao2017-08-040-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | ui: Check for bootreason=recovery_ui.Tao Bao2017-08-032-0/+21
| | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 am: 7c0b8a4322 am: 7f5b514411 am: 99f78994cbTao Bao2017-08-042-0/+21
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 am: 7c0b8a4322 am: 7f5b514411Tao Bao2017-08-042-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 am: 7c0b8a4322Tao Bao2017-08-042-0/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86Tao Bao2017-08-042-0/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "ui: Check for bootreason=recovery_ui."Tao Bao2017-08-032-0/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Merge "ui: Check for bootreason=recovery_ui."Tao Bao2017-08-032-0/+21
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / | | | | | |/| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | ui: Check for bootreason=recovery_ui.Tao Bao2017-08-032-0/+21
| | | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | | ui: Move the support for touch inputs into RecoveryUI. am: af9f8b4d97Tao Bao2017-08-030-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | ui: Move the support for touch inputs into RecoveryUI.Tao Bao2017-08-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | ui: Move the support for touch inputs into RecoveryUI.Tao Bao2017-08-035-16/+209
* | | | | | | | | | | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." am: faa5b1f773 am: 5daa000068 am: 14d829b02c am: 30886cb817Tao Bao2017-08-035-16/+209
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." am: faa5b1f773 am: 5daa000068 am: 14d829b02cTao Bao2017-08-035-16/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." am: faa5b1f773 am: 5daa000068Tao Bao2017-08-035-16/+209
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." am: faa5b1f773Tao Bao2017-08-035-16/+209
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI."Tao Bao2017-08-035-16/+209
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI."Tao Bao2017-08-035-16/+209
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | ui: Move the support for touch inputs into RecoveryUI.Tao Bao2017-08-025-16/+209
* | | | | | | | | | | | | | | | | | Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b am: e500bc3e15 am: 12cd28fb9cTianjie Xu2017-08-032-393/+569
|\| | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b am: e500bc3e15Tianjie Xu2017-08-032-393/+569
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389bTianjie Xu2017-08-032-393/+569
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Refactor the imgdiff" am: f411f3dcfbTianjie Xu2017-08-032-393/+569
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Refactor the imgdiff"Tianjie Xu2017-08-032-393/+569
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "Refactor the imgdiff"Tianjie Xu2017-08-032-393/+569
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | | * | | | | | | | | | | Refactor the imgdiffTianjie Xu2017-08-022-393/+569
| | | | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | | / Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310 am: a09376ed90 am: 8b09001e47Tianjie Xu2017-08-012-1/+162
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310 am: a09376ed90Tianjie Xu2017-08-012-1/+162
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310Tianjie Xu2017-08-012-1/+162
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Add implemention of SortedRangeSet" am: 64cba55fbcTianjie Xu2017-08-012-1/+162
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge "Add implemention of SortedRangeSet"Tianjie Xu2017-08-012-1/+162
| | | | |\| | | | | | | | | |
| | | | | * | | | | | | | | | Merge "Add implemention of SortedRangeSet"Tianjie Xu2017-08-012-1/+162
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | Add implemention of SortedRangeSetTianjie Xu2017-08-012-1/+162
* | | | | | | | | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63c am: 0863373376 am: 06db7363b0Tao Bao2017-07-314-177/+119
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63c am: 0863373376Tao Bao2017-07-314-177/+119
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63cTao Bao2017-07-314-177/+119
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101bTao Bao2017-07-314-177/+119
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()."Tao Bao2017-07-314-177/+119
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()."Treehugger Robot2017-07-314-177/+119
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | otautil: Clean up dirCreateHierarchy().Tao Bao2017-07-274-177/+119
| | | | | | |/ / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229 am: a86d24829b am: ce47e3792fTianjie Xu2017-07-272-6/+8
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229 am: a86d24829bTianjie Xu2017-07-272-6/+8
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229Tianjie Xu2017-07-272-6/+8
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4Tianjie Xu2017-07-272-6/+8
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "Add more specific error codes for uncrypt failures"Tianjie Xu2017-07-272-6/+8
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "Add more specific error codes for uncrypt failures"Tianjie Xu2017-07-272-6/+8
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Add more specific error codes for uncrypt failuresTianjie Xu2017-07-272-6/+8
| | | | | | |/ / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1 am: f93a103587 am: 264caac23dTao Bao2017-07-271-129/+121
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1 am: f93a103587Tao Bao2017-07-271-129/+121
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1Tao Bao2017-07-271-129/+121
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3dTao Bao2017-07-271-129/+121
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "roots.cpp: Clean up format_volume()."Tao Bao2017-07-271-129/+121
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "roots.cpp: Clean up format_volume()."Tao Bao2017-07-271-129/+121
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | roots.cpp: Clean up format_volume().Tao Bao2017-07-261-129/+121
| | | | | |/ / / / / / / / / /
* | | | | | | | | | | | | | | recovery: handle security footer before passing size to mke2fs am: 5e47d5161a -s ours am: 3475faf5ea -s oursJin Qian2017-07-260-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | recovery: handle security footer before passing size to mke2fs am: 5e47d5161a -s oursJin Qian2017-07-260-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | recovery: handle security footer before passing size to mke2fsJin Qian2017-07-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | recovery: handle security footer before passing size to mke2fs am: 5e47d5161a am: e2d31361ef -s oursJin Qian2017-07-260-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | recovery: handle security footer before passing size to mke2fs am: 5e47d5161aJin Qian2017-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | recovery: handle security footer before passing size to mke2fsJin Qian2017-07-261-11/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | recovery: handle security footer before passing size to mke2fsJin Qian2017-07-251-11/+28
* | | | | | | | | | | | | | | recovery: Fix the flickering when turning on text mode. am: fda6ee7d61Tao Bao2017-07-260-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | recovery: Fix the flickering when turning on text mode.Tao Bao2017-07-260-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | recovery: Fix the flickering when turning on text mode.Tao Bao2017-07-251-9/+8
* | | | | | | | | | | | | | | Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7 am: 1bc6334312 am: b0e8a507acTao Bao2017-07-264-6/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7 am: 1bc6334312Tao Bao2017-07-264-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7Tao Bao2017-07-264-6/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Remove LOCAL_CLANG" am: 231c627a55Tao Bao2017-07-264-6/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Merge "Remove LOCAL_CLANG"Tao Bao2017-07-254-6/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | Merge "Remove LOCAL_CLANG"Tao Bao2017-07-254-6/+0
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | Remove LOCAL_CLANGLennart Wieboldt2017-07-254-6/+0
* | | | | | | | | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 am: 2b95e0d0aa am: 6e99b91fd0Jin Qian2017-07-251-11/+28
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 am: 2b95e0d0aaJin Qian2017-07-251-11/+28
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6Jin Qian2017-07-251-11/+28
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1Jin Qian2017-07-251-11/+28
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs"Jin Qian2017-07-251-11/+28
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs"Treehugger Robot2017-07-251-11/+28
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | recovery: handle security footer before passing size to mke2fsJin Qian2017-07-251-11/+28
* | | | | | | | | | | | | | | | | Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d am: 28cf022931 am: ed4abe576bTao Bao2017-07-251-28/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d am: 28cf022931Tao Bao2017-07-251-28/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9dTao Bao2017-07-251-28/+0
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "updater: Remove dead make_parents()." am: f5396eb8b2Tao Bao2017-07-251-28/+0
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "updater: Remove dead make_parents()."Tao Bao2017-07-251-28/+0
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "updater: Remove dead make_parents()."Treehugger Robot2017-07-251-28/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | updater: Remove dead make_parents().Tao Bao2017-07-251-28/+0
| | | | | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 am: a40c15717d am: df9252faf7Tao Bao2017-07-251-9/+8
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 am: a40c15717dTao Bao2017-07-251-9/+8
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33Tao Bao2017-07-251-9/+8
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016Tao Bao2017-07-251-9/+8
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode."Tao Bao2017-07-251-9/+8
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode."Treehugger Robot2017-07-251-9/+8
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | | * | | | | | | | | | | recovery: Fix the flickering when turning on text mode.Tao Bao2017-07-251-9/+8
| | | | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 am: 633aeba594 am: 9c62f67863Tao Bao2017-07-253-101/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 am: 633aeba594Tao Bao2017-07-253-101/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9Tao Bao2017-07-253-101/+0
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9Tao Bao2017-07-253-101/+0
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()."Tao Bao2017-07-253-101/+0
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()."Tao Bao2017-07-253-101/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | otautil: Delete dirUnlinkHierarchy().Tao Bao2017-07-253-101/+0
| | | | | |/ / / / / / / / / /
* | | | | | | | | | | | | | | Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36 am: bba1e66f74 am: 11e6d8ee85Tao Bao2017-07-251-101/+93
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36 am: bba1e66f74Tao Bao2017-07-251-101/+93
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36Tao Bao2017-07-251-101/+93
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "roots.cpp: Reformatting the file." am: ac70ffcc85Tao Bao2017-07-251-101/+93
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge "roots.cpp: Reformatting the file."Tao Bao2017-07-251-101/+93
| | | | |\| | | | | | | | | |
| | | | | * | | | | | | | | | Merge "roots.cpp: Reformatting the file."Treehugger Robot2017-07-251-101/+93
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | roots.cpp: Reformatting the file.Tao Bao2017-07-251-101/+93
| | | | | |/ / / / / / / / / /
* | | | | | | | | | | | | | | tests: Add a test to cover legacy care_map.txt handling. am: 5cee24f4f1Tao Bao2017-07-250-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | tests: Add a test to cover legacy care_map.txt handling.Tao Bao2017-07-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | tests: Add a test to cover legacy care_map.txt handling.Tao Bao2017-07-241-0/+13
* | | | | | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev am: 71b8103bf1Tao Bao2017-07-240-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-devTao Bao2017-07-240-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-devTreeHugger Robot2017-07-241-29/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | update_verifier: Handle legacy care_map.txt gracefully.Tao Bao2017-07-241-29/+42
* | | | | | | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-dev am: 92aef7fa88Tianjie Xu2017-07-240-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-devTianjie Xu2017-07-240-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-devTianjie Xu2017-07-242-98/+96
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Fix a case when brotli writer fails to write last few blocks of dataTianjie Xu2017-07-222-98/+96
* | | | | | | | | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331 am: 0148a6f9ab am: 2357b0c745Tao Bao2017-07-241-0/+13
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331 am: 0148a6f9abTao Bao2017-07-241-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331Tao Bao2017-07-241-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594cTao Bao2017-07-241-0/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling."Tao Bao2017-07-241-0/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling."Tao Bao2017-07-241-0/+13
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | tests: Add a test to cover legacy care_map.txt handling.Tao Bao2017-07-241-0/+13
| | | | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c am: 1d923f5e54 am: c580e491caTao Bao2017-07-241-29/+42
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c am: 1d923f5e54Tao Bao2017-07-241-29/+42
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8cTao Bao2017-07-241-29/+42
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3Tao Bao2017-07-241-29/+42
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully."Tao Bao2017-07-241-29/+42
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully."Tao Bao2017-07-241-29/+42
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | update_verifier: Handle legacy care_map.txt gracefully.Tao Bao2017-07-221-29/+42
* | | | | | | | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca am: fd63239621 am: 0be4c0e261Tao Bao2017-07-230-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca am: fd63239621Tao Bao2017-07-230-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dcaTao Bao2017-07-232-5/+2
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895beTao Bao2017-07-232-5/+2
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts."Tao Bao2017-07-232-5/+2
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts."Treehugger Robot2017-07-232-5/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | | * | | | | | | | | | | Remove the obsolete reference to /file_contexts.Tao Bao2017-07-232-5/+2
| | | | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | | | Avoid crashing recovery with unwritable /cache. am: 329fe83509Tao Bao2017-07-220-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Avoid crashing recovery with unwritable /cache.Tao Bao2017-07-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Avoid crashing recovery with unwritable /cache.Tao Bao2017-07-221-25/+23
* | | | | | | | | | | | | | | | Build libminui with BOARD_VNDK_VERSION am: d774ff247eJiyong Park2017-07-220-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Build libminui with BOARD_VNDK_VERSIONJiyong Park2017-07-221-1/+1
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Build libminui with BOARD_VNDK_VERSIONJiyong Park2017-07-211-1/+1
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 am: 4fb2825dc2 am: e62f06246a am: 7d03b8d495Tao Bao2017-07-221-25/+23
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 am: 4fb2825dc2 am: e62f06246aTao Bao2017-07-221-25/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 am: 4fb2825dc2Tao Bao2017-07-221-25/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51Tao Bao2017-07-221-25/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Merge "Avoid crashing recovery with unwritable /cache."Tao Bao2017-07-221-25/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | Merge "Avoid crashing recovery with unwritable /cache."Treehugger Robot2017-07-221-25/+23
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | Avoid crashing recovery with unwritable /cache.Tao Bao2017-07-211-25/+23
* | | | | | | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 am: 80acaab52f am: 75ff0107c8 am: 512283a751Tianjie Xu2017-07-222-98/+96
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 am: 80acaab52f am: 75ff0107c8Tianjie Xu2017-07-222-98/+96
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 am: 80acaab52fTianjie Xu2017-07-222-98/+96
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057Tianjie Xu2017-07-212-98/+96
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data"Tianjie Xu2017-07-212-98/+96
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data"Tianjie Xu2017-07-212-98/+96
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | Fix a case when brotli writer fails to write last few blocks of dataTianjie Xu2017-07-212-98/+96
| | | | | | | |_|/ / / / / / / | | | | | | |/| | | | | | | |
* | | | | | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742 am: 7cdc58497b am: 6fc893ebcaJin Qian2017-07-220-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742 am: 7cdc58497bJin Qian2017-07-220-0/+0
| |\| | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742Jin Qian2017-07-220-0/+0
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6Jin Qian2017-07-213-11/+86
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs"Jin Qian2017-07-213-11/+86
| | | | |\| | | | | | | | |
| | | | | * | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs"Treehugger Robot2017-07-213-11/+86
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | recovery: replace make_ext4 with e2fsprogsJin Qian2017-07-203-11/+86
| | | | | | |/ / / / / / / /
* | | | | | | | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION"TreeHugger Robot2017-07-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Build libminui with BOARD_VNDK_VERSIONJiyong Park2017-07-191-1/+1
* | | | | | | | | | | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 am: 6d8827e0d3 am: 96b5bb9601Tianjie Xu2017-07-207-116/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| / / / / / / / / / / / / | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 am: 6d8827e0d3Tianjie Xu2017-07-207-116/+115
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797Tianjie Xu2017-07-207-116/+115
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery"Tianjie Xu2017-07-207-116/+115
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery"Tianjie Xu2017-07-207-116/+115
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Fix the android-cloexec-* warnings in bootable/recoveryTianjie Xu2017-07-197-116/+115
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts."Tao Bao2017-07-142-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove the obsolete reference to /file_contexts.Tao Bao2017-07-132-5/+2
* | | | | | | | | | | | | Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74 am: c61bbe158e am: 762c42d6f6Tao Bao2017-07-131-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74 am: c61bbe158eTao Bao2017-07-131-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74Tao Bao2017-07-131-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Fix the missing char when showing recovery logs."Tao Bao2017-07-131-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge "Fix the missing char when showing recovery logs."Treehugger Robot2017-07-131-5/+5
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Fix the missing char when showing recovery logs.Tao Bao2017-07-131-5/+5
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 7e05669aba -s ours" into oc-dr1-dev-plus-aospBill Yi2017-07-110-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 7e05669aba -s ours" into oc-dr1-dev-plus-aospAndroid Build Merger (Role)2017-07-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s oursBill Yi2017-07-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Import translations. DO NOT MERGE am: 28b67f8eea -s oursBill Yi2017-07-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |
* | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 04e1d6ebd9 -s oursBill Yi2017-07-110-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s oursBill Yi2017-07-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Import translations. DO NOT MERGE am: 28b67f8eea -s oursBill Yi2017-07-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-07-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-07-101-1/+1
* | | | | | | | | | | | | Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2 am: 43bdf6cad6 am: 8375ebee37Tianjie Xu2017-07-114-32/+212
|\| | | | | | | | | | | | | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2 am: 43bdf6cad6Tianjie Xu2017-07-114-32/+212
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2Tianjie Xu2017-07-114-32/+212
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Add support to decompress brotli compressed new data"Tianjie Xu2017-07-114-32/+212
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "Add support to decompress brotli compressed new data"Tianjie Xu2017-07-114-32/+212
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Add support to decompress brotli compressed new dataTianjie Xu2017-07-084-32/+212
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f am: 233f4b0b4bTianjie Xu2017-07-072-11/+47
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1fTianjie Xu2017-07-072-11/+47
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16Tianjie Xu2017-07-072-11/+47
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header"Tianjie Xu2017-07-072-11/+47
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header"Tianjie Xu2017-07-072-11/+47
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fix a rare failure for imgdiff when random data equals gzip headerTianjie Xu2017-07-072-11/+47
| | | | |/ / / / / / / /
* | | | | | | | | | | | Restructure vr_ui am: c392888df7 -s oursLuke Song2017-07-070-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Restructure vr_uiLuke Song2017-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Restructure vr_uiLuke Song2017-07-075-32/+13
* | | | | | | | | | | | Merge "Introduce VR recovery ui am: edc6b52f00 -s ours am: 6660c97f07"Android Build Merger (Role)2017-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Introduce VR recovery ui am: edc6b52f00 -s oursLuke Song2017-07-070-0/+0
| |\| | | | | | | | | | |
* | | | | | | | | | | | | Introduce VR recovery ui am: edc6b52f00 -s oursLuke Song2017-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | Introduce VR recovery uiLuke Song2017-07-070-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Introduce VR recovery uiLuke Song2017-07-066-9/+144
* | | | | | | | | | | | Merge "Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp am: 114b555807 -s ours"Android Build Merger (Role)2017-07-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aospJin Qian2017-07-060-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aospAndroid Build Merger (Role)2017-07-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 am: 6895d5c44d -s ours"Android Build Merger (Role)2017-07-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866Jin Qian2017-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-devJin Qian2017-07-063-11/+86
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 am: 987c5a98a8 -s ours"Android Build Merger (Role)2017-07-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866Jin Qian2017-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866Jin Qian2017-07-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| / / / / / / / / / / / / | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-devJin Qian2017-07-063-11/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-devTreeHugger Robot2017-07-063-11/+86
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | recovery: replace make_ext4 with e2fsprogsJin Qian2017-06-273-11/+86
* | | | | | | | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa am: 7e3b1c00c6Tao Bao2017-07-025-37/+38
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafaTao Bao2017-07-025-37/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9cTao Bao2017-07-025-37/+38
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures."Tao Bao2017-07-025-37/+38
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures."Treehugger Robot2017-07-025-37/+38
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Update ScreenRecoveryUI::Draw* function signatures.Tao Bao2017-07-025-37/+38
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | screen_ui: Compute the top and bottom gaps. am: f95e686dd0 -s oursTao Bao2017-06-300-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | screen_ui: Compute the top and bottom gaps.Tao Bao2017-06-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | screen_ui: Compute the top and bottom gaps.Tao Bao2017-06-301-11/+14
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef am: 1783254c3f am: 2fbbd488d6Tao Bao2017-06-301-11/+14
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef am: 1783254c3fTao Bao2017-06-301-11/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4efTao Bao2017-06-301-11/+14
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "screen_ui: Compute the top and bottom gaps."Tao Bao2017-06-301-11/+14
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "screen_ui: Compute the top and bottom gaps."Tao Bao2017-06-301-11/+14
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | screen_ui: Compute the top and bottom gaps.Tao Bao2017-06-291-11/+14
* | | | | | | | | | | | | Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858f am: c3437622ccTao Bao2017-06-292-13/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858fTao Bao2017-06-292-13/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4Tao Bao2017-06-292-13/+0
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "wear_ui: Remove dead/duplicate codes."Tao Bao2017-06-292-13/+0
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "wear_ui: Remove dead/duplicate codes."Tao Bao2017-06-292-13/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | wear_ui: Remove dead/duplicate codes.Tao Bao2017-06-292-13/+0
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cb am: 8b4c7e7567Elliott Hughes2017-06-281-1/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cbElliott Hughes2017-06-281-1/+2
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Add missing libziparchive dependency." am: f9fe6a705dElliott Hughes2017-06-281-1/+2
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Add missing libziparchive dependency."Elliott Hughes2017-06-281-1/+2
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Add missing libziparchive dependency."Treehugger Robot2017-06-281-1/+2
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Add missing libziparchive dependency.Elliott Hughes2017-06-281-1/+2
* | | | | | | | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 am: 2e20c11828 am: 57191920e8Tao Bao2017-06-285-66/+58
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 am: 2e20c11828Tao Bao2017-06-285-66/+58
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367Tao Bao2017-06-285-66/+58
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes."Tao Bao2017-06-285-66/+58
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes."Tao Bao2017-06-285-66/+58
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Add override specifier and member constness to RecoveryUI classes.Tao Bao2017-06-245-66/+58
* | | | | | | | | | | | | | Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8a am: a6aa96f3fdTao Bao2017-06-277-1099/+1100
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8aTao Bao2017-06-277-1099/+1100
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6Tao Bao2017-06-277-1099/+1100
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "Formatting RecoveryUI related files."Tao Bao2017-06-277-1099/+1100
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "Formatting RecoveryUI related files."Treehugger Robot2017-06-277-1099/+1100
| | | | |\| | | | | | | | |
| | | | | * | | | | | | | | Formatting RecoveryUI related files.Tao Bao2017-06-247-1099/+1100
* | | | | | | | | | | | | | Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 am: 170aa1c923 am: 09b438052eTianjie Xu2017-06-271-13/+9
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 am: 170aa1c923Tianjie Xu2017-06-271-13/+9
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987Tianjie Xu2017-06-271-13/+9
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "avoid assuming build number is a 32-bit integer"Tianjie Xu2017-06-261-13/+9
| | |/| | | | | | | | | | | | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "avoid assuming build number is a 32-bit integer"Tianjie Xu2017-06-261-13/+9
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | avoid assuming build number is a 32-bit integerDaniel Micay2017-06-261-13/+9
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86 am: 799cd0bb5dLuke Song2017-06-240-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86Luke Song2017-06-245-32/+13
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Restructure vr_ui" am: 20d40ce53aLuke Song2017-06-245-32/+13
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Merge "Restructure vr_ui"Luke Song2017-06-245-32/+13
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Restructure vr_ui"Treehugger Robot2017-06-245-32/+13
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Restructure vr_uiLuke Song2017-06-245-32/+13
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | Merge "Restructure vr_ui"Luke Song2017-06-245-32/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Restructure vr_uiLuke Song2017-06-235-32/+13
* | | | | | | | | | | | | | Use Makefile variables to specify margin settings. am: 855eaffff6 -s oursTao Bao2017-06-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Use Makefile variables to specify margin settings.Tao Bao2017-06-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Use Makefile variables to specify margin settings.Tao Bao2017-06-233-13/+25
* | | | | | | | | | | | | | screen_ui: Allow setting screen margin space. am: 8f7547edfa -s oursTao Bao2017-06-240-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | screen_ui: Allow setting screen margin space.Tao Bao2017-06-240-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | screen_ui: Allow setting screen margin space.Tao Bao2017-06-232-70/+77
* | | | | | | | | | | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 am: 2eb2c0b276Tao Bao2017-06-240-0/+0
|\| | | | | | | | | | | | | | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380Tao Bao2017-06-243-71/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567cTao Bao2017-06-233-71/+90
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge changes Icb6f7466,Ibf6238c9Tao Bao2017-06-233-71/+90
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge changes Icb6f7466,Ibf6238c9Tao Bao2017-06-233-71/+90
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Use Makefile variables to specify margin settings.Tao Bao2017-06-233-13/+25
| | | | | * | | | | | | | | screen_ui: Allow setting screen margin space.Tao Bao2017-06-212-71/+78
| | | | | | |/ / / / / / / | | | | | |/| | | | | | |
* | | | | | | | | | | | | Merge changes from topic 'recovery_ui_taimen'Tao Bao2017-06-233-71/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use Makefile variables to specify margin settings.Tao Bao2017-06-223-13/+25
| * | | | | | | | | | | | | screen_ui: Allow setting screen margin space.Tao Bao2017-06-202-71/+78
* | | | | | | | | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5 am: e002d96194Tianjie Xu2017-06-231-96/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5Tianjie Xu2017-06-231-96/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9Tianjie Xu2017-06-231-96/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "Remove the obsolete package_extract_dir() test"Tianjie Xu2017-06-231-96/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "Remove the obsolete package_extract_dir() test"Tianjie Xu2017-06-231-96/+0
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Remove the obsolete package_extract_dir() testTianjie Xu2017-06-231-96/+0
| | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
* | | | | | | | | | | | | | update_verifier: Support AVB. am: 336cbce252 -s oursDavid Zeuthen2017-06-230-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | update_verifier: Support AVB.David Zeuthen2017-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | update_verifier: Support AVB.David Zeuthen2017-06-234-7/+24
* | | | | | | | | | | | | | Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49 am: b0c38f1cceDavid Zeuthen2017-06-224-7/+24
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49David Zeuthen2017-06-224-7/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "update_verifier: Support AVB." am: e248e434eaDavid Zeuthen2017-06-224-7/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "update_verifier: Support AVB."David Zeuthen2017-06-224-7/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "update_verifier: Support AVB."Treehugger Robot2017-06-224-7/+24
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | update_verifier: Support AVB.David Zeuthen2017-05-244-7/+24
* | | | | | | | | | | | | | recovery: replace make_ext4 with e2fsprogsJin Qian2017-06-193-11/+86
| |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a am: 8daabacce5Luke Song2017-06-170-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951aLuke Song2017-06-176-8/+144
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22Luke Song2017-06-176-8/+144
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Introduce VR recovery ui"Luke Song2017-06-176-8/+144
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Introduce VR recovery ui"Treehugger Robot2017-06-176-8/+144
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Introduce VR recovery uiLuke Song2017-06-176-8/+144
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | Merge "Introduce VR recovery ui"Luke Song2017-06-166-8/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Introduce VR recovery uiLuke Song2017-06-156-8/+144
* | | | | | | | | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6 am: 80eb02dcbfChih-hung Hsieh2017-06-161-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6Chih-hung Hsieh2017-06-161-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4dChih-hung Hsieh2017-06-161-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "Add OWNERS in bootable/recovery"Chih-hung Hsieh2017-06-161-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "Add OWNERS in bootable/recovery"Chih-hung Hsieh2017-06-161-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Add OWNERS in bootable/recoveryChih-Hung Hsieh2017-06-151-0/+3
* | | | | | | | | | | | | | | Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aospJeff Vander Stoep2017-06-160-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aospAndroid Build Merger (Role)2017-06-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Fix "No file_contexts" warning am: e35926e1afJeff Vander Stoep2017-06-162-9/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Fix "No file_contexts" warningJeff Vander Stoep2017-06-162-9/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix "No file_contexts" warning am: e35926e1af am: eba11fa574Jeff Vander Stoep2017-06-160-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix "No file_contexts" warning am: e35926e1afJeff Vander Stoep2017-06-162-9/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix "No file_contexts" warningJeff Vander Stoep2017-06-162-9/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Fix "No file_contexts" warningJeff Vander Stoep2017-06-152-9/+6
* | | | | | | | | | | | | | | Fix "No file_contexts" warningJeff Vander Stoep2017-06-152-9/+6
| |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827 am: 54138462b4Tianjie Xu2017-06-091-3/+7
|\| | | | | | | | | | | | | | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827Tianjie Xu2017-06-091-3/+7
|/| | | | | | | | | | | | | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87Tianjie Xu2017-06-091-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Fix a race condition for temperature_logger"Tianjie Xu2017-06-091-3/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Fix a race condition for temperature_logger"Tianjie Xu2017-06-091-3/+7
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Fix a race condition for temperature_loggerTianjie Xu2017-06-081-3/+7
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb am: 66e53f59b9Tianjie Xu2017-06-017-439/+0
|\| | | | | | | | | |
| * | | | | | | | | | Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969ebTianjie Xu2017-05-317-439/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Merge "kill package_extract_dir" am: 99e7216907Tianjie Xu2017-05-317-439/+0
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "kill package_extract_dir"Tianjie Xu2017-05-317-439/+0
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "kill package_extract_dir"Tianjie Xu2017-05-317-439/+0
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | kill package_extract_dirTianjie Xu2017-05-247-439/+0
| | | | | | |/ / / / / / | | | | | |/| | | | | |
* | | | | | | | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a am: 4a2cfffd33Tianjie Xu2017-05-271-58/+86
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088aTianjie Xu2017-05-271-58/+86
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215afTianjie Xu2017-05-271-58/+86
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Implement a custom deflate sink function for bspatch"Tianjie Xu2017-05-271-58/+86
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Implement a custom deflate sink function for bspatch"Tianjie Xu2017-05-271-58/+86
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Implement a custom deflate sink function for bspatchTianjie Xu2017-05-261-58/+86
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 am: aef046255aTianjie Xu2017-05-244-4/+12
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71Tianjie Xu2017-05-244-4/+12
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789Tianjie Xu2017-05-244-4/+12
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails"Tianjie Xu2017-05-244-4/+12
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails"Tianjie Xu2017-05-244-4/+12
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Retry the update if ApplyBSDiffPatch | ApplyImagePatch failsTianjie Xu2017-05-244-4/+12
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d am: 1562f41348Tianjie Xu2017-05-194-22/+71
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9dTianjie Xu2017-05-194-22/+71
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48Tianjie Xu2017-05-194-22/+71
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error"Tianjie Xu2017-05-194-22/+71
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error"Tianjie Xu2017-05-194-22/+71
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Print SHA1 of the patch if bsdiff fails with data errorTianjie Xu2017-05-164-22/+71
* | | | | | | | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 am: 01bcf118d5Tom Cherry2017-05-184-26/+27
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926Tom Cherry2017-05-184-26/+27
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94Tom Cherry2017-05-184-26/+27
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "libbootloader_message: convert to Android.bp"Tom Cherry2017-05-184-26/+27
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "libbootloader_message: convert to Android.bp"Tom Cherry2017-05-184-26/+27
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | libbootloader_message: convert to Android.bpTom Cherry2017-05-174-26/+27
* | | | | | | | | | | | | Fix the input parameter for "set_retry_bootloader_message" am: 539b08cfcfTianjie Xu2017-05-180-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Fix the input parameter for "set_retry_bootloader_message"Tianjie Xu2017-05-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix the input parameter for "set_retry_bootloader_message"Tianjie Xu2017-05-171-13/+13
* | | | | | | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b am: f1546892e1Tianjie Xu2017-05-171-13/+13
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675bTianjie Xu2017-05-171-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76Tianjie Xu2017-05-171-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message""Tianjie Xu2017-05-171-13/+13
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message""Tianjie Xu2017-05-171-13/+13
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Fix the input parameter for "set_retry_bootloader_message"Tianjie Xu2017-05-171-13/+13
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c am: 9539cdb3c0Tao Bao2017-05-131-3/+5
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4cTao Bao2017-05-121-3/+5
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6bTao Bao2017-05-121-3/+5
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0."Tao Bao2017-05-121-3/+5
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0."Tao Bao2017-05-121-3/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0.Tao Bao2017-05-121-3/+5
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fc am: e89cbd675cTao Bao2017-05-121-7/+16
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fcTao Bao2017-05-121-7/+16
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673Tao Bao2017-05-121-7/+16
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs."Tao Bao2017-05-121-7/+16
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs."Tao Bao2017-05-121-7/+16
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Don't write to /sys/class/android_usb/android0/enable with configfs.Tao Bao2017-05-111-7/+16
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1 am: 8c7c38ca7fTao Bao2017-05-111-19/+22
|\| | | | | | | | | |
| * | | | | | | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1Tao Bao2017-05-111-19/+22
| |\| | | | | | | | |
| | * | | | | | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eedTao Bao2017-05-111-19/+22
| | |\| | | | | | | |
| | | * | | | | | | | Merge "recovery: Skip "/" in setup_install_mounts()."Tao Bao2017-05-111-19/+22
| | | |\| | | | | | |
| | | | * | | | | | | Merge "recovery: Skip "/" in setup_install_mounts()."Tao Bao2017-05-111-19/+22
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | recovery: Skip "/" in setup_install_mounts().Tao Bao2017-05-101-19/+22
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f am: 46938bcf0c am: 09690020fbSteven Moreland2017-05-104-34/+37
|\| | | | | | | | | |
| * | | | | | | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f am: 46938bcf0cSteven Moreland2017-05-104-34/+37
| |\| | | | | | | | |
| | * | | | | | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93fSteven Moreland2017-05-104-34/+37
| | |\| | | | | | | |
| | | * | | | | | | | Merge "otautil: Android.mk -> Android.bp"Steven Moreland2017-05-104-34/+37
| | | |\| | | | | | |
| | | | * | | | | | | Merge "otautil: Android.mk -> Android.bp"Treehugger Robot2017-05-104-34/+37
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | otautil: Android.mk -> Android.bpSteven Moreland2017-05-104-34/+37
* | | | | | | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 am: 1dc25e3e0a am: 1f7e8f6ab6Tao Bao2017-05-091-3/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 am: 1dc25e3e0aTao Bao2017-05-091-3/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643Tao Bao2017-05-091-3/+1
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources."Tao Bao2017-05-091-3/+1
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources."Tao Bao2017-05-091-3/+1
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | recovery: Use libverifier instead of rebuilding the sources.Tao Bao2017-05-081-3/+1
| | | | | |/ / / / / / /
* | | | | | | | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fc am: f49c57643dTao Bao2017-05-093-33/+103
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fcTao Bao2017-05-093-33/+103
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aadaTao Bao2017-05-093-33/+103
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Add a binary path param to update_binary_command()."Tao Bao2017-05-093-33/+103
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Add a binary path param to update_binary_command()."Tao Bao2017-05-093-33/+103
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Add a binary path param to update_binary_command().Tao Bao2017-05-083-33/+103
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783 am: 5975ee6a46Jin Qian2017-05-051-3/+3
|\| | | | | | | | | |
| * | | | | | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783Jin Qian2017-05-051-3/+3
| |\| | | | | | | | |
| | * | | | | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abcaJin Qian2017-05-051-3/+3
| | |\| | | | | | | |
| | | * | | | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0"Jin Qian2017-05-051-3/+3
| | | |\| | | | | | |
| | | | * | | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0"Treehugger Robot2017-05-051-3/+3
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0Jin Qian2017-05-051-3/+3
* | | | | | | | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 am: e452c25620 am: 4ab07dfcd3Tianjie Xu2017-05-041-1/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 am: e452c25620Tianjie Xu2017-05-041-1/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7Tianjie Xu2017-05-041-1/+0
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Update the comment for obsolete symlink handling ."Tianjie Xu2017-05-041-1/+0
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Update the comment for obsolete symlink handling ."Treehugger Robot2017-05-041-1/+0
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Update the comment for obsolete symlink handling .Tianjie Xu2017-05-041-1/+0
| | | | | |/ / / / / / /
* | | | | | | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 am: 1d33e0815d am: a51e44cef7Tao Bao2017-05-043-4/+4
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 am: 1d33e0815dTao Bao2017-05-043-4/+4
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581Tao Bao2017-05-043-4/+4
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros.""Tao Bao2017-05-043-4/+4
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros.""Tao Bao2017-05-043-4/+4
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Revert "Remove EXPAND/STRINGIFY macros."Tao Bao2017-05-043-4/+4
* | | | | | | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866 am: 6bea344d7eTao Bao2017-05-044-141/+161
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866Tao Bao2017-05-044-141/+161
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaeaTao Bao2017-05-044-141/+161
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096."Tao Bao2017-05-044-141/+161
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096."Tao Bao2017-05-044-141/+161
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | fuse_sideload: Change the minimal block size to 4096.Tao Bao2017-05-034-141/+161
* | | | | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073 am: 5f8d2932d0Tao Bao2017-05-043-4/+4
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073Tao Bao2017-05-043-4/+4
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7Tao Bao2017-05-043-4/+4
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros."Tao Bao2017-05-043-4/+4
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros."Tao Bao2017-05-043-4/+4
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| / / / / / / / | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Remove EXPAND/STRINGIFY macros.Tao Bao2017-05-033-4/+4
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26 am: 7a1c2943abTianjie Xu2017-05-032-7/+10
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26Tianjie Xu2017-05-032-7/+10
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1Tianjie Xu2017-05-032-7/+10
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Add a default error code when updater script aborts"Tianjie Xu2017-05-032-7/+10
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Add a default error code when updater script aborts"Tianjie Xu2017-05-032-7/+10
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Add a default error code when updater script abortsTianjie Xu2017-05-032-7/+10
* | | | | | | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2 am: b3eeb817abTao Bao2017-05-038-142/+114
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2Tao Bao2017-05-038-142/+114
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4cTao Bao2017-05-038-142/+114
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class."Tao Bao2017-05-038-142/+114
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class."Tao Bao2017-05-038-142/+114
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Move sysMapFile and sysReleaseMap into MemMapping class.Tao Bao2017-05-028-142/+114
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3 am: c0c4ae1583 am: a0fb95a386Tao Bao2017-05-022-75/+77
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3 am: c0c4ae1583Tao Bao2017-05-022-75/+77
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3Tao Bao2017-05-022-75/+77
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "recovery: Change install_package() to take std::string."Tao Bao2017-05-022-75/+77
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "recovery: Change install_package() to take std::string."Tao Bao2017-05-022-75/+77
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | recovery: Change install_package() to take std::string.Tao Bao2017-05-012-75/+77
* | | | | | | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481 am: 139a6dd9e2Tao Bao2017-05-013-101/+96
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481Tao Bao2017-05-013-101/+96
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9Tao Bao2017-05-013-101/+96
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter."Tao Bao2017-05-013-101/+96
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter."Tao Bao2017-05-013-101/+96
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | adb_install: Stop passing RecoveryUI as a parameter.Tao Bao2017-05-013-101/+96
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c am: 4cc6889da8Tao Bao2017-04-291-1/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82cTao Bao2017-04-291-1/+2
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277Tao Bao2017-04-291-1/+2
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "minui: Fix breakage in graphics_adf."Tao Bao2017-04-291-1/+2
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "minui: Fix breakage in graphics_adf."Tao Bao2017-04-291-1/+2
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | minui: Fix breakage in graphics_adf.Alistair Strachan2017-04-291-1/+2
* | | | | | | | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3e am: 711e8b649dTianjie Xu2017-04-281-6/+11
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3eTianjie Xu2017-04-281-6/+11
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3cTianjie Xu2017-04-281-6/+11
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Fix potential OOM in update_verifier"Tianjie Xu2017-04-281-6/+11
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Fix potential OOM in update_verifier"Tianjie Xu2017-04-281-6/+11
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Fix potential OOM in update_verifierTianjie Xu2017-04-271-6/+11
| | | | | |/ / / / / / /
* | | | | | | | | | | | Adding support for quiescent reboot to recovery am: ed9db0fd73Dmitri Plotnikov2017-04-280-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Adding support for quiescent reboot to recoveryDmitri Plotnikov2017-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Adding support for quiescent reboot to recoveryDmitri Plotnikov2017-04-284-8/+27
* | | | | | | | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093 am: 533ad31cc1Dmitri Plotnikov2017-04-284-8/+27
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093Dmitri Plotnikov2017-04-284-8/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77Dmitri Plotnikov2017-04-284-8/+27
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Adding support for quiescent reboot to recovery"Dmitri Plotnikov2017-04-284-8/+27
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "Adding support for quiescent reboot to recovery"Treehugger Robot2017-04-284-8/+27
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Adding support for quiescent reboot to recoveryDmitri Plotnikov2017-04-194-8/+27
* | | | | | | | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6 am: c7410924a3Tao Bao2017-04-276-16/+179
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6Tao Bao2017-04-276-16/+179
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955Tao Bao2017-04-276-16/+179
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Separate libupdate_verifier module and add testcases."Tao Bao2017-04-276-16/+179
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Separate libupdate_verifier module and add testcases."Tao Bao2017-04-276-16/+179
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Separate libupdate_verifier module and add testcases.Tao Bao2017-04-276-16/+179
* | | | | | | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 am: 74812187c0 am: 67dc335646Tao Bao2017-04-272-5/+6
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 am: 74812187c0Tao Bao2017-04-272-5/+6
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43Tao Bao2017-04-272-5/+6
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module."Tao Bao2017-04-272-5/+6
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module."Tao Bao2017-04-272-5/+6
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | libfusesideload: Clean up the CFLAGS for the module.Tao Bao2017-04-272-5/+6
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61 am: 7ee4b7dd84Tao Bao2017-04-262-31/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61Tao Bao2017-04-262-31/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1Tao Bao2017-04-262-31/+1
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"."Tao Bao2017-04-262-31/+1
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"."Tao Bao2017-04-262-31/+1
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | applypatch: Remove the obsolete support for "applypatch -s".Tao Bao2017-04-262-31/+1
* | | | | | | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 am: 282c863524 am: 3dcc24490bTao Bao2017-04-261-1/+4
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 am: 282c863524Tao Bao2017-04-261-1/+4
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915Tao Bao2017-04-261-1/+4
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow."Tao Bao2017-04-261-1/+4
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow."Tao Bao2017-04-261-1/+4
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | applypatch: Add determine the return value of ApplyDiffPatch andJinguang Dong2017-04-261-1/+4
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 am: f849ff34d4 am: c798cf2531Tao Bao2017-04-251-9/+11
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 am: f849ff34d4Tao Bao2017-04-251-9/+11
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095Tao Bao2017-04-251-9/+11
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE."Tao Bao2017-04-251-9/+11
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE."Tao Bao2017-04-251-9/+11
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | minadbd: Fix a failing test due to SIGPIPE.Tao Bao2017-04-251-9/+11
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28 am: 36683d0fc8Tao Bao2017-04-252-3/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28Tao Bao2017-04-252-3/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012Tao Bao2017-04-252-3/+0
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "recovery: Remove the include of adb.h."Tao Bao2017-04-252-3/+0
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "recovery: Remove the include of adb.h."Tao Bao2017-04-252-3/+0
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | recovery: Remove the include of adb.h.Tao Bao2017-04-242-3/+0
| | | | |/ / / / / / / /
* | | | | | | | | | | | Add more tests for verify_package_compatibility(). am: b4c0de6c7b -s oursTao Bao2017-04-250-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Add more tests for verify_package_compatibility().Tao Bao2017-04-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Add more tests for verify_package_compatibility().Tao Bao2017-04-241-0/+84
* | | | | | | | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87 am: 54f8988cfeTao Bao2017-04-241-0/+84
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87Tao Bao2017-04-241-0/+84
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84Tao Bao2017-04-241-0/+84
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Add more tests for verify_package_compatibility()."Tao Bao2017-04-241-0/+84
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "Add more tests for verify_package_compatibility()."Tao Bao2017-04-241-0/+84
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Add more tests for verify_package_compatibility().Tao Bao2017-04-201-0/+84
* | | | | | | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8a am: f4a8d0bba6Tao Bao2017-04-241-49/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8aTao Bao2017-04-241-49/+2
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960dbTao Bao2017-04-241-49/+2
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test."Tao Bao2017-04-241-49/+2
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test."Tao Bao2017-04-241-49/+2
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | tests: Remove obsolete classes in applypatch_test.Tao Bao2017-04-211-49/+2
| | | | | |/ / / / / / / /
* | | | | | | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d am: 0cf72f0f14 am: c179ac9238Tao Bao2017-04-242-2/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d am: 0cf72f0f14Tao Bao2017-04-242-2/+2
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3dTao Bao2017-04-242-2/+2
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall."Tao Bao2017-04-242-2/+2
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall."Tao Bao2017-04-242-2/+2
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | librecovery: Remove -Wno-unused-parameter and add -Wall.Tao Bao2017-04-242-2/+2
| | | | | |/ / / / / / / /
* | | | | | | | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033 am: 0cd8986bc2Tianjie Xu2017-04-221-4/+12
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033Tianjie Xu2017-04-221-4/+12
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849dTianjie Xu2017-04-221-4/+12
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Reboot the device on user build after the install fails"Tianjie Xu2017-04-221-4/+12
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Reboot the device on user build after the install fails"Treehugger Robot2017-04-221-4/+12
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Reboot the device on user build after the install failsTianjie Xu2017-04-221-4/+12
| | | | | | |_|/ / / / / / | | | | | |/| | | | | | |
* | | | | | | | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7 am: 33a8900d2bTianjie Xu2017-04-201-9/+7
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7Tianjie Xu2017-04-201-9/+7
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3Tianjie Xu2017-04-201-9/+7
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Minor clean up to minadbd_services.cpp"Tianjie Xu2017-04-201-9/+7
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Minor clean up to minadbd_services.cpp"Tianjie Xu2017-04-201-9/+7
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Minor clean up to minadbd_services.cppTianjie Xu2017-04-191-9/+7
| | | | | |/ / / / / / /
* | | | | | | | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc am: d7a065eb1cTao Bao2017-04-200-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abccTao Bao2017-04-200-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23Tao Bao2017-04-203-5/+17
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Call libvintf to verify package compatibility."Tao Bao2017-04-203-5/+17
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Call libvintf to verify package compatibility."Tao Bao2017-04-203-5/+17
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Call libvintf to verify package compatibility.Tao Bao2017-04-203-5/+17
* | | | | | | | | | | | | Call libvintf to verify package compatibility. am: da320ac6abTao Bao2017-04-203-5/+17
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Call libvintf to verify package compatibility.Tao Bao2017-04-203-5/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Call libvintf to verify package compatibility.Tao Bao2017-04-193-5/+17
* | | | | | | | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0 am: 7b9b77f445Tao Bao2017-04-192-43/+89
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0Tao Bao2017-04-192-43/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950Tao Bao2017-04-192-43/+89
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Add tests for read_metadata_from_package()."Tao Bao2017-04-192-43/+89
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge "Add tests for read_metadata_from_package()."Tao Bao2017-04-192-43/+89
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Add tests for read_metadata_from_package().Tao Bao2017-04-192-43/+89
* | | | | | | | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-dev am: 464c6ba9f8Tianjie Xu2017-04-190-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-devTianjie Xu2017-04-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-devTianjie Xu2017-04-191-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Add 'system' to update_verifier's gidTianjie Xu2017-04-191-2/+2
* | | | | | | | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d am: 6650c0426fTao Bao2017-04-191-66/+61
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233dTao Bao2017-04-191-66/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1Tao Bao2017-04-191-66/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "Minor clean up to install.cpp."Tao Bao2017-04-191-66/+61
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "Minor clean up to install.cpp."Tao Bao2017-04-191-66/+61
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Minor clean up to install.cpp.Tao Bao2017-04-191-66/+61
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | Merge "Add tests for update_binary_command()." into oc-dev am: a6084f8c9b -s oursTao Bao2017-04-190-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Add tests for update_binary_command()." into oc-devTao Bao2017-04-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add tests for update_binary_command()." into oc-devTao Bao2017-04-194-82/+199
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Add tests for update_binary_command().Tao Bao2017-04-194-82/+199
* | | | | | | | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7 am: d218dca8f9Tao Bao2017-04-194-82/+198
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7Tao Bao2017-04-194-82/+198
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5Tao Bao2017-04-194-82/+198
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "Add tests for update_binary_command()."Tao Bao2017-04-194-82/+198
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "Add tests for update_binary_command()."Tao Bao2017-04-194-82/+198
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Add tests for update_binary_command().Tao Bao2017-04-184-82/+198
* | | | | | | | | | | | | | init.rc: Remove sys.powerctl action am: 37ac94978cTom Cherry2017-04-180-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | init.rc: Remove sys.powerctl actionTom Cherry2017-04-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | init.rc: Remove sys.powerctl actionTom Cherry2017-04-181-3/+0
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f am: 4575986069 am: 239d154869Tianjie Xu2017-04-181-2/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f am: 4575986069Tianjie Xu2017-04-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6fTianjie Xu2017-04-181-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Add 'system' to update_verifier's gid"Tianjie Xu2017-04-181-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge "Add 'system' to update_verifier's gid"Tianjie Xu2017-04-181-2/+2
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Add 'system' to update_verifier's gidTianjie Xu2017-04-181-2/+2
* | | | | | | | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088 am: 9fcc7c8253 am: 6e575ccd0fTom Cherry2017-04-181-3/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088 am: 9fcc7c8253Tom Cherry2017-04-181-3/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088Tom Cherry2017-04-181-3/+0
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "init.rc: Remove sys.powerctl action"Tom Cherry2017-04-181-3/+0
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "init.rc: Remove sys.powerctl action"Tom Cherry2017-04-181-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | init.rc: Remove sys.powerctl actionTom Cherry2017-04-181-3/+0
* | | | | | | | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293 am: dc388aab8b am: d87bccd567Tao Bao2017-04-180-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293 am: dc388aab8bTao Bao2017-04-180-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293Tao Bao2017-04-181-1/+0
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "Fix the double free in verify_package_compatibility()."Tao Bao2017-04-181-1/+0
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "Fix the double free in verify_package_compatibility()."Tao Bao2017-04-181-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Fix the double free in verify_package_compatibility().Tao Bao2017-04-181-1/+0
* | | | | | | | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5 am: 35849591a0 -s oursTao Bao2017-04-180-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5Tao Bao2017-04-180-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32dTao Bao2017-04-186-5/+164
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge changes from topic 'libvintf'Tao Bao2017-04-186-5/+164
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge changes from topic 'libvintf'Tao Bao2017-04-186-5/+164
| | | | |\| | | | | | | | | |
| | | | | * | | | | | | | | | Add the missing LOCAL_CFLAGS for librecovery.Tao Bao2017-04-181-0/+5
| | | | | * | | | | | | | | | Verify the package compatibility with libvintf.Tao Bao2017-04-136-5/+159
| | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
* | | | | | | | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 am: 7e031fdfe6 am: fdc5ac8051Tao Bao2017-04-182-21/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 am: 7e031fdfe6Tao Bao2017-04-182-21/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2Tao Bao2017-04-182-21/+0
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "libmounts: Remove two dead functions."Tao Bao2017-04-182-21/+0
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "libmounts: Remove two dead functions."Tao Bao2017-04-182-21/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | libmounts: Remove two dead functions.Tao Bao2017-04-172-21/+0
| | | | | |/ / / / / / / /
* | | | | | | | | | | | | Fix the double free in verify_package_compatibility(). am: f978278995Tao Bao2017-04-171-1/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Fix the double free in verify_package_compatibility().Tao Bao2017-04-171-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix the double free in verify_package_compatibility().Tao Bao2017-04-171-1/+0
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595 am: 0836159ce1 am: 572b7ba1bcJosh Gao2017-04-141-27/+3
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595 am: 0836159ce1Josh Gao2017-04-141-27/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595Josh Gao2017-04-141-27/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "minadbd: switch adb_thread_create to std::thread."Josh Gao2017-04-141-27/+3
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "minadbd: switch adb_thread_create to std::thread."Josh Gao2017-04-141-27/+3
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | minadbd: switch adb_thread_create to std::thread.Josh Gao2017-04-131-27/+3
| | | | |/ / / / / / /
* | | | | | | | | | | Add the missing LOCAL_CFLAGS for librecovery. am: 25dbe1717eTao Bao2017-04-131-0/+5
|\| | | | | | | | | |
| * | | | | | | | | | Add the missing LOCAL_CFLAGS for librecovery.Tao Bao2017-04-131-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Add the missing LOCAL_CFLAGS for librecovery.Tao Bao2017-04-131-0/+5
* | | | | | | | | | | Verify the package compatibility with libvintf. am: 62e0bc7586Tao Bao2017-04-136-5/+159
|\| | | | | | | | | |
| * | | | | | | | | | Verify the package compatibility with libvintf.Tao Bao2017-04-136-5/+159
| |\| | | | | | | | |
| | * | | | | | | | | Verify the package compatibility with libvintf.Tao Bao2017-04-126-5/+159
* | | | | | | | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 am: 461188865b am: 41bdd91780Tianjie Xu2017-04-112-3/+22
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 am: 461188865bTianjie Xu2017-04-112-3/+22
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33Tianjie Xu2017-04-112-3/+22
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Protect filename_cache with lock in ota fault"Tianjie Xu2017-04-112-3/+22
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge "Protect filename_cache with lock in ota fault"Tianjie Xu2017-04-112-3/+22
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Protect filename_cache with lock in ota faultTianjie Xu2017-04-112-3/+22
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9 am: 955c5ebeceTianjie Xu2017-04-102-4/+92
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9Tianjie Xu2017-04-102-4/+92
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48Tianjie Xu2017-04-102-4/+92
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Abort the update if there's not enough new data"Tianjie Xu2017-04-102-4/+92
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Abort the update if there's not enough new data"Tianjie Xu2017-04-102-4/+92
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Abort the update if there's not enough new dataTianjie Xu2017-04-082-4/+92
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1 am: f25cd871ccTao Bao2017-04-053-49/+4
|\| | | | | | | | | |
| * | | | | | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1Tao Bao2017-04-053-49/+4
| |\| | | | | | | | |
| | * | | | | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8Tao Bao2017-04-053-49/+4
| | |\| | | | | | | |
| | | * | | | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc."Tao Bao2017-04-053-49/+4
| | | |\| | | | | | |
| | | | * | | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc."Tao Bao2017-04-053-49/+4
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | tests: Use get_bootloader_message_blk_device() to find /misc.Tao Bao2017-04-053-49/+4
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381 am: c14d0728a7Alex Deymo2017-04-055-0/+448
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381Alex Deymo2017-04-055-0/+448
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976Alex Deymo2017-04-055-0/+448
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Boot control HAL based on the A/B headers."Alex Deymo2017-04-055-0/+448
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Boot control HAL based on the A/B headers."Alex Deymo2017-04-055-0/+448
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Boot control HAL based on the A/B headers.Alex Deymo2017-04-035-0/+448
* | | | | | | | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a am: 7f4e5d55f4Tao Bao2017-04-053-239/+318
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7aTao Bao2017-04-043-239/+318
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41dTao Bao2017-04-043-239/+318
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Change the internal representation in RangeSet."Tao Bao2017-04-043-239/+318
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Change the internal representation in RangeSet."Tao Bao2017-04-043-239/+318
| | | |/| | | | | | | |
| | | | * | | | | | | | Change the internal representation in RangeSet.Tao Bao2017-04-033-239/+318
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "update_verifier: correct group in rc file" into oc-dev am: 5d9fb40ef7Tom Cherry2017-04-040-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | Merge "update_verifier: correct group in rc file" into oc-devTom Cherry2017-04-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "update_verifier: correct group in rc file" into oc-devTreeHugger Robot2017-04-042-3/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | update_verifier: correct group in rc fileTom Cherry2017-04-042-3/+3
* | | | | | | | | | | | update_verifier: tweak priority of update_verifier for quick boot am: 98beba314bWei Wang2017-04-040-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | update_verifier: tweak priority of update_verifier for quick bootWei Wang2017-04-040-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | update_verifier: tweak priority of update_verifier for quick bootWei Wang2017-04-041-2/+2
| | |/ / / / / / / / /
* | | | | | | | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02 am: 2717c28e77 am: bec8264c6fTom Cherry2017-04-042-3/+3
|\| | | | | | | | | |
| * | | | | | | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02 am: 2717c28e77Tom Cherry2017-04-042-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02Tom Cherry2017-04-042-3/+3
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "update_verifier: correct group in rc file"Tom Cherry2017-04-042-3/+3
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge "update_verifier: correct group in rc file"Treehugger Robot2017-04-042-3/+3
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | update_verifier: correct group in rc fileTom Cherry2017-04-042-3/+3
| | | | | | |/ / / / / / | | | | | |/| | | | | |
* | | | | | | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d am: 56e9b9cc26 am: 8ed4fd4b69Wei Wang2017-04-041-2/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d am: 56e9b9cc26Wei Wang2017-04-041-2/+2
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987dWei Wang2017-04-041-2/+2
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot"Wei Wang2017-04-041-2/+2
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot"Treehugger Robot2017-04-041-2/+2
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | update_verifier: tweak priority of update_verifier for quick bootWei Wang2017-04-031-2/+2
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96e am: 0f72cf5403Tao Bao2017-04-035-468/+0
|\| | | | | | | | | |
| * | | | | | | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96eTao Bao2017-04-035-468/+0
| |\| | | | | | | | |
| | * | | | | | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895Tao Bao2017-04-035-468/+0
| | |\| | | | | | | |
| | | * | | | | | | | Merge "applypatch: Remove duplicate test files."Tao Bao2017-04-035-468/+0
| | | |\| | | | | | |
| | | | * | | | | | | Merge "applypatch: Remove duplicate test files."Tao Bao2017-04-035-468/+0
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | applypatch: Remove duplicate test files.Tao Bao2017-04-025-468/+0
* | | | | | | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 am: a982e53a6e am: 78e277cd42Tao Bao2017-04-031-160/+157
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 am: a982e53a6eTao Bao2017-04-031-160/+157
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2Tao Bao2017-04-031-160/+157
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr."Tao Bao2017-04-031-160/+157
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr."Tao Bao2017-04-031-160/+157
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | updater: Keep the parsed parameters in std::unique_ptr.Tao Bao2017-03-311-160/+157
| | | | | |/ / / / / / /
* | | | | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8 am: 8dcbd1b399Tianjie Xu2017-04-020-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8Tianjie Xu2017-04-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573Tianjie Xu2017-04-021-3/+4
* | | | | | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2 am: 253e223799 -s oursTianjie Xu2017-04-020-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2Tianjie Xu2017-04-020-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfeTianjie Xu2017-04-021-26/+33
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479 -s ours am: bdf8a3106c -s oursBill Yi2017-04-020-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479 -s oursBill Yi2017-04-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2017-04-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-04-0278-312/+390
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-04-0278-312/+390
* | | | | | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8Tianjie Xu2017-04-021-3/+4
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573Tianjie Xu2017-04-021-3/+4
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6Tianjie Xu2017-04-021-3/+4
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Use regular check for partition name instead of CHECK()"Tianjie Xu2017-04-021-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | / / / / / / / | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "Use regular check for partition name instead of CHECK()"Tianjie Xu2017-04-021-3/+4
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Use regular check for partition name instead of CHECK()Tianjie Xu2017-04-011-3/+4
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2Tianjie Xu2017-04-011-26/+33
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfeTianjie Xu2017-04-011-26/+33
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81eTianjie Xu2017-04-011-26/+33
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Update_verifier should read blocks in EIO mode"Tianjie Xu2017-04-011-26/+33
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Update_verifier should read blocks in EIO mode"Tianjie Xu2017-04-011-26/+33
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Update_verifier should read blocks in EIO modeTianjie Xu2017-03-311-26/+33
* | | | | | | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01 am: 3cf1113021Tao Bao2017-03-314-110/+199
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01Tao Bao2017-03-314-110/+199
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7Tao Bao2017-03-314-110/+199
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet."Tao Bao2017-03-314-110/+199
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet."Tao Bao2017-03-314-110/+199
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Move parse_range() and range_overlaps() into RangeSet.Tao Bao2017-03-314-110/+199
* | | | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 am: d8df5485ebTianjie Xu2017-03-310-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301Tianjie Xu2017-03-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfcTianjie Xu2017-03-314-9/+159
* | | | | | | | | | | | | recovery: switch to fs_mgr_read_fstab_default() am: 930247241fBowgo Tsai2017-03-310-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | recovery: switch to fs_mgr_read_fstab_default()Bowgo Tsai2017-03-310-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | recovery: switch to fs_mgr_read_fstab_default()Bowgo Tsai2017-03-311-2/+2
* | | | | | | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 am: 0e728806f3 am: 18cc5b330aBowgo Tsai2017-03-311-2/+2
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 am: 0e728806f3Bowgo Tsai2017-03-311-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6Bowgo Tsai2017-03-311-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()"Bowgo Tsai2017-03-311-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()"Treehugger Robot2017-03-311-2/+2
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | recovery: switch to fs_mgr_read_fstab_default()Bowgo Tsai2017-03-291-2/+2
* | | | | | | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb am: 7ccb4090d1 am: 8538fab040Tao Bao2017-03-311-164/+146
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb am: 7ccb4090d1Tao Bao2017-03-311-164/+146
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bbTao Bao2017-03-311-164/+146
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState."Tao Bao2017-03-311-164/+146
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState."Tao Bao2017-03-311-164/+146
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | updater: Move RangeSinkWrite into RangeSinkState.Tao Bao2017-03-291-164/+146
| | | | | |/ / / / / / / /
* | | | | | | | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac am: 08224f745c am: f39093d968Tao Bao2017-03-302-9/+10
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac am: 08224f745cTao Bao2017-03-302-9/+10
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eacTao Bao2017-03-302-9/+10
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "updater: Don't append newline when calling uiPrint()."Tao Bao2017-03-302-9/+10
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "updater: Don't append newline when calling uiPrint()."Tao Bao2017-03-302-9/+10
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | updater: Don't append newline when calling uiPrint().Tao Bao2017-03-302-9/+10
* | | | | | | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781f am: 4d6f904a88Tao Bao2017-03-301-4/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781fTao Bao2017-03-301-4/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1dTao Bao2017-03-301-4/+0
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES."Tao Bao2017-03-301-4/+0
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES."Treehugger Robot2017-03-301-4/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES.Tao Bao2017-03-301-4/+0
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5f am: 57bb313b1eDan Shi2017-03-304-0/+60
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5fDan Shi2017-03-304-0/+60
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Add test config to minadbd_test" am: df1a585504Dan Shi2017-03-304-0/+60
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Add test config to minadbd_test"Dan Shi2017-03-304-0/+60
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Add test config to minadbd_test"Treehugger Robot2017-03-304-0/+60
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Add test config to minadbd_testDan Shi2017-03-294-0/+60
* | | | | | | | | | | | | | update_verifier: raise priority and ioprio and start with exec_start am: beaa39bc23Tom Cherry2017-03-300-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | update_verifier: raise priority and ioprio and start with exec_startTom Cherry2017-03-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | update_verifier: raise priority and ioprio and start with exec_startTom Cherry2017-03-292-0/+13
* | | | | | | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 am: 8fe39a28b0 am: e404f5d9c8Tom Cherry2017-03-292-0/+13
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 am: 8fe39a28b0Tom Cherry2017-03-292-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813Tom Cherry2017-03-292-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start"Tom Cherry2017-03-292-0/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start"Treehugger Robot2017-03-292-0/+13
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | update_verifier: raise priority and ioprio and start with exec_startTom Cherry2017-03-292-0/+13
| | | | | | |_|/ / / / / / | | | | | |/| | | | | | |
* | | | | | | | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198 am: 23fe20fb6e am: cbc90e5c2cTao Bao2017-03-292-10/+22
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198 am: 23fe20fb6eTao Bao2017-03-292-10/+22
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198Tao Bao2017-03-292-10/+22
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Log the error message when failing to mount/umount."Tao Bao2017-03-292-10/+22
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "Log the error message when failing to mount/umount."Tao Bao2017-03-292-10/+22
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Log the error message when failing to mount/umount.Tao Bao2017-03-292-10/+22
* | | | | | | | | | | | | | Fix the bad merge (duplicate tests).Tao Bao2017-03-291-45/+0
* | | | | | | | | | | | | | resolve merge conflicts of 39ef2d7f to oc-dev-plus-aospTao Bao2017-03-291-0/+45
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | resolve merge conflicts of 39ef2d7f to oc-dev-plus-aospTao Bao2017-03-293-3/+46
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." am: 3f2d35522aTao Bao2017-03-293-3/+46
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest."Tao Bao2017-03-293-3/+46
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest."Tao Bao2017-03-293-3/+46
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | tests: Construct two bad packages at runtime for VerifierTest.Tao Bao2017-03-283-3/+46
| | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
* | | | | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0 am: 0a599567ceTianjie Xu2017-03-290-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0Tianjie Xu2017-03-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9Tianjie Xu2017-03-2930-24/+45
* | | | | | | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937 am: 62a4e5ca98Tao Bao2017-03-291-103/+82
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937Tao Bao2017-03-291-103/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37Tao Bao2017-03-291-103/+82
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest."Tao Bao2017-03-291-103/+82
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest."Tao Bao2017-03-291-103/+82
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | tests: Add a test for --wipe_ab into UncryptTest.Tao Bao2017-03-281-103/+82
* | | | | | | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b am: 05c111b90b am: 6835d52c7eTianjie Xu2017-03-281-0/+3
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b am: 05c111b90bTianjie Xu2017-03-281-0/+3
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282bTianjie Xu2017-03-281-0/+3
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy"Tianjie Xu2017-03-281-0/+3
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy"Treehugger Robot2017-03-281-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Suppress the unused variable warning in parser.yyTianjie Xu2017-03-281-0/+3
| | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | |
* | | | | | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301Tianjie Xu2017-03-284-9/+159
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfcTianjie Xu2017-03-284-9/+159
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97fTianjie Xu2017-03-284-9/+159
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Log temperature during OTA update"Tianjie Xu2017-03-284-9/+159
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge "Log temperature during OTA update"Tianjie Xu2017-03-284-9/+159
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Log temperature during OTA updateTianjie Xu2017-03-284-9/+159
| | | | | |/ / / / / / / / / /
* | | | | | | | | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest."Tao Bao2017-03-283-3/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tests: Construct two bad packages at runtime for VerifierTest.Tao Bao2017-03-283-3/+46
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0Tianjie Xu2017-03-2830-24/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9Tianjie Xu2017-03-2830-24/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636Tianjie Xu2017-03-2830-24/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header"Tianjie Xu2017-03-2830-24/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header"Tianjie Xu2017-03-2830-24/+45
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | Add the missing sr-Latn into png files and rename the png locale headerTianjie Xu2017-03-2530-24/+45
* | | | | | | | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523 am: a2015e0d86Tao Bao2017-03-287-161/+128
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523Tao Bao2017-03-287-161/+128
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6dTao Bao2017-03-287-161/+128
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge changes from topic 'sinkfn'Tao Bao2017-03-287-161/+128
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge changes from topic 'sinkfn'Treehugger Robot2017-03-287-231/+190
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | applypatch: Let Apply{BSDiff,Image}Patch accept std::function.Tao Bao2017-03-287-161/+128
* | | | | | | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941 am: 52569ce2edTao Bao2017-03-287-89/+81
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941Tao Bao2017-03-287-89/+81
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7Tao Bao2017-03-287-89/+81
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t.Tao Bao2017-03-287-89/+81
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t.Tao Bao2017-03-287-89/+81
| | | | |/ / / / / / / / / /
* | | | | | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d am: 21b5268fbdTao Bao2017-03-280-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069dTao Bao2017-03-281-146/+143
| |\| | | | | | | | | | | | | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069dTao Bao2017-03-281-146/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535Tao Bao2017-03-281-146/+143
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()."Tao Bao2017-03-281-146/+143
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()."Tao Bao2017-03-281-146/+143
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | updater: Clean up LoadSrcTgtVersion2().Tao Bao2017-03-281-146/+143
| | | | | |/ / / / / / | | | | |/| | | | | |
* | | | | | | | | | | Merge "tests: Construct signature-boundary.zip at runtime."Tao Bao2017-03-282-2/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tests: Construct signature-boundary.zip at runtime.Tao Bao2017-03-272-2/+18
* | | | | | | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853 am: b0e768e269Tao Bao2017-03-271-8/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853Tao Bao2017-03-271-8/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot""Tao Bao2017-03-271-8/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot""Tao Bao2017-03-271-8/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Revert "libbootloader_message: use different fstab paths for normal/recovery boot"Bowgo Tsai2017-03-271-8/+2
* | | | | | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours am: a97b0712d8 -s oursTianjie Xu2017-03-270-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s oursTianjie Xu2017-03-270-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache"Tianjie Xu2017-03-270-0/+0
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache"Tianjie Xu2017-03-271-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cacheTianjie Xu2017-03-261-5/+9
| | | | | |_|/ / / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache am: 340e6762f8Tianjie Xu2017-03-270-0/+0
|\| | | | | | | | | | | | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cacheTianjie Xu2017-03-270-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cacheTianjie Xu2017-03-271-5/+9
* | | | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aospTianjie Xu2017-03-271-5/+9
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aospTianjie Xu2017-03-271-5/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cacheTianjie Xu2017-03-261-5/+9
* | | | | | | | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 am: 351f69e64aTao Bao2017-03-262-401/+109
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494Tao Bao2017-03-262-401/+109
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets."Tao Bao2017-03-262-401/+109
| | |\| | | | | | | |
| | | * | | | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets."Tao Bao2017-03-262-401/+109
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | applypatch: Drop the support for patching non-EMMC targets.Tao Bao2017-03-162-401/+109
* | | | | | | | | | | | Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e am: e102ea13eeTianjie Xu2017-03-261-1/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41eTianjie Xu2017-03-261-1/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Don't fail ReadArgs if length to parse is 0"Tianjie Xu2017-03-261-1/+1
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Don't fail ReadArgs if length to parse is 0"Tianjie Xu2017-03-261-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Don't fail ReadArgs if length to parse is 0Tianjie Xu2017-03-231-1/+1
| | | | | |/ / / / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | Merge "updater: Remove some redundant arguments." am: 5212a00588 am: 4ae56a3586Tao Bao2017-03-261-78/+65
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "updater: Remove some redundant arguments." am: 5212a00588Tao Bao2017-03-261-78/+65
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "updater: Remove some redundant arguments."Tao Bao2017-03-261-78/+65
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "updater: Remove some redundant arguments."Tao Bao2017-03-261-78/+65
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | updater: Remove some redundant arguments.Tao Bao2017-03-241-78/+65
* | | | | | | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e am: 85882b0779Bowgo Tsai2017-03-251-2/+8
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1eBowgo Tsai2017-03-251-2/+8
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot"Bowgo Tsai2017-03-251-2/+8
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot"Treehugger Robot2017-03-251-2/+8
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | libbootloader_message: use different fstab paths for normal/recovery bootBowgo Tsai2017-03-251-2/+8
* | | | | | | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c am: 7b82ad12f6Tao Bao2017-03-251-398/+330
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9cTao Bao2017-03-251-398/+330
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2."Tao Bao2017-03-251-398/+330
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2."Tao Bao2017-03-251-398/+330
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | updater: Drop the support for BBOTA v1 and v2.Tao Bao2017-03-241-398/+330
| | | | | |/ / / / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | Merge "Const modifiers" am: 4efd353d8f am: 92d8772c49Tao Bao2017-03-246-11/+11
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Const modifiers" am: 4efd353d8fTao Bao2017-03-246-11/+11
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Const modifiers"Tao Bao2017-03-246-11/+11
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Const modifiers"Tao Bao2017-03-246-11/+11
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Const modifiersMikhail Lappo2017-03-236-11/+11
* | | | | | | | | | | | | Merge "Removed C-style casts" am: 110155a604 am: 6a831e02b6Tao Bao2017-03-243-3/+3
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Removed C-style casts" am: 110155a604Tao Bao2017-03-243-3/+3
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Removed C-style casts"Tao Bao2017-03-243-3/+3
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Removed C-style casts"Tao Bao2017-03-243-3/+3
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Removed C-style castsMikhail Lappo2017-03-233-3/+3
* | | | | | | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6 am: 5da7e41ec8Tao Bao2017-03-241-37/+35
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6Tao Bao2017-03-241-37/+35
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()."Tao Bao2017-03-241-37/+35
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()."Tao Bao2017-03-241-37/+35
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Fix the wrong parameter when calling read_metadata_from_package().Tao Bao2017-03-241-37/+35
| | | | | |/ / / / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 am: eddc9a15f9Paul Crowley2017-03-241-4/+6
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89Paul Crowley2017-03-241-4/+6
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Reword the wipe warning message to be more comprehensible."Paul Crowley2017-03-241-4/+6
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Reword the wipe warning message to be more comprehensible."Treehugger Robot2017-03-241-4/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Reword the wipe warning message to be more comprehensible.Paul Crowley2017-03-231-4/+6
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "Redundant checking of STL container element" am: b56a3c2e3a am: 9e05f26e1aTao Bao2017-03-231-3/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Redundant checking of STL container element" am: b56a3c2e3aTao Bao2017-03-231-3/+1
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Redundant checking of STL container element"Tao Bao2017-03-231-3/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Redundant checking of STL container element"Tao Bao2017-03-231-3/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Redundant checking of STL container elementMikhail Lappo2017-03-231-3/+1
* | | | | | | | | | | Merge "Checking unsigned variable less than zero" am: 0d264bf088 am: 957f6491f8Tao Bao2017-03-231-2/+2
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Checking unsigned variable less than zero" am: 0d264bf088Tao Bao2017-03-231-2/+2
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Checking unsigned variable less than zero"Tao Bao2017-03-231-2/+2
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Checking unsigned variable less than zero"Tao Bao2017-03-231-2/+2
| | | |\| | | | | | |
| | | | * | | | | | | Checking unsigned variable less than zeroMikhail Lappo2017-03-231-2/+2
* | | | | | | | | | | Merge "Fixed scanf modifier" am: 577c668861 am: d414ae465eTao Bao2017-03-231-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Fixed scanf modifier" am: 577c668861Tao Bao2017-03-231-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Fixed scanf modifier"Tao Bao2017-03-231-1/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Fixed scanf modifier"Tao Bao2017-03-231-1/+1
| | | |\| | | | | | |
| | | | * | | | | | | Fixed scanf modifierMikhail Lappo2017-03-231-1/+1
* | | | | | | | | | | Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d am: 923d41ccd5Tao Bao2017-03-232-1/+50
|\| | | | | | | | | |
| * | | | | | | | | | Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657dTao Bao2017-03-232-1/+50
| |\| | | | | | | | |
| | * | | | | | | | | Merge "updater: Fix the broken case for apply_patch_check()."Tao Bao2017-03-232-1/+50
| | |\| | | | | | | |
| | | * | | | | | | | Merge "updater: Fix the broken case for apply_patch_check()."Tao Bao2017-03-232-1/+50
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | updater: Fix the broken case for apply_patch_check().Tao Bao2017-03-232-1/+50
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e am: ca9c1e0965Tao Bao2017-03-231-2/+3
|\| | | | | | | | | |
| * | | | | | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4eTao Bao2017-03-231-2/+3
| |\| | | | | | | | |
| | * | | | | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM."Tao Bao2017-03-231-2/+3
| | |\| | | | | | | |
| | | * | | | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM."Tao Bao2017-03-231-2/+3
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | recovery: Replace the hard-coded 1000 with AID_SYSTEM.Tao Bao2017-03-221-2/+3
* | | | | | | | | | | Merge "Remove malloc in edify functions" am: 1ea869b0c6 am: 137d85333eTianjie Xu2017-03-239-257/+331
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Remove malloc in edify functions" am: 1ea869b0c6Tianjie Xu2017-03-239-257/+331
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Remove malloc in edify functions"Tianjie Xu2017-03-239-257/+331
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Remove malloc in edify functions"Tianjie Xu2017-03-239-257/+331
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Remove malloc in edify functionsTianjie Xu2017-03-229-257/+331
| | | |/ / / / / / /
* | | | | | | | | | Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a am: deb2a29a42Tianjie Xu2017-03-221-0/+12
|\| | | | | | | | |
| * | | | | | | | | Merge "Fix the permission of stashed blocks created by updater" am: d882b8892aTianjie Xu2017-03-221-0/+12
| |\| | | | | | | |
| | * | | | | | | | Merge "Fix the permission of stashed blocks created by updater"Tianjie Xu2017-03-221-0/+12
| | |\| | | | | | |
| | | * | | | | | | Merge "Fix the permission of stashed blocks created by updater"Tianjie Xu2017-03-221-0/+12
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix the permission of stashed blocks created by updaterTianjie Xu2017-03-221-0/+12
* | | | | | | | | | | Merge "Refactor asn1_decoder functions into a class." am: ea3d0b923d am: d7846b7303Tao Bao2017-03-224-410/+361
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Refactor asn1_decoder functions into a class." am: ea3d0b923dTao Bao2017-03-224-410/+361
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Refactor asn1_decoder functions into a class."Tao Bao2017-03-224-410/+361
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Refactor asn1_decoder functions into a class."Tao Bao2017-03-224-410/+361
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Refactor asn1_decoder functions into a class.Tao Bao2017-03-214-410/+361
* | | | | | | | | | | | Merge "Fix updater include generation w/installclean" am: 6d0262218a am: c1cb30f842Dan Willemsen2017-03-221-16/+4
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Fix updater include generation w/installclean" am: 6d0262218aDan Willemsen2017-03-221-16/+4
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Fix updater include generation w/installclean"Dan Willemsen2017-03-221-16/+4
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Fix updater include generation w/installclean"Treehugger Robot2017-03-221-16/+4
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Fix updater include generation w/installcleanDan Willemsen2017-03-221-16/+4
* | | | | | | | | | | | Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13 am: 43bd2c8414Tao Bao2017-03-216-79/+78
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13Tao Bao2017-03-216-79/+78
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "verify_file: Add constness to a few addresses."Tao Bao2017-03-216-79/+78
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "verify_file: Add constness to a few addresses."Tao Bao2017-03-216-79/+78
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | verify_file: Add constness to a few addresses.Tao Bao2017-03-216-79/+78
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "Add testcases for load_keys()." am: 110102f37e am: 43f5ad6e90Tao Bao2017-03-201-0/+57
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Add testcases for load_keys()." am: 110102f37eTao Bao2017-03-201-0/+57
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Add testcases for load_keys()."Tao Bao2017-03-201-0/+57
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Add testcases for load_keys()."Tao Bao2017-03-201-0/+57
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add testcases for load_keys().Tao Bao2017-03-181-0/+57
* | | | | | | | | | | | Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9 am: b2617e882eTao Bao2017-03-203-8/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9Tao Bao2017-03-203-8/+2
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Remove the dead #include's in verifier.cpp."Tao Bao2017-03-203-8/+2
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Remove the dead #include's in verifier.cpp."Tao Bao2017-03-203-8/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Remove the dead #include's in verifier.cpp.Tao Bao2017-03-183-8/+2
| | | |/ / / / / / / /
* | | | | | | | | | | resolve merge conflicts of 90d3f20c to stage-aosp-master am: 553c7bd307Tao Bao2017-03-180-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | resolve merge conflicts of 90d3f20c to stage-aosp-masterTao Bao2017-03-184-302/+240
| |\| | | | | | | | |
| | * | | | | | | | | resolve merge conflicts of 90d3f20c to stage-aosp-masterTao Bao2017-03-184-302/+240
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Drop the dependency on 'ui' in verify_file()."Tao Bao2017-03-184-297/+235
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Drop the dependency on 'ui' in verify_file().Tao Bao2017-03-174-297/+235
* | | | | | | | | | | Merge "Drop the dependency on 'ui' in verify_file()."Tao Bao2017-03-184-303/+241
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Drop the dependency on 'ui' in verify_file().Tao Bao2017-03-174-303/+241
* | | | | | | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46c am: 9accc96dd1Tianjie Xu2017-03-171-6/+140
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46cTianjie Xu2017-03-171-6/+140
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks"""Tianjie Xu2017-03-171-6/+140
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks"""Tianjie Xu2017-03-171-6/+140
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Revert "Revert "Print SHA-1 in hex for corrupted blocks""Tianjie Xu2017-03-171-6/+140
* | | | | | | | | | | | | Merge "Add a test to perform block_image_update" am: 881b08ecd2 am: 5c06706d51Tianjie Xu2017-03-172-6/+123
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Add a test to perform block_image_update" am: 881b08ecd2Tianjie Xu2017-03-172-6/+123
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Add a test to perform block_image_update"Tianjie Xu2017-03-172-6/+123
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "Add a test to perform block_image_update"Tianjie Xu2017-03-172-6/+123
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Add a test to perform block_image_updateTianjie Xu2017-03-172-6/+123
| | | | | |_|/ / / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | Merge "Add the missing #include of <functional>." am: dd553d280f am: 965021ab8dTao Bao2017-03-172-0/+3
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Add the missing #include of <functional>." am: dd553d280fTao Bao2017-03-172-0/+3
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Add the missing #include of <functional>."Tao Bao2017-03-172-0/+3
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Add the missing #include of <functional>."Tao Bao2017-03-172-0/+3
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Add the missing #include of <functional>.Tao Bao2017-03-172-0/+3
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5 am: 91f8574061Tianjie Xu2017-03-176-197/+133
|\| | | | | | | | | |
| * | | | | | | | | | Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5Tianjie Xu2017-03-176-197/+133
| |\| | | | | | | | |
| | * | | | | | | | | Merge "More cleanup to imgdiff & imgpatch"Tianjie Xu2017-03-176-197/+133
| | |\| | | | | | | |
| | | * | | | | | | | Merge "More cleanup to imgdiff & imgpatch"Treehugger Robot2017-03-176-197/+133
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | More cleanup to imgdiff & imgpatchTianjie Xu2017-03-166-197/+133
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612 am: 8209daeff1Tao Bao2017-03-171-73/+50
|\| | | | | | | | | |
| * | | | | | | | | | Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612Tao Bao2017-03-171-73/+50
| |\| | | | | | | | |
| | * | | | | | | | | Merge "updater: Minor clean up to EnumerateStash()."Tao Bao2017-03-171-73/+50
| | |\| | | | | | | |
| | | * | | | | | | | Merge "updater: Minor clean up to EnumerateStash()."Tao Bao2017-03-171-73/+50
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | updater: Minor clean up to EnumerateStash().Tao Bao2017-03-161-73/+50
| | | |/ / / / / / /
* | | | / / / / / / Merge "Revert "Print SHA-1 in hex for corrupted blocks"" am: 06f6227f1d am: 8acce85be8Tao Bao2017-03-151-140/+3
|\| | | | | | | | | | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" am: 06f6227f1dTao Bao2017-03-151-140/+3
| |\| | | | | | |
| | * | | | | | | Merge "Revert "Print SHA-1 in hex for corrupted blocks""Tao Bao2017-03-151-140/+3
| | |\| | | | | |
| | | * | | | | | Merge "Revert "Print SHA-1 in hex for corrupted blocks""Tao Bao2017-03-151-140/+3
| | | |\ \ \ \ \ \
| | | | * | | | | | Revert "Print SHA-1 in hex for corrupted blocks"Tao Bao2017-03-151-140/+3
| | | |/ / / / / /
* | | | | | | | | Merge "updater: Remove some obsoleted functions for file-based OTA." am: 342717d148 am: 000f364c19Tao Bao2017-03-142-475/+0
|\| | | | | | | |
| * | | | | | | | Merge "updater: Remove some obsoleted functions for file-based OTA." am: 342717d148Tao Bao2017-03-142-475/+0
| |\| | | | | | |
| | * | | | | | | Merge "updater: Remove some obsoleted functions for file-based OTA."Tao Bao2017-03-142-475/+0
| | |\| | | | | |
| | | * | | | | | Merge "updater: Remove some obsoleted functions for file-based OTA."Tao Bao2017-03-142-475/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | updater: Remove some obsoleted functions for file-based OTA.Tao Bao2017-03-132-475/+0
* | | | | | | | | | Merge "Print SHA-1 in hex for corrupted blocks" am: 59383b383c am: 821592aff4Tianjie Xu2017-03-131-3/+140
|\| | | | | | | | |
| * | | | | | | | | Merge "Print SHA-1 in hex for corrupted blocks" am: 59383b383cTianjie Xu2017-03-131-3/+140
| |\| | | | | | | |
| | * | | | | | | | Merge "Print SHA-1 in hex for corrupted blocks"Tianjie Xu2017-03-131-3/+140
| | |\| | | | | | |
| | | * | | | | | | Merge "Print SHA-1 in hex for corrupted blocks"Tianjie Xu2017-03-131-3/+140
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Print SHA-1 in hex for corrupted blocksTianjie Xu2017-03-131-3/+140
* | | | | | | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." am: a7211b3c16 am: 6c6861d7c5Tao Bao2017-03-112-0/+9
|\| | | | | | | | |
| * | | | | | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." am: a7211b3c16Tao Bao2017-03-112-0/+9
| |\| | | | | | | |
| | * | | | | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled."Tao Bao2017-03-112-0/+9
| | |\| | | | | | |
| | | * | | | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled."Tao Bao2017-03-112-0/+9
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | update_verifier: Set the success flag if dm-verity is not enabled.Tao Bao2017-03-112-0/+9
| | | |/ / / / / / /
* | | | | | | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 am: 1a23257214Bowgo Tsai2017-03-104-44/+13
|\| | | | | | | | |
| * | | | | | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771Bowgo Tsai2017-03-104-44/+13
| |\| | | | | | | |
| | * | | | | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs"Bowgo Tsai2017-03-104-44/+13
| | |\| | | | | | |
| | | * | | | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs"Treehugger Robot2017-03-104-44/+13
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIsBowgo Tsai2017-03-104-44/+13
| | | |/ / / / / /
* | | | | | | | | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e am: 316610763bTao Bao2017-03-081-99/+94
|\| | | | | | | |
| * | | | | | | | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727eTao Bao2017-03-081-99/+94
| |\| | | | | | |
| | * | | | | | | Merge "recovery: Fix the FIXME in get_menu_selection()."Tao Bao2017-03-081-99/+94
| | |\| | | | | |
| | | * | | | | | Merge "recovery: Fix the FIXME in get_menu_selection()."Tao Bao2017-03-081-99/+94
| | | |\ \ \ \ \ \
| | | | * | | | | | recovery: Fix the FIXME in get_menu_selection().Tao Bao2017-03-081-99/+94
* | | | | | | | | | Merge "recovery: Move a few int to bool." am: cbb2bcf541 am: b97f06a5ddTao Bao2017-03-083-147/+142
|\| | | | | | | | |
| * | | | | | | | | Merge "recovery: Move a few int to bool." am: cbb2bcf541Tao Bao2017-03-083-147/+142
| |\| | | | | | | |
| | * | | | | | | | Merge "recovery: Move a few int to bool."Tao Bao2017-03-083-147/+142
| | |\| | | | | | |
| | | * | | | | | | Merge "recovery: Move a few int to bool."Tao Bao2017-03-083-147/+142
| | | |\| | | | | |
| | | | * | | | | | recovery: Move a few int to bool.Tao Bao2017-03-083-147/+142
| | | |/ / / / / /
* | | | | | | | | Merge "recovery: Add the missing #include." am: b7f56f9b91 am: d988b56999Tao Bao2017-03-071-0/+2
|\| | | | | | | |
| * | | | | | | | Merge "recovery: Add the missing #include." am: b7f56f9b91Tao Bao2017-03-071-0/+2
| |\| | | | | | |
| | * | | | | | | Merge "recovery: Add the missing #include."Tao Bao2017-03-071-0/+2
| | |\| | | | | |
| | | * | | | | | Merge "recovery: Add the missing #include."Tao Bao2017-03-071-0/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | recovery: Add the missing #include.Tao Bao2017-03-071-0/+2
| | | |/ / / / / /
* | | | | | | | | Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90 am: ecf5467a82Tao Bao2017-03-072-14/+5
|\| | | | | | | |
| * | | | | | | | Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90Tao Bao2017-03-072-14/+5
| |\| | | | | | |
| | * | | | | | | Merge "recovery: Drop the "--stages" / '-g' argument."Tao Bao2017-03-072-14/+5
| | |\| | | | | |
| | | * | | | | | Merge "recovery: Drop the "--stages" / '-g' argument."Tao Bao2017-03-072-14/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | recovery: Drop the "--stages" / '-g' argument.Tao Bao2017-03-072-14/+5
* | | | | | | | | | Merge "recovery: Add SetStage() into 'Run graphics test'." am: 1a575f8d5f am: e303128144Tao Bao2017-03-071-25/+37
|\| | | | | | | | |
| * | | | | | | | | Merge "recovery: Add SetStage() into 'Run graphics test'." am: 1a575f8d5fTao Bao2017-03-071-25/+37
| |\| | | | | | | |
| | * | | | | | | | Merge "recovery: Add SetStage() into 'Run graphics test'."Tao Bao2017-03-071-25/+37
| | |\| | | | | | |
| | | * | | | | | | Merge "recovery: Add SetStage() into 'Run graphics test'."Tao Bao2017-03-071-25/+37
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | recovery: Add SetStage() into 'Run graphics test'.Tao Bao2017-03-071-25/+37
| | | | |/ / / / / /
* | | | | | | | | | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1c am: 4a2bde2d26Tao Bao2017-03-071-51/+35
|\| | | | | | | | |
| * | | | | | | | | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1cTao Bao2017-03-071-51/+35
| |\| | | | | | | |
| | * | | | | | | | Merge "recovery: Minor clean up to choose_recovery_file()."Tao Bao2017-03-071-51/+35
| | |\| | | | | | |
| | | * | | | | | | Merge "recovery: Minor clean up to choose_recovery_file()."Tao Bao2017-03-071-51/+35
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | recovery: Minor clean up to choose_recovery_file().Tao Bao2017-03-071-51/+35
| | | |/ / / / / /
* | | | | | | | | Merge "Refractor the code for imgdiff" am: a2e7a07031 am: 68571e27d8Tianjie Xu2017-03-074-618/+653
|\| | | | | | | |
| * | | | | | | | Merge "Refractor the code for imgdiff" am: a2e7a07031Tianjie Xu2017-03-074-618/+653
| |\| | | | | | |
| | * | | | | | | Merge "Refractor the code for imgdiff"Tianjie Xu2017-03-074-618/+653
| | |\| | | | | |
| | | * | | | | | Merge "Refractor the code for imgdiff"Treehugger Robot2017-03-074-618/+653
| | | |\ \ \ \ \ \
| | | | * | | | | | Refractor the code for imgdiffTianjie Xu2017-03-074-618/+653
* | | | | | | | | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab am: 536989892cTianjie Xu2017-03-031-2/+4
|\| | | | | | | | |
| * | | | | | | | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aabTianjie Xu2017-03-031-2/+4
| |\| | | | | | | |
| | * | | | | | | | Merge "Fix an error on bootloadermessager test teardown"Tianjie Xu2017-03-031-2/+4
| | |\| | | | | | |
| | | * | | | | | | Merge "Fix an error on bootloadermessager test teardown"Tianjie Xu2017-03-031-2/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix an error on bootloadermessager test teardownTianjie Xu2017-03-031-2/+4
| | | | |/ / / / / /
* | | | | | | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4f am: 3d605c54e3Wei Wang2017-03-032-0/+22
|\| | | | | | | | |
| * | | | | | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4fWei Wang2017-03-032-0/+22
| |\| | | | | | | |
| | * | | | | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target"Wei Wang2017-03-032-0/+22
| | |\| | | | | | |
| | | * | | | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target"Treehugger Robot2017-03-032-0/+22
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Recovery Test: add SideloadTest to test FUSE support on targetWei Wang2017-03-032-0/+22
| | | |/ / / / / /
* | | | | | | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468eda am: 5cce91a95aTianjie Xu2017-03-013-3/+111
|\| | | | | | | |
| * | | | | | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468edaTianjie Xu2017-03-013-3/+111
| |\| | | | | | |
| | * | | | | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc"Tianjie Xu2017-03-013-3/+111
| | |\| | | | | |
| | | * | | | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc"Treehugger Robot2017-03-013-3/+111
| | | |\ \ \ \ \ \
| | | | * | | | | | Skip BootloaderMessageTest, UncryptTest for devices without /miscTianjie Xu2017-03-013-3/+111
* | | | | | | | | | Merge "recovery: Remember the last log position." am: d549616b24 am: 6691dacf56Tao Bao2017-03-011-1/+2
|\| | | | | | | | |
| * | | | | | | | | Merge "recovery: Remember the last log position." am: d549616b24Tao Bao2017-03-011-1/+2
| |\| | | | | | | |
| | * | | | | | | | Merge "recovery: Remember the last log position."Tao Bao2017-03-011-1/+2
| | |\| | | | | | |
| | | * | | | | | | Merge "recovery: Remember the last log position."Tao Bao2017-03-011-1/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | recovery: Remember the last log position.Tao Bao2017-03-011-1/+2
| | | |/ / / / / /
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-02-281-1/+1
* | | | | | | | | Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503a am: 7c77883b06Tao Bao2017-02-241-1/+0
|\| | | | | | | |
| * | | | | | | | Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503aTao Bao2017-02-241-1/+0
| |\| | | | | | |
| | * | | | | | | Merge "recovery: Don't show "No /cache partition found" on screen."Tao Bao2017-02-241-1/+0
| | |\| | | | | |
| | | * | | | | | Merge "recovery: Don't show "No /cache partition found" on screen."Treehugger Robot2017-02-241-1/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | recovery: Don't show "No /cache partition found" on screen.Tao Bao2017-02-241-1/+0
* | | | | | | | | | Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56 am: cdfe2895b4Elliott Hughes2017-02-241-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56Elliott Hughes2017-02-241-0/+1
| |\| | | | | | | |
| | * | | | | | | | Merge "Add a missing #include for openat(2)."Elliott Hughes2017-02-241-0/+1
| |/| | | | | | | | | | |/ / / / / / /
| | * | | | | | | Merge "Add a missing #include for openat(2)."Elliott Hughes2017-02-241-0/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add a missing #include for openat(2).Elliott Hughes2017-02-231-0/+1
| | |/ / / / / / /
* | | | | | | | | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49 am: 6f06890343Sen Jiang2017-02-165-183/+31
|\| | | | | | | |
| * | | | | | | | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49Sen Jiang2017-02-165-183/+31
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge "Use bspatch from external/bsdiff." am: f9962dbfe2Sen Jiang2017-02-165-183/+31
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Merge "Use bspatch from external/bsdiff."Sen Jiang2017-02-165-183/+31
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Use bspatch from external/bsdiff."Sen Jiang2017-02-165-183/+31
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | | * | | | | | Use bspatch from external/bsdiff.Sen Jiang2017-02-025-183/+31
* | | | | | | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e am: c42d44bbeb am: 19e7776451Tao Bao2017-02-141-92/+55
|\| | | | | | | | | |
| * | | | | | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e am: c42d44bbebTao Bao2017-02-141-92/+55
| |\| | | | | | | | |
| | * | | | | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83eTao Bao2017-02-141-92/+55
| | |\| | | | | | | |
| | | * | | | | | | | Merge "recovery: Clean up browse_directory()."Tao Bao2017-02-141-92/+55
| | | |\| | | | | | |
| | | | * | | | | | | Merge "recovery: Clean up browse_directory()."Tao Bao2017-02-141-92/+55
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | recovery: Clean up browse_directory().Tao Bao2017-02-111-92/+55
* | | | | | | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368 am: b8997adc20Tao Bao2017-02-138-271/+333
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368Tao Bao2017-02-138-271/+333
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279cTao Bao2017-02-138-271/+333
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes."Tao Bao2017-02-138-271/+333
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes."Tao Bao2017-02-138-271/+333
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | minui: Move graphics_{adf,drm,fbdev} into classes.Tao Bao2017-02-118-271/+333
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1 am: 30c164411fTao Bao2017-02-101-1/+2
|\| | | | | | | | | |
| * | | | | | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1Tao Bao2017-02-101-1/+2
| |\| | | | | | | | |
| | * | | | | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79Tao Bao2017-02-101-1/+2
| | |\| | | | | | | |
| | | * | | | | | | | Merge "minui: Save errno before calling close()."Tao Bao2017-02-101-1/+2
| | | |\| | | | | | |
| | | | * | | | | | | Merge "minui: Save errno before calling close()."Treehugger Robot2017-02-101-1/+2
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | minui: Save errno before calling close().Tao Bao2017-02-091-1/+2
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 am: e91a2d23ca am: c441edd1c3Tao Bao2017-02-091-139/+129
|\| | | | | | | | | |
| * | | | | | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 am: e91a2d23caTao Bao2017-02-091-139/+129
| |\| | | | | | | | |
| | * | | | | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421Tao Bao2017-02-091-139/+129
| | |\| | | | | | | |
| | | * | | | | | | | Merge "minui: Clean up graphics_fbdev.cpp."Tao Bao2017-02-091-139/+129
| | | |\| | | | | | |
| | | | * | | | | | | Merge "minui: Clean up graphics_fbdev.cpp."Treehugger Robot2017-02-091-139/+129
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | minui: Clean up graphics_fbdev.cpp.Tao Bao2017-02-071-139/+129
* | | | | | | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326e am: ffd5c03711Tao Bao2017-02-091-191/+156
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326eTao Bao2017-02-091-191/+156
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1Tao Bao2017-02-091-191/+156
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "minui: Clean up graphics_adf.cpp."Tao Bao2017-02-091-191/+156
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "minui: Clean up graphics_adf.cpp."Tao Bao2017-02-091-191/+156
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | minui: Clean up graphics_adf.cpp.Tao Bao2017-02-071-191/+156
| | | | | |/ / / / / / /
* | | | | | | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916 am: ed5ee5292cTao Bao2017-02-091-351/+297
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916Tao Bao2017-02-091-351/+297
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71Tao Bao2017-02-091-351/+297
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "minui: Clean up graphics_drm.cpp."Tao Bao2017-02-091-351/+297
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "minui: Clean up graphics_drm.cpp."Treehugger Robot2017-02-091-351/+297
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | minui: Clean up graphics_drm.cpp.Tao Bao2017-02-071-351/+297
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2 am: b8af1beed0Tao Bao2017-02-046-9/+9
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2Tao Bao2017-02-046-9/+9
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4eTao Bao2017-02-046-9/+9
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)."Tao Bao2017-02-046-9/+9
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)."Treehugger Robot2017-02-046-9/+9
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Replace _exit(-1) with _exit(EXIT_FAILURE).Tao Bao2017-02-036-9/+9
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 am: 15ab95bb63Tianjie Xu2017-02-031-1/+5
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9Tianjie Xu2017-02-031-1/+5
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56eTianjie Xu2017-02-031-1/+5
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Avoid to call UI functions in child process"Tianjie Xu2017-02-031-1/+5
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Avoid to call UI functions in child process"Treehugger Robot2017-02-031-1/+5
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Avoid to call UI functions in child processTianjie Xu2017-02-031-1/+5
* | | | | | | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cf am: a8764c46aaTianjie Xu2017-02-031-6/+64
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cfTianjie Xu2017-02-031-6/+64
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197Tianjie Xu2017-02-031-6/+64
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "update_verifier should read dm wrapped partition"Tianjie Xu2017-02-031-6/+64
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "update_verifier should read dm wrapped partition"Tianjie Xu2017-02-031-6/+64
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | update_verifier should read dm wrapped partitionTianjie Xu2017-01-261-6/+64
| | | | | |/ / / / / / /
* | | | | | | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d am: 7d8e13a535Tao Bao2017-02-031-62/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580dTao Bao2017-02-031-62/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540dTao Bao2017-02-031-62/+1
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "minui: Minor clean up to graphics.cpp."Tao Bao2017-02-031-62/+1
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "minui: Minor clean up to graphics.cpp."Tao Bao2017-02-031-62/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | minui: Minor clean up to graphics.cpp.Tao Bao2017-02-031-62/+1
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7d am: 2be767eba4Tao Bao2017-02-011-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7dTao Bao2017-02-011-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976Tao Bao2017-02-011-1/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Fix a log issue in ui.cpp."Tao Bao2017-02-011-1/+1
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Fix a log issue in ui.cpp."Tao Bao2017-02-011-1/+1
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix a log issue in ui.cpp.Tao Bao2017-02-011-1/+1
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777 am: 1c35b48253Tao Bao2017-02-011-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777Tao Bao2017-02-011-0/+1
| |\| | | | | | | | |
| | * | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812dTao Bao2017-02-011-0/+1
| | |\| | | | | | | |
| | | * | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"Tao Bao2017-02-011-0/+1
| | | |\| | | | | | |
| | | | * | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"Tao Bao2017-02-011-0/+1
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | bootable/recovery: cleanup compiler warnings (potential leak of memory)Rahul Chaudhry2016-12-071-0/+1
* | | | | | | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34 am: 79ce31073aTao Bao2017-01-312-24/+120
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34Tao Bao2017-01-312-24/+120
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193cTao Bao2017-01-312-24/+120
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "recovery: Add screensaver mode."Tao Bao2017-01-312-24/+120
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "recovery: Add screensaver mode."Tao Bao2017-01-312-24/+120
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | recovery: Add screensaver mode.Tao Bao2017-01-312-24/+120
| | | | |/ / / / / / /
* | | | | | | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 am: 9518d34c0fAlex Deymo2017-01-262-2/+2
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0Alex Deymo2017-01-262-2/+2
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1Alex Deymo2017-01-262-2/+2
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Remove '_static' suffix from libext2* references."Alex Deymo2017-01-262-2/+2
| | | |\| | | | | | |
| | | | * | | | | | | Merge "Remove '_static' suffix from libext2* references."Alex Deymo2017-01-262-2/+2
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Remove '_static' suffix from libext2* references.Alex Deymo2017-01-242-2/+2
* | | | | | | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 am: 445f24f712Connor O'Brien2017-01-251-1/+6
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2Connor O'Brien2017-01-251-1/+6
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7Connor O'Brien2017-01-251-1/+6
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "Use flash erase & logical block size for userdata wipe"Connor O'Brien2017-01-251-1/+6
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "Use flash erase & logical block size for userdata wipe"Treehugger Robot2017-01-251-1/+6
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Use flash erase & logical block size for userdata wipeConnor O'Brien2017-01-251-1/+6
| | | | |/ / / / / / / /
* | | | | | | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 am: 19856bcb2eTao Bao2017-01-255-129/+115
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1Tao Bao2017-01-255-129/+115
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714Tao Bao2017-01-255-129/+115
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge "minui: Move callback functions to std::function."Tao Bao2017-01-255-129/+115
| | | |\| | | | | | | |
| | | | * | | | | | | | Merge "minui: Move callback functions to std::function."Tao Bao2017-01-255-129/+115
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | minui: Move callback functions to std::function.Tao Bao2017-01-235-129/+115
* | | | | | | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 am: b30b8cf436Tao Bao2017-01-251-48/+46
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271Tao Bao2017-01-251-48/+46
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3Tao Bao2017-01-251-48/+46
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()."Tao Bao2017-01-251-48/+46
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()."Tao Bao2017-01-251-48/+46
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | update_verifier: Move property_get() to android::base::GetProperty().Tao Bao2017-01-201-48/+46
* | | | | | | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d am: 14be4eb8ceTao Bao2017-01-243-7/+1
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636dTao Bao2017-01-243-7/+1
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7Tao Bao2017-01-243-7/+1
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "Print with newline for ui_print."Tao Bao2017-01-243-7/+1
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "Print with newline for ui_print."Tao Bao2017-01-243-7/+1
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Print with newline for ui_print.Tao Bao2017-01-223-7/+1
| | | | | |/ / / / / / / /
* | | | | | | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e am: 58eace4a96Chris Phoenix2017-01-230-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4eChris Phoenix2017-01-231-1/+1
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5Chris Phoenix2017-01-231-1/+1
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "bootctrl HAL uses "default" service name"Chris Phoenix2017-01-231-1/+1
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "bootctrl HAL uses "default" service name"Chris Phoenix2017-01-231-1/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | bootctrl HAL uses "default" service nameChris Phoenix2017-01-201-1/+1
* | | | | | | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e am: f1a371b1b0Tianjie Xu2017-01-2311-0/+3
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12eTianjie Xu2017-01-2311-0/+3
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381Tianjie Xu2017-01-2311-0/+3
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "Restore the max width for recovery background texts"Tianjie Xu2017-01-2311-0/+3
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "Restore the max width for recovery background texts"Tianjie Xu2017-01-2311-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Restore the max width for recovery background textsTianjie Xu2017-01-2311-0/+3
| | | | |/ / / / / / / / /
* | | | | | | | | | | | | Merge "bootctrl HAL uses "default" service name"Chris Phoenix2017-01-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | bootctrl HAL uses "default" service nameChris Phoenix2017-01-211-1/+1
* | | | | | | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 am: 6a82bc228aTao Bao2017-01-202-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| / / / / / / / / / / / / | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48Tao Bao2017-01-202-4/+10
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656Tao Bao2017-01-202-4/+10
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined."Tao Bao2017-01-202-4/+10
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined."Tao Bao2017-01-202-4/+10
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | imgpatch: Compile with ZLIB_CONST defined.Tao Bao2017-01-202-4/+10
| | | | | |/ / / / / / /
* | | | | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 am: e4dcbd1c9eTianjie Xu2017-01-200-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254Tianjie Xu2017-01-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878ccTianjie Xu2017-01-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
* | | | | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 am: 87f49b83caTianjie Xu2017-01-200-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254Tianjie Xu2017-01-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878ccTianjie Xu2017-01-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733Tianjie Xu2017-01-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | * | | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8Tianjie Xu2017-01-200-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / | | | | | |/| | | | | |
| | | | | * | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s oursTianjie Xu2017-01-200-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|_|_|/ | | | | | | |/| | | | |
| | | | | | * | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456Tianjie Xu2017-01-200-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2Tianjie Xu2017-01-200-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3cTianjie Xu2017-01-200-0/+0
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s oursTianjie Xu2017-01-200-0/+0
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9aTianjie Xu2017-01-200-0/+0
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s oursTianjie Xu2017-01-200-0/+0
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s oursTianjie Xu2017-01-200-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-devTianjie Xu2017-01-200-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | * | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-devTianjie Xu2017-01-201-0/+7
* | | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6 am: f859652e5fSen Jiang2017-01-192-16/+20
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6Sen Jiang2017-01-192-16/+20
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004Sen Jiang2017-01-192-16/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode."Sen Jiang2017-01-192-16/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode."Sen Jiang2017-01-192-16/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | imgdiff: cache bsdiff suffix array in zip mode.Sen Jiang2017-01-192-16/+20
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb am: 18098b7de3Tianjie Xu2017-01-195-3/+177
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadbTianjie Xu2017-01-195-3/+177
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9Tianjie Xu2017-01-195-3/+177
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file"Tianjie Xu2017-01-195-3/+177
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file"Tianjie Xu2017-01-195-3/+177
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Add checkers and tests for empty locale in PNG fileTianjie Xu2017-01-195-3/+177
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aospTianjie Xu2017-01-190-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aospAndroid Build Merger (Role)2017-01-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477Tianjie Xu2017-01-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66Tianjie Xu2017-01-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4Tianjie Xu2017-01-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: de530474e9Tianjie Xu2017-01-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66Tianjie Xu2017-01-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4Tianjie Xu2017-01-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9Tianjie Xu2017-01-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6Tianjie Xu2017-01-190-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s oursTianjie Xu2017-01-190-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / / / / / / / | | | | | | |/| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386Tianjie Xu2017-01-190-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|/ / / / / / / / / | | | | | | | |/| | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0aTianjie Xu2017-01-190-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|/ / / / / / / / | | | | | | | | |/| | | | | | | | | |
| | | | | | | | * | | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440Tianjie Xu2017-01-190-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|/ / / / / / / | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | * | | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s oursTianjie Xu2017-01-190-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|/ / / / / / | | | | | | | | | | |/| | | | | | | |
| | | | | | | | | | * | | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6Tianjie Xu2017-01-190-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|/ / / / / | | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | | * | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s oursTianjie Xu2017-01-190-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|/ / / / | | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | | * | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s oursTianjie Xu2017-01-190-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | |_|_|/ / / | | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | * | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s oursTianjie Xu2017-01-190-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | |_|_|/ / | | | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | | | * | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726Tianjie Xu2017-01-190-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ DO NOT MERGE: Add a checker for signature boundary in verifierTianjie Xu2017-01-181-0/+7
| | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | DO NOT MERGE: Add a checker for signature boundary in verifierTianjie Xu2016-12-201-0/+7
* | | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21 am: 97ea844acaTianjie Xu2017-01-190-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21Tianjie Xu2017-01-191-2/+2
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21Tianjie Xu2017-01-191-2/+2
* | | | | | | | | | | | | | | | | | | | | Merge "Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: f127896675" into nyc-mr2-dev-plus-aospTianjie Xu2017-01-190-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: f127896675" into nyc-mr2-dev-plus-aospAndroid Build Merger (Role)2017-01-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: f127896675Tianjie Xu2017-01-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceabTianjie Xu2017-01-181-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045Tianjie Xu2017-01-181-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: 8a45adb243Tianjie Xu2017-01-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceabTianjie Xu2017-01-181-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045Tianjie Xu2017-01-181-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13Tianjie Xu2017-01-181-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66aTianjie Xu2017-01-181-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763Tianjie Xu2017-01-181-0/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3Tianjie Xu2017-01-181-0/+6
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51Tianjie Xu2017-01-181-0/+6
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45Tianjie Xu2017-01-181-0/+6
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / / / / / | | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72dTianjie Xu2017-01-181-0/+6
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / / / / / | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8bTianjie Xu2017-01-181-0/+6
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / / / / | | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fdeTianjie Xu2017-01-181-0/+6
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | |/| | | | | | | |
| | | | | | | | | | | | * | | | | | | | | Add a checker for signature boundary in verifierTianjie Xu2017-01-181-0/+6
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | | | | * | | | | | | | Add a checker for signature boundary in verifierTianjie Xu2016-12-171-0/+6
* | | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397 am: 54890af615Tao Bao2017-01-1711-22/+45
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397Tao Bao2017-01-1711-22/+45
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08fTao Bao2017-01-1711-22/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h."Tao Bao2017-01-1711-22/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h."Tao Bao2017-01-1711-22/+45
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | minui: Export minui/minui.h.Tao Bao2017-01-1711-22/+45
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d am: 81bffbda89Tao Bao2017-01-142-82/+78
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707dTao Bao2017-01-142-82/+78
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71Tao Bao2017-01-142-82/+78
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()."Tao Bao2017-01-142-82/+78
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()."Tao Bao2017-01-142-82/+78
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | recovery: Move property_get() to android::base::GetProperty().Tao Bao2017-01-132-82/+78
* | | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 am: e05674f93eTianjie Xu2017-01-1426-2/+20
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8Tianjie Xu2017-01-1426-2/+20
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6Tianjie Xu2017-01-1426-2/+20
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery"Tianjie Xu2017-01-1426-2/+20
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery"Tianjie Xu2017-01-1426-2/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Update background text images in recoveryTianjie Xu2017-01-0726-2/+20
* | | | | | | | | | | | | | | | | | | | | | Merge "Rename language+country resources to just language"Roozbeh Pournader2017-01-1330-270/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Rename language+country resources to just languageRoozbeh Pournader2017-01-1130-0/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 am: a1e336d548Alex Deymo2017-01-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850Alex Deymo2017-01-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bbAlex Deymo2017-01-120-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup'Alex Deymo2017-01-120-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup'Alex Deymo2017-01-123-6/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a am: 9e93a79f4cAlex Deymo2017-01-123-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1aAlex Deymo2017-01-123-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804Alex Deymo2017-01-123-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparseAlex Deymo2017-01-123-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparseAlex Deymo2017-01-113-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 am: 9edd655f94Alex Deymo2017-01-123-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899Alex Deymo2017-01-123-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660adAlex Deymo2017-01-123-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils.Alex Deymo2017-01-123-3/+3
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils.Alex Deymo2017-01-113-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-01-1230-0/+270
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 am: 7d345f27e7Tianjie Xu2017-01-103-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1Tianjie Xu2017-01-103-4/+6
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20Tianjie Xu2017-01-103-4/+6
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry"Tianjie Xu2017-01-103-4/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry"Tianjie Xu2017-01-103-4/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | Do not inject I/O fault on a retryTianjie Xu2017-01-093-4/+6
| | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda am: ac431948d3Elliott Hughes2017-01-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf am: 3e003ceedaElliott Hughes2017-01-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cfElliott Hughes2017-01-101-1/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Address review comment."Elliott Hughes2017-01-101-1/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Address review comment."Elliott Hughes2017-01-101-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Address review comment.Elliott Hughes2017-01-091-1/+1
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8 am: 6ac5db29dbElliott Hughes2017-01-091-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8Elliott Hughes2017-01-091-0/+0
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32Elliott Hughes2017-01-091-0/+0
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation."Elliott Hughes2017-01-091-0/+0
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation."Elliott Hughes2017-01-091-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Move to .md files for even trivial documentation.Elliott Hughes2017-01-071-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c am: b7ce9c5e00Tao Bao2017-01-091-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184cTao Bao2017-01-091-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5Tao Bao2017-01-091-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing."Tao Bao2017-01-091-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing."Tao Bao2017-01-091-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | recovery: Fix the argument parsing.Tao Bao2017-01-091-2/+2
| | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70 am: 5ec75851a7Tianjie Xu2017-01-071-1/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70Tianjie Xu2017-01-071-1/+40
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8Tianjie Xu2017-01-071-1/+40
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0"Tianjie Xu2017-01-071-1/+40
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0"Tianjie Xu2017-01-071-1/+40
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Retry ioctl in uncrypt if it returns block# 0Tianjie Xu2016-12-051-1/+40
* | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af am: af53db6ba0Tao Bao2017-01-061-145/+166
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68afTao Bao2017-01-061-145/+166
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3ebTao Bao2017-01-061-145/+166
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp."Tao Bao2017-01-061-145/+166
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp."Treehugger Robot2017-01-061-145/+166
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | recovery: Clean up try_update_binary() in install.cpp.Tao Bao2017-01-061-145/+166
| | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b am: ba0dad8828Tao Bao2017-01-061-0/+50
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82bTao Bao2017-01-061-0/+50
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7Tao Bao2017-01-061-0/+50
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()."Tao Bao2017-01-061-0/+50
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()."Tao Bao2017-01-061-0/+50
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | tests: Add testcase for show_progress() and set_progress().Tao Bao2017-01-061-0/+50
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187 am: fbb5dbb471Tao Bao2017-01-051-83/+84
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187Tao Bao2017-01-051-83/+84
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cdTao Bao2017-01-051-83/+84
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()."Tao Bao2017-01-051-83/+84
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()."Tao Bao2017-01-051-83/+84
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | updater: Clean up CreateStash().Tao Bao2016-12-291-84/+85
* | | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 am: e513c0f2acTao Bao2017-01-043-15/+91
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69Tao Bao2017-01-043-15/+91
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879bTao Bao2017-01-043-15/+91
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop."Tao Bao2017-01-043-15/+91
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop."Tao Bao2017-01-043-15/+91
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | imgdiff: Fix an edge case that leads to infinite loop.Tao Bao2016-12-283-15/+91
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed am: e477a54c8dJerry Zhang2017-01-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4edJerry Zhang2017-01-041-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725Jerry Zhang2017-01-041-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery"Jerry Zhang2017-01-041-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery"Jerry Zhang2017-01-041-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | Write aliases before ffs mount in recoveryJerry Zhang2017-01-041-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 am: 3806993e25Tao Bao2017-01-049-236/+244
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841Tao Bao2017-01-049-236/+244
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376Tao Bao2017-01-049-236/+244
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text."Tao Bao2017-01-049-236/+244
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text."Tao Bao2017-01-049-236/+244
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | recovery: Fix the broken UI text.Tao Bao2017-01-049-236/+244
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery"Jerry Zhang2017-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Write aliases before ffs mount in recoveryJerry Zhang2017-01-041-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b am: cb9c4fc4fbTao Bao2017-01-041-74/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4bTao Bao2017-01-041-74/+63
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396aTao Bao2017-01-041-74/+63
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()."Tao Bao2017-01-041-74/+63
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()."Tao Bao2017-01-041-74/+63
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Refactor parse_range().Tao Bao2017-01-041-74/+63
| | | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000 am: 83317083c8Tao Bao2017-01-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000Tao Bao2017-01-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0Tao Bao2017-01-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png"Tao Bao2017-01-041-2/+4
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png"Tao Bao2017-01-041-2/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.pngTim Kryger2017-01-041-2/+4
| | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5 am: c025f145cbTao Bao2017-01-041-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5Tao Bao2017-01-041-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1Tao Bao2017-01-041-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h."Tao Bao2017-01-041-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h."Tao Bao2017-01-041-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | updater: Update the header name for bootloader.h.Tao Bao2016-12-291-2/+2
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 am: 1b29658702Tao Bao2016-12-282-3/+2
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2Tao Bao2016-12-282-3/+2
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acfTao Bao2016-12-282-3/+2
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()."Tao Bao2016-12-282-3/+2
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()."Tao Bao2016-12-282-3/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | applypatch: Don't expose FindMatchingPatch().Tao Bao2016-12-282-3/+2
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed am: 4e2471d6ddTao Bao2016-12-288-266/+812
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4edTao Bao2016-12-288-266/+812
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453Tao Bao2016-12-288-266/+812
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff."Tao Bao2016-12-288-266/+812
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff."Tao Bao2016-12-288-266/+812
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Add tests for imgdiff.Tao Bao2016-12-208-266/+812
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d am: 7f0f49dd2bTao Bao2016-12-232-0/+151
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28dTao Bao2016-12-232-0/+151
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39Tao Bao2016-12-232-0/+151
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil."Tao Bao2016-12-232-0/+151
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil."Tao Bao2016-12-232-0/+151
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add test coverage for DirUtil.Tao Bao2016-12-222-0/+151
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d am: ef801f9a62Tao Bao2016-12-222-8/+16
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229dTao Bao2016-12-222-8/+16
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288eTao Bao2016-12-222-8/+16
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)."Tao Bao2016-12-222-8/+16
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)."Tao Bao2016-12-222-8/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | tests: Replace the O_RDONLY in access(2).Tao Bao2016-12-222-8/+16
| | | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e am: 830ab1c482Tao Bao2016-12-222-1/+193
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579eTao Bao2016-12-222-1/+193
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8Tao Bao2016-12-222-1/+193
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil."Tao Bao2016-12-222-1/+193
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil."Tao Bao2016-12-222-1/+193
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add testcase for ZipUtil.Tao Bao2016-12-222-1/+193
| | | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 am: 11e9af909dPaul Crowley2016-12-221-12/+52
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9Paul Crowley2016-12-221-12/+52
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3Paul Crowley2016-12-221-12/+52
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag."Paul Crowley2016-12-221-12/+52
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag."Treehugger Robot2016-12-221-12/+52
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Support a "ask before wiping" boot flag.Paul Crowley2016-12-211-12/+52
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Add a checker for signature boundary in verifier"Tianjie Xu2016-12-193-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifierTianjie Xu2016-12-173-1/+8
* | | | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 am: 88bd5d59deTao Bao2016-12-191-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2Tao Bao2016-12-191-0/+11
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3Tao Bao2016-12-191-0/+11
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed."Tao Bao2016-12-191-0/+11
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed."Tao Bao2016-12-191-0/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Bugfix:updater always retry apply patch failed,when memcpy failed.katao2016-12-191-0/+11
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png am: 48be23c8ed am: 14bdbb6c77 -s oursTim Kryger2016-12-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png am: 48be23c8edTim Kryger2016-12-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.pngTim Kryger2016-12-151-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 910c83b915Tim Kryger2016-12-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aospTim Kryger2016-12-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aospTreeHugger Robot2016-12-161-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp am: a5876e43f7Tim Kryger2016-12-161-2/+4
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aospTim Kryger2016-12-161-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aospTim Kryger2016-12-151-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.pngTim Kryger2016-11-291-2/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef am: cb15594696Tao Bao2016-12-164-12/+65
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08efTao Bao2016-12-164-12/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2Tao Bao2016-12-164-12/+65
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs."Tao Bao2016-12-154-12/+65
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs."Tao Bao2016-12-154-12/+65
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Add update_bootloader_message() to fix two-step OTAs.Tao Bao2016-12-154-12/+65
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec am: 870b87dfc8Tao Bao2016-12-162-0/+140
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ecTao Bao2016-12-162-0/+140
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75bTao Bao2016-12-162-0/+140
| | |\| | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message."Tao Bao2016-12-152-0/+140
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message."Tao Bao2016-12-152-0/+140
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | tests: Add tests for bootloader_message.Tao Bao2016-12-152-0/+140
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc am: ef45a88680Sen Jiang2016-12-149-17/+102
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fcSen Jiang2016-12-149-17/+102
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feafSen Jiang2016-12-149-17/+102
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI."Sen Jiang2016-12-149-17/+102
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI."Sen Jiang2016-12-149-17/+102
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Add a stub recovery UI.Sen Jiang2016-12-139-17/+102
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8 am: e97575e7aeTao Bao2016-12-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8Tao Bao2016-12-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270eTao Bao2016-12-141-1/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order."Tao Bao2016-12-141-1/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order."Treehugger Robot2016-12-141-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | updater: Fix the operator order.Tao Bao2016-12-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0b am: 1871a2feebTao Bao2016-12-143-26/+4
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0bTao Bao2016-12-143-26/+4
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2Tao Bao2016-12-143-26/+4
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update."Tao Bao2016-12-143-26/+4
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update."Tao Bao2016-12-143-26/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | Remove the obsolete comments for firmware update.Tao Bao2016-12-143-26/+4
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08 am: b1e8150c44Tao Bao2016-12-143-1/+177
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08Tao Bao2016-12-143-1/+177
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1Tao Bao2016-12-143-1/+177
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt."Tao Bao2016-12-143-1/+177
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt."Tao Bao2016-12-143-1/+177
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Add tests for setup-bcb and clear-bcb via uncrypt.Tao Bao2016-12-143-1/+177
| | | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b am: 495478e853Tao Bao2016-12-141-95/+85
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830bTao Bao2016-12-131-95/+85
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6Tao Bao2016-12-131-95/+85
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping."Tao Bao2016-12-131-95/+85
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping."Tao Bao2016-12-131-95/+85
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | recovery: Clean up the log saving while wiping.Tao Bao2016-12-131-95/+85
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a am: 01afbb8f29Tao Bao2016-12-131-1/+2
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9aTao Bao2016-12-131-1/+2
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcbTao Bao2016-12-131-1/+2
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings."Tao Bao2016-12-131-1/+2
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings."Tao Bao2016-12-131-1/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | clang-format: Adjust short functions / if settings.Tao Bao2016-12-131-1/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 am: 1b321e43e1Tao Bao2016-12-132-9/+2
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2Tao Bao2016-12-132-9/+2
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3Tao Bao2016-12-132-9/+2
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field.""Tao Bao2016-12-132-9/+2
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field.""Tao Bao2016-12-132-9/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Revert "write_bootloader_message(<options>) should not reset stage field."Tao Bao2016-12-132-9/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a am: ff77b42d66Tao Bao2016-12-101-21/+1
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239aTao Bao2016-12-101-21/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5beTao Bao2016-12-101-21/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format."Tao Bao2016-12-101-21/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format."Tao Bao2016-12-101-21/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | recovery: Remove obsolete code that supports "CACHE:foo" format.Tao Bao2016-12-101-21/+1
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c am: d8ce8fa609Tao Bao2016-12-092-2/+9
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254cTao Bao2016-12-092-2/+9
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191dTao Bao2016-12-092-2/+9
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field."Tao Bao2016-12-092-2/+9
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field."Tao Bao2016-12-092-2/+9
| | | | |\| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | write_bootloader_message(<options>) should not reset stage field.Tao Bao2016-12-062-2/+9
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 am: d4ceb1fb64Tao Bao2016-12-091-2/+5
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109Tao Bao2016-12-091-2/+5
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7cTao Bao2016-12-091-2/+5
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE."Tao Bao2016-12-091-2/+5
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE."Tao Bao2016-12-091-2/+5
| | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | recovery: Fix the argument parsing from COMMAND_FILE.Tao Bao2016-12-091-2/+5
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 am: dd9c5674dfTao Bao2016-12-061-80/+70
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237Tao Bao2016-12-061-80/+70
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39Tao Bao2016-12-061-80/+70
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()."Tao Bao2016-12-061-80/+70
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()."Tao Bao2016-12-061-80/+70
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | recovery: Clean up get_args().Tao Bao2016-12-051-80/+70
| | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE"Bill Yi2016-12-0581-0/+729
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-12-0381-729/+0
* | | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b am: 997ccbc5a4Tao Bao2016-12-023-993/+994
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57bTao Bao2016-12-023-993/+994
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629abTao Bao2016-12-023-993/+994
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging."Tao Bao2016-12-023-993/+994
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging."Tao Bao2016-12-023-993/+994
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | updater: Switch to libbase logging.Tao Bao2016-12-013-993/+994
* | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 am: bd8f34190cTao Bao2016-12-011-0/+16
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162Tao Bao2016-12-011-0/+16
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8Tao Bao2016-12-011-0/+16
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)"Tao Bao2016-12-011-0/+16
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)"Tao Bao2016-12-011-0/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | bootable/recovery: cleanup compiler warnings (unused value)Rahul Chaudhry2016-11-301-0/+16
| | | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix inconsistent code."Tao Bao2016-12-011-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | updater: Fix inconsistent code.Tao Bao2016-12-011-1/+3
* | | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58 am: 83b649ee1dTao Bao2016-11-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58Tao Bao2016-11-301-0/+4
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1Tao Bao2016-11-301-0/+4
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"Tao Bao2016-11-301-0/+4
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"Tao Bao2016-11-301-0/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | bootable/recovery: cleanup compiler warnings (potential leak of memory)Rahul Chaudhry2016-11-161-0/+4
* | | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 am: 95beb966e2Connor O'Brien2016-11-302-15/+21
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35Connor O'Brien2016-11-302-15/+21
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46eConnor O'Brien2016-11-302-15/+21
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL"Connor O'Brien2016-11-302-15/+21
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL"Connor O'Brien2016-11-302-15/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Switch update verifier to HIDL HALConnor O'Brien2016-11-212-15/+21
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd am: 8762a560fcTao Bao2016-11-294-89/+93
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beeddTao Bao2016-11-294-89/+93
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08Tao Bao2016-11-294-89/+93
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)."Tao Bao2016-11-294-89/+93
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)."Tao Bao2016-11-294-89/+93
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Remove ota_close(int) and ota_fclose(FILE*).Tao Bao2016-11-284-89/+93
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3 am: 6a8e0eb164Tao Bao2016-11-293-9/+25
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3Tao Bao2016-11-293-9/+25
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cfTao Bao2016-11-293-9/+25
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)."Tao Bao2016-11-293-9/+25
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)."Tao Bao2016-11-293-9/+25
| | | | |\| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&).Tao Bao2016-11-233-9/+25
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da am: 5e52ac31d4Tao Bao2016-11-291-31/+144
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98daTao Bao2016-11-291-31/+144
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87Tao Bao2016-11-291-31/+144
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets."Tao Bao2016-11-291-31/+144
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets."Tao Bao2016-11-291-31/+144
| | | | |\| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | tests: Add testcases for EMMC targets.Tao Bao2016-11-221-31/+144
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours am: b7d4d77b3e -s oursAndriy Naborskyy2016-11-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s oursAndriy Naborskyy2016-11-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s oursAndriy Naborskyy2016-11-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function. am: 1bf1772625 -s oursTao Bao2016-11-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function.Tao Bao2016-11-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function.Tao Bao2016-11-181-1/+28
* | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d am: b4aae79230Tao Bao2016-11-211-5/+5
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106dTao Bao2016-11-211-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407Tao Bao2016-11-211-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close."Tao Bao2016-11-211-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close."Treehugger Robot2016-11-211-5/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | applypatch: Release FD when explicitly calling close.Tao Bao2016-11-211-5/+5
| | | | | | |_|/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85 am: 5713071c81Tao Bao2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85Tao Bao2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364fTao Bao2016-11-210-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary"Tao Bao2016-11-210-0/+0
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary"Tao Bao2016-11-211-0/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binaryMatthew Bouyack2016-11-211-0/+8
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours am: 92ac9041c1 -s oursBill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-11-210-0/+0
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-11-2178-312/+390
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours am: 8d7399f553 -s oursBill Yi2016-11-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9a4ff5a900 -s oursBill Yi2016-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-11-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-11-2178-312/+390
* | | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b am: 4cbedcc679Tao Bao2016-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0bTao Bao2016-11-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bccTao Bao2016-11-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery."Tao Bao2016-11-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery."Tao Bao2016-11-202-39/+186
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery.Alex Deymo2016-11-202-39/+186
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e am: 062a2cffb3Tao Bao2016-11-206-91/+193
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3eTao Bao2016-11-206-91/+193
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486Tao Bao2016-11-206-91/+193
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions."Tao Bao2016-11-206-91/+193
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions."Tao Bao2016-11-206-91/+193
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | updater: Refactor set_stage() and get_stage() functions.Tao Bao2016-11-186-91/+193
* | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c am: 9f4d385704Tao Bao2016-11-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2cTao Bao2016-11-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-masterTao Bao2016-11-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-masterTao Bao2016-11-201-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. am: 5422d80961 am: ca64fa7bb9Tao Bao2016-11-201-2/+6
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. am: 5422d80961Tao Bao2016-11-201-2/+6
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master.Tao Bao2016-11-201-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master.Tao Bao2016-11-191-2/+6
* | | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. am: fbde508ace am: 52b4d869b0Tao Bao2016-11-191-1/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. am: fbde508aceTao Bao2016-11-191-1/+0
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line.Tao Bao2016-11-191-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line.Tao Bao2016-11-191-1/+0
| | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp am: 692e95aa87Connor O'Brien2016-11-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aospConnor O'Brien2016-11-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aospConnor O'Brien2016-11-182-25/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" am: 7206ec7a1dConnor O'Brien2016-11-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-182-25/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-182-25/+15
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa am: b5cf492040Connor O'Brien2016-11-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaaConnor O'Brien2016-11-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s oursConnor O'Brien2016-11-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL""Connor O'Brien2016-11-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL""Connor O'Brien2016-11-182-21/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-182-21/+15
* | | | | | | | | | | | | | | | | | | | | | | Skip this change on AOSP.Yifan Hong2016-11-180-0/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad am: 9b1a791e3cTao Bao2016-11-183-17/+119
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788adTao Bao2016-11-183-17/+119
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935eTao Bao2016-11-183-17/+119
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()."Tao Bao2016-11-183-17/+119
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()."Tao Bao2016-11-183-17/+119
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | updater: Add testcase for package_extract_dir().Tao Bao2016-11-183-17/+119
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL""Connor O'Brien2016-11-182-25/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-182-25/+15
* | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30 am: 776ea9b464Tao Bao2016-11-182-282/+280
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30Tao Bao2016-11-182-282/+280
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bcTao Bao2016-11-182-282/+280
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs."Tao Bao2016-11-182-282/+280
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs."Tao Bao2016-11-182-282/+280
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | applypatch: Use unique_fd to avoid leaking FDs.Tao Bao2016-11-172-282/+280
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9 am: 29dc892c07Tao Bao2016-11-182-3/+64
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9Tao Bao2016-11-182-3/+64
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691Tao Bao2016-11-182-3/+64
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function."Tao Bao2016-11-182-3/+64
| | | |\| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function."Tao Bao2016-11-182-3/+64
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | updater: Add "write_value()" function.Tao Bao2016-11-172-3/+64
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f am: c43acc9938Tao Bao2016-11-171-283/+257
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7fTao Bao2016-11-171-283/+257
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8dfTao Bao2016-11-171-283/+257
| | |\| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()."Tao Bao2016-11-171-283/+257
| | | |\| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()."Tao Bao2016-11-171-283/+257
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | applypatch: Clean up LoadPartitionContents().Tao Bao2016-11-171-283/+257
| | | | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s ours am: 97f6af8d34 -s oursConnor O'Brien2016-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s oursConnor O'Brien2016-11-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s oursConnor O'Brien2016-11-170-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-172-15/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | / / / / / / / / / / / / / / / / / | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HALConnor O'Brien2016-11-162-15/+21
| | | | | | |_|_|/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL am: 86199a47e1Connor O'Brien2016-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HALConnor O'Brien2016-11-172-15/+25
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HALConnor O'Brien2016-11-172-15/+25
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee am: 6a6e54da04Rahul Chaudhry2016-11-162-3/+3
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911deeRahul Chaudhry2016-11-162-3/+3
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681Rahul Chaudhry2016-11-162-3/+3
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast."Rahul Chaudhry2016-11-162-3/+3
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast."Treehugger Robot2016-11-162-3/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Remove unnecessary uses of reinterpret_cast.Rahul Chaudhry2016-11-162-3/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL"Connor O'Brien2016-11-162-15/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HALConnor O'Brien2016-11-162-15/+25
* | | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad am: b8c4ae9f80Tao Bao2016-11-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dadTao Bao2016-11-166-29/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14cTao Bao2016-11-166-29/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap."Tao Bao2016-11-166-29/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap."Tao Bao2016-11-166-29/+29
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap.Rahul Chaudhry2016-11-166-29/+29
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 am: 7563bad2acTao Bao2016-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911Tao Bao2016-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-masterTao Bao2016-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-masterTao Bao2016-11-166-137/+197
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Fix the wrong return value for package_extract_file()."Tao Bao2016-11-166-137/+197
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file().Tao Bao2016-11-156-137/+197
| | | | | | |/ / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 am: 2e55280df2Tao Bao2016-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35Tao Bao2016-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0Tao Bao2016-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick'Tao Bao2016-11-160-0/+0
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick'Tao Bao2016-11-165-67/+93
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15b am: 9c29567c67Damien Bargiacchi2016-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15bDamien Bargiacchi2016-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70Damien Bargiacchi2016-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the fontDamien Bargiacchi2016-11-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the fontDamien Bargiacchi2016-11-162-8/+16
* | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 am: 7f0a56dbf1Tao Bao2016-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56Tao Bao2016-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-masterTao Bao2016-11-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-masterTao Bao2016-11-160-0/+0
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Support use of custom fonts in miniuiDamien Bargiacchi2016-11-155-65/+83
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | / / / / / / / / / / / / / / / / updater: Fix the wrong return value for package_extract_file(). am: 2274e57f67Tao Bao2016-11-166-137/+197
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file().Tao Bao2016-11-166-137/+197
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file().Tao Bao2016-11-166-137/+197
* | | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea am: db50f8863aTao Bao2016-11-141-0/+14
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2eaTao Bao2016-11-141-0/+14
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984Tao Bao2016-11-141-0/+14
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Add .clang-format style file."Tao Bao2016-11-141-0/+14
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Add .clang-format style file."Tao Bao2016-11-141-0/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | Add .clang-format style file.Tao Bao2016-11-071-0/+14
* | | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493 am: 0f81984970Tao Bao2016-11-141-1/+1
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493Tao Bao2016-11-141-1/+1
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649Tao Bao2016-11-141-1/+1
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"."Tao Bao2016-11-141-1/+1
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"."Tao Bao2016-11-141-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Fix "ordered comparison between pointer and zero".MinSeong Kim2016-11-111-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 am: 91f736fe1aTianjie Xu2016-11-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206Tianjie Xu2016-11-121-2/+18
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98Tianjie Xu2016-11-121-2/+18
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication"Tianjie Xu2016-11-121-2/+18
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication"Tianjie Xu2016-11-121-2/+18
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Allow uncrypt to work without socket communicationTianjie Xu2016-11-111-2/+18
* | | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe am: 62aaba5a3fVineela Tummalapalli2016-11-102-0/+22
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfeVineela Tummalapalli2016-11-102-0/+22
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8Vineela Tummalapalli2016-11-102-0/+22
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message."Vineela Tummalapalli2016-11-102-0/+22
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message."Treehugger Robot2016-11-102-0/+22
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Add 'reboot bootloader' to bootloader_message.Vineela Tummalapalli2016-11-102-0/+22
| | | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap."TreeHugger Robot2016-11-106-30/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap.Rahul Chaudhry2016-11-096-30/+30
* | | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 am: b86af2577cTianjie Xu2016-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66Tianjie Xu2016-11-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s oursTianjie Xu2016-11-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier"Tianjie Xu2016-11-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier"Tianjie Xu2016-11-102-12/+128
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Touch blocks in care_map in update_verifierTianjie Xu2016-11-092-12/+128
| | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c am: 7da0c7e439Tao Bao2016-11-092-26/+56
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302cTao Bao2016-11-092-26/+56
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8Tao Bao2016-11-092-26/+56
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()."Tao Bao2016-11-092-26/+56
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()."Tao Bao2016-11-092-26/+56
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | updater: Add more testcase for symlink().Tao Bao2016-11-092-26/+56
| | | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 am: d9d435cd83Tao Bao2016-11-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23Tao Bao2016-11-092-12/+1
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dcaTao Bao2016-11-092-12/+1
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes."Tao Bao2016-11-092-12/+1
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes."Tao Bao2016-11-092-12/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | otautil: Clean up obsolete includes.Tao Bao2016-11-082-12/+1
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes."Tao Bao2016-11-092-12/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | otautil: Clean up obsolete includes.Tao Bao2016-11-082-12/+0
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "healthd: change how charger is launched in recovery."Sandeep Patil2016-11-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | healthd: change how charger is launched in recovery.Sandeep Patil2016-11-011-2/+2
* | | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 am: 260573b3c2Tianjie Xu2016-11-082-19/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7Tianjie Xu2016-11-082-19/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7Tianjie Xu2016-11-082-19/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument"Tianjie Xu2016-11-082-19/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument"Treehugger Robot2016-11-082-19/+49
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Make make_parent() to take const argumentTianjie Xu2016-11-082-19/+49
* | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 am: a1c121e034Tianjie Xu2016-11-084-92/+112
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9Tianjie Xu2016-11-084-92/+112
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8Tianjie Xu2016-11-084-92/+112
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test"Tianjie Xu2016-11-084-92/+112
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test"Treehugger Robot2016-11-084-92/+112
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Move recovery_test.cpp out of unit testTianjie Xu2016-11-084-92/+112
| | | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d am: 5d52303488Tao Bao2016-11-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660dTao Bao2016-11-084-200/+349
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-masterTao Bao2016-11-084-200/+349
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-masterTao Bao2016-11-084-200/+349
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up SysUtil.cpp."Tao Bao2016-11-084-195/+344
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | otautil: Clean up SysUtil.cpp.Tao Bao2016-11-074-195/+344
| | | | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | otautil: Clean up SysUtil.cpp.Tao Bao2016-11-084-201/+350
* | | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 am: a99c6eab22Tao Bao2016-11-071-59/+50
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4Tao Bao2016-11-071-59/+50
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4Tao Bao2016-11-071-59/+50
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp."Tao Bao2016-11-071-59/+50
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp."Tao Bao2016-11-071-59/+50
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | tests: Fix unit/zip_test.cpp.Tao Bao2016-11-041-59/+50
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e am: 8269eb0d1fTao Bao2016-11-042-1/+33
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8eTao Bao2016-11-042-1/+33
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7dfTao Bao2016-11-042-1/+33
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()."Tao Bao2016-11-042-1/+33
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()."Tao Bao2016-11-042-1/+33
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | updater: Add a testcase for RenameFn().Tao Bao2016-11-042-1/+33
* | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 am: 92097726efTianjie Xu2016-11-046-182/+178
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67Tianjie Xu2016-11-046-182/+178
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658Tianjie Xu2016-11-046-182/+178
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions"Tianjie Xu2016-11-046-182/+178
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions"Tianjie Xu2016-11-046-182/+178
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Cleanup the duplicates of logs rotation functionsTianjie Xu2016-11-046-182/+178
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9 am: 786b083b8eTao Bao2016-11-042-9/+46
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9Tao Bao2016-11-042-9/+46
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0Tao Bao2016-11-042-9/+46
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()."Tao Bao2016-11-042-9/+46
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()."Tao Bao2016-11-042-9/+46
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | updater: Fix a bug in DeleteFn().Tao Bao2016-11-042-9/+46
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac am: b9c3411de7Tao Bao2016-11-047-70/+69
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffacTao Bao2016-11-047-70/+69
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944Tao Bao2016-11-047-70/+69
| | |\| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery."""Tao Bao2016-11-047-70/+69
| | | |\| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery."""Tao Bao2016-11-047-70/+69
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | Revert "Revert "Some cleanups to recovery.""Tao Bao2016-11-037-70/+69
| | | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f am: 4098285e8cTao Bao2016-11-042-6/+59
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0fTao Bao2016-11-042-6/+59
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0Tao Bao2016-11-042-6/+59
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()."Tao Bao2016-11-042-6/+59
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()."Tao Bao2016-11-042-6/+59
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | updater: Fix an off-by-1 bug in file_getprop().Tao Bao2016-11-032-6/+59
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4bef am: f35ce240a1Tao Bao2016-11-034-31/+23
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4befTao Bao2016-11-034-31/+23
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161aTao Bao2016-11-034-31/+23
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests."Tao Bao2016-11-034-31/+23
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests."Tao Bao2016-11-034-31/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | tests: Set up testdata path for continuous native tests.Tao Bao2016-11-034-31/+23
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac am: 24356d778fTao Bao2016-11-0211-287/+426
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365acTao Bao2016-11-0211-287/+426
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4Tao Bao2016-11-0211-287/+426
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable."Tao Bao2016-11-0211-287/+426
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable."Treehugger Robot2016-11-0211-287/+426
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | applypatch: Add testcases for applypatch executable.Tao Bao2016-11-0111-287/+426
* | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54 am: 0b6085a341Tianjie Xu2016-11-024-632/+424
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54Tianjie Xu2016-11-024-632/+424
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887cTianjie Xu2016-11-024-632/+424
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage"Tianjie Xu2016-11-024-632/+424
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage"Tianjie Xu2016-11-024-632/+424
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | Cleanup ReadArgs & ReadValueArgs usageTianjie Xu2016-11-014-632/+424
| | | | |/ / / / / / / / / / / / / / / / /
* | | | | / / / / / / / / / / / / / / / / Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 am: edf2928edfTao Bao2016-11-015-152/+162
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0Tao Bao2016-11-015-152/+162
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0efTao Bao2016-11-015-152/+162
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector."Tao Bao2016-11-015-152/+162
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector."Tao Bao2016-11-015-152/+162
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | applypatch: Switch the parameter of Value** to std::vector.Tao Bao2016-10-295-152/+162
| | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours am: 9ab6af5a61 -s oursAndriy Naborskyy2016-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s oursAndriy Naborskyy2016-10-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s oursAndriy Naborskyy2016-10-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s oursAndriy Naborskyy2016-10-270-0/+0
| | |/| | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s oursAndriy Naborskyy2016-10-270-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s oursAndriy Naborskyy2016-10-270-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s oursAndriy Naborskyy2016-10-270-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / / / / / / / | | | | | | |/| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-initAndriy Naborskyy2016-10-270-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|/ / / / / / / / / | | | | | | | |/| | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-initAndriy Naborskyy2016-10-251-1/+0
* | | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923 am: 3456ee19f9Dan Albert2016-10-277-63/+70
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923Dan Albert2016-10-277-63/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934Dan Albert2016-10-277-63/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery.""Dan Albert2016-10-277-63/+70
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery.""Treehugger Robot2016-10-277-63/+70
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Revert "Some cleanups to recovery."Dan Albert2016-10-277-63/+70
* | | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 am: 05c68a8775Tao Bao2016-10-277-70/+63
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23Tao Bao2016-10-277-70/+63
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6fTao Bao2016-10-277-70/+63
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery."Tao Bao2016-10-277-70/+63
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Some cleanups to recovery."Treehugger Robot2016-10-277-70/+63
| | | | |\| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Some cleanups to recovery.Tao Bao2016-10-267-70/+63
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305 am: 74851d8191Tao Bao2016-10-260-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305Tao Bao2016-10-260-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2Tao Bao2016-10-260-0/+0
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist"Tao Bao2016-10-260-0/+0
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist"Tao Bao2016-10-262-14/+41
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklistTianjie Xu2016-10-262-14/+41
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db am: ab526b1246Tao Bao2016-10-261-1/+12
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0dbTao Bao2016-10-261-1/+12
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dcTao Bao2016-10-261-1/+12
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch."Tao Bao2016-10-261-1/+12
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch."Tao Bao2016-10-261-1/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | tests: Generate testdata for 2nd arch.Tao Bao2016-10-261-1/+12
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e am: 6d9f8993b0Tao Bao2016-10-251-2/+3
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839eTao Bao2016-10-251-2/+3
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428baTao Bao2016-10-251-2/+3
| |/| | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB."Tao Bao2016-10-251-2/+3
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB."Tao Bao2016-10-251-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | applypatch: Fix the bug when constructing VAL_BLOB.Tao Bao2016-10-251-2/+3
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipng am: 2f2c723d1bDamien Bargiacchi2016-10-20455-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipngDamien Bargiacchi2016-10-20455-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipngDamien Bargiacchi2016-10-20455-0/+0
* | | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3 am: a866b12c2dYabin Cui2016-10-190-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3Yabin Cui2016-10-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery."Yabin Cui2016-10-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery."Treehugger Robot2016-10-196-204/+140
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Verify wipe package when wiping A/B device in recovery.Yabin Cui2016-10-196-204/+140
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" am: 06603c76c5 am: d7d7f3c792Tianjie Xu2016-10-191-0/+5
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" am: 06603c76c5Tianjie Xu2016-10-191-0/+5
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check"Tianjie Xu2016-10-191-0/+5
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check"Treehugger Robot2016-10-191-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Add a unit test for applypatch_checkTianjie Xu2016-10-191-0/+5
* | | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 am: 7691800c2eTianjie Xu2016-10-191-29/+13
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" am: 94f4494613Tianjie Xu2016-10-191-29/+13
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery"Tianjie Xu2016-10-191-29/+13
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery"Treehugger Robot2016-10-191-29/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Clean up bootloader_message usage in recoveryTianjie Xu2016-10-191-29/+13
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 am: ece0b68ca6Tianjie Xu2016-10-191-1/+1
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37Tianjie Xu2016-10-191-1/+1
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler"Tianjie Xu2016-10-191-1/+1
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler"Tianjie Xu2016-10-191-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Fix applypatch_check failure when applying update on anglerTianjie Xu2016-10-181-1/+1
* | | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." am: 7c95fe10de am: 83e4e6d35cYabin Cui2016-10-190-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." am: 7c95fe10deYabin Cui2016-10-190-0/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Fix bootloader_message."Yabin Cui2016-10-190-0/+0
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Fix bootloader_message."Treehugger Robot2016-10-191-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Fix bootloader_message.Yabin Cui2016-10-191-1/+1
| | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-master am: 69c117c2ffTao Bao2016-10-191-5/+6
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-masterTao Bao2016-10-191-5/+6
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-masterTao Bao2016-10-191-5/+6
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Create bootloader_message static library."Tao Bao2016-10-188-207/+354
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Create bootloader_message static library.Yabin Cui2016-10-188-207/+354
| | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 434697f to masterTianjie Xu2016-10-1934-2342/+472
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 6fba98c to stage-aosp-masterTianjie Xu2016-10-1934-2345/+476
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 6fba98c to stage-aosp-masterTianjie Xu2016-10-1834-2345/+476
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Replace minzip with libziparchive"Tianjie Xu2016-10-1833-2322/+448
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Replace minzip with libziparchiveTianjie Xu2016-10-1833-2322/+448
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" am: 2b17b24ae5 am: 430b7ae469Tianjie Xu2016-10-1816-528/+505
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" am: 2b17b24ae5Tianjie Xu2016-10-1816-528/+505
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string"Tianjie Xu2016-10-1816-528/+505
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Change StringValue to use std::string"Treehugger Robot2016-10-1816-528/+505
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Change StringValue to use std::stringTianjie Xu2016-10-1516-528/+505
* | | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" am: a01ffc73ef am: 4de11bb370Tao Bao2016-10-171-1/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" am: a01ffc73efTao Bao2016-10-171-1/+0
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init"Tao Bao2016-10-171-1/+0
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "init: move healthd to late-init"Tao Bao2016-10-171-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | init: move healthd to late-initAndriy Naborskyy2016-10-111-1/+0
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-master am: ddf293aa0cTao Bao2016-10-150-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-masterTao Bao2016-10-150-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-masterTao Bao2016-10-150-0/+0
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Fix the prefix matching for uncrypt status."Treehugger Robot2016-10-151-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status.Tao Bao2016-10-141-2/+2
| | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status.Tao Bao2016-10-140-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status.Tao Bao2016-10-141-1/+1
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status.Tao Bao2016-10-141-1/+1
* | | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca am: bd16939bbfTao Bao2016-10-138-98/+70
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5caTao Bao2016-10-138-98/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "edify: Some clean-ups to libedify." am: c5b4b71913Tao Bao2016-10-138-98/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify."Tao Bao2016-10-138-98/+70
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify."Tao Bao2016-10-138-98/+70
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | edify: Some clean-ups to libedify.Tao Bao2016-10-138-98/+70
| | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd am: aa9f017cebTao Bao2016-10-122-43/+55
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfdTao Bao2016-10-122-43/+55
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7Tao Bao2016-10-122-43/+55
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp."Tao Bao2016-10-122-43/+55
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp."Tao Bao2016-10-122-43/+55
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | updater: Kill the duplicate PrintSha1() in install.cpp.Tao Bao2016-10-112-43/+55
| | | | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0 am: 44864a75edTao Bao2016-10-110-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0Tao Bao2016-10-110-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581Tao Bao2016-10-110-0/+0
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module."Tao Bao2016-10-110-0/+0
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module."Tao Bao2016-10-119-85/+196
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 am: 8ff7cd20baTao Bao2016-10-119-85/+196
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854Tao Bao2016-10-119-85/+196
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14Tao Bao2016-10-119-85/+196
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module.Tao Bao2016-10-119-85/+196
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Refactor libupdater into a seperate module.Tao Bao2016-10-119-85/+196
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815 am: 514dc15399Tao Bao2016-10-110-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815Tao Bao2016-10-114-11/+5
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8Tao Bao2016-10-104-11/+5
| | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils."Tao Bao2016-10-104-11/+5
| | | |\| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils."Tao Bao2016-10-104-11/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Update the header path for ext4_utils.Tao Bao2016-10-094-11/+5
* | | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils."Tao Bao2016-10-104-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Update the header path for ext4_utils.Tao Bao2016-10-074-11/+5
* | | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd am: 5ceada5beaMark Salyzyn2016-10-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfdMark Salyzyn2016-10-101-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6Mark Salyzyn2016-10-101-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h"Mark Salyzyn2016-10-101-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "No longer need android/log.h"Mark Salyzyn2016-10-101-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | No longer need android/log.hMark Salyzyn2016-10-071-1/+0
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aospTao Bao2016-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |