| Commit message (Expand) | Author | Age | Files | Lines |
* | Snap for 4942340 from d7859b1cb0d18b5c8ea44e4168177a06545409ab to qt-release | android-build-team Robot | 2018-08-09 | 2 | -4/+8 |
|\ |
|
| * | Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f am: 60e218cb5e am: 60fafd50d3 | Tao Bao | 2018-08-08 | 4 | -18/+10 |
| |\ |
|
| | * | Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f am: 60e218cb5e | Tao Bao | 2018-08-08 | 4 | -18/+10 |
| | |\ |
|
| | | * | Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f | Tao Bao | 2018-08-08 | 4 | -18/+10 |
| | | |\ |
|
| | | | * | Merge "Revert "Build and use minadbd as a shared library."" | Tao Bao | 2018-08-08 | 4 | -18/+10 |
| | | | |\ |
|
| | | | | * | Merge "Revert "Build and use minadbd as a shared library."" | Tao Bao | 2018-08-08 | 4 | -18/+10 |
| | | | | |\ |
|
| | | | | | * | Revert "Build and use minadbd as a shared library." | Tao Bao | 2018-08-08 | 4 | -18/+10 |
| | | | | |/ |
|
| * | | | | | Merge "minui: Track libsync module name change." am: 60924fa89a am: 7c42dc7284 am: 2217000e87 | Tao Bao | 2018-08-08 | 1 | -1/+1 |
| |\| | | | |
|
| | * | | | | Merge "minui: Track libsync module name change." am: 60924fa89a am: 7c42dc7284 | Tao Bao | 2018-08-08 | 1 | -1/+1 |
| | |\| | | |
|
| | | * | | | Merge "minui: Track libsync module name change." am: 60924fa89a | Tao Bao | 2018-08-08 | 1 | -1/+1 |
| | | |\| | |
|
| | | | * | | Merge "minui: Track libsync module name change." | Tao Bao | 2018-08-08 | 1 | -1/+1 |
| | | | |\| |
|
| | | | | * | Merge "minui: Track libsync module name change." | Tao Bao | 2018-08-08 | 1 | -1/+1 |
| | | | | |\ |
|
| | | | | | * | minui: Track libsync module name change. | Tao Bao | 2018-08-07 | 1 | -1/+1 |
| * | | | | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477 am: e0ded949e6 am: d6a445c1b5 | Tao Bao | 2018-08-08 | 1 | -3/+7 |
| |\| | | | | |
|
| | * | | | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477 am: e0ded949e6 | Tao Bao | 2018-08-08 | 1 | -3/+7 |
| | |\| | | | |
|
| | | * | | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477 | Tao Bao | 2018-08-08 | 1 | -3/+7 |
| | | |\| | | |
|
| | | | * | | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" | Tao Bao | 2018-08-08 | 1 | -3/+7 |
| | | | |\| | |
|
| | | | | * | | Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" | Tao Bao | 2018-08-07 | 1 | -3/+7 |
| | | | | |\ \
| | | | | | |/
| | | | | |/| |
|
| | | | | | * | Fix the DRM_FORMAT match with corresponding PixelFormat | tangrobin | 2018-08-07 | 1 | -3/+7 |
| * | | | | | | Merge "Build and use minadbd as a shared library." am: ea38c4160a am: 479dd68d9e am: 4bdb7b3c33 | Tao Bao | 2018-08-08 | 4 | -10/+18 |
| |\| | | | | |
|
| | * | | | | | Merge "Build and use minadbd as a shared library." am: ea38c4160a am: 479dd68d9e | Tao Bao | 2018-08-08 | 4 | -10/+18 |
| | |\| | | | |
|
| | | * | | | | Merge "Build and use minadbd as a shared library." am: ea38c4160a | Tao Bao | 2018-08-08 | 4 | -10/+18 |
| | | |\| | | |
|
| | | | * | | | Merge "Build and use minadbd as a shared library." | Tao Bao | 2018-08-08 | 4 | -10/+18 |
| | | | |\| | |
|
| | | | | * | | Merge "Build and use minadbd as a shared library." | Tao Bao | 2018-08-07 | 4 | -10/+18 |
| | | | | |\ \ |
|
| | | | | | * | | Build and use minadbd as a shared library. | Tao Bao | 2018-08-07 | 4 | -10/+18 |
| * | | | | | | | Merge "Merge Android Pie into master" am: 9791b21c1f am: 555802b108 am: 1f642fcc6a | Xin Li | 2018-08-08 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Merge Android Pie into master" am: 9791b21c1f am: 555802b108 | Xin Li | 2018-08-08 | 0 | -0/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Merge Android Pie into master" am: 9791b21c1f | Xin Li | 2018-08-08 | 0 | -0/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Merge Android Pie into master" | Xin Li | 2018-08-07 | 0 | -0/+0 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Merge Android Pie into master" | Xin Li | 2018-08-07 | 9 | -25/+105 |
| | | | | |\ \ \ |
|
| | | | | | * \ \ | Merge Android Pie into master | Xin Li | 2018-08-07 | 9 | -25/+105 |
| | | | | | |\ \ \
| | | | | | | |_|/
| | | | | | |/| | |
|
* | | | | | | | | | Snap for 4939473 from f2c45419d68cc7a22492c33c63c3f726bb4067d8 to qt-release | android-build-team Robot | 2018-08-08 | 12 | -27/+328 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "ueventd is now at /system/bin/ueventd" am: aceb244401 am: 89048728f3 am: 9001c159b3 | Tom Cherry | 2018-08-07 | 1 | -1/+1 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "ueventd is now at /system/bin/ueventd" am: aceb244401 am: 89048728f3 | Tom Cherry | 2018-08-07 | 1 | -1/+1 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "ueventd is now at /system/bin/ueventd" am: aceb244401 | Tom Cherry | 2018-08-07 | 1 | -1/+1 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "ueventd is now at /system/bin/ueventd" | Tom Cherry | 2018-08-07 | 1 | -1/+1 |
| | | | |\| | | |
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | Merge "ueventd is now at /system/bin/ueventd" | Tom Cherry | 2018-08-07 | 1 | -1/+1 |
| | | | | |\ \ \
| | | | | | |/ /
| | | | | |/| | |
|
| | | | | | * | | ueventd is now at /system/bin/ueventd | Tom Cherry | 2018-07-25 | 1 | -1/+1 |
| * | | | | | | | Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432 am: f82ff97029 | Tianjie Xu | 2018-08-07 | 8 | -18/+216 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432 | Tianjie Xu | 2018-08-07 | 8 | -18/+216 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add an updater function to compute hash tree" am: dbe4420325 | Tianjie Xu | 2018-08-07 | 8 | -18/+216 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Add an updater function to compute hash tree" | Tianjie Xu | 2018-08-07 | 8 | -18/+216 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Add an updater function to compute hash tree" | Tianjie Xu | 2018-08-07 | 8 | -18/+216 |
| | | | | |\ \ \
| | | | | | |_|/
| | | | | |/| | |
|
| | | | | | * | | Add an updater function to compute hash tree | Tianjie Xu | 2018-08-06 | 8 | -18/+216 |
| * | | | | | | | Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 am: 75acf24207 am: 39259af890 | Tao Bao | 2018-08-07 | 4 | -8/+111 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 am: 75acf24207 | Tao Bao | 2018-08-07 | 4 | -8/+111 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 | Tao Bao | 2018-08-07 | 4 | -8/+111 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Dynamically load device-specific recovery UI lib." | Tao Bao | 2018-08-07 | 4 | -8/+111 |
| | | | |\| | | |
|
| | | | | * | | | Merge "Dynamically load device-specific recovery UI lib." | Tao Bao | 2018-08-06 | 4 | -8/+111 |
| | | | | |\ \ \ |
|
| | | | | | * | | | Dynamically load device-specific recovery UI lib. | Tao Bao | 2018-08-06 | 4 | -8/+111 |
| | | | | |/ / / |
|
* | | | | | | | | Snap for 4937020 from a5a12d5a4f6a85d22f14d1f5f463ffeb35eea2ec to qt-release | android-build-team Robot | 2018-08-07 | 3 | -60/+46 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minui: Move to Soong." am: f2bc68cfe1 am: ea105889a5 am: bf40c42766 | Tao Bao | 2018-08-06 | 3 | -60/+46 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minui: Move to Soong." am: f2bc68cfe1 am: ea105889a5 | Tao Bao | 2018-08-06 | 3 | -60/+46 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minui: Move to Soong." am: f2bc68cfe1 | Tao Bao | 2018-08-06 | 3 | -60/+46 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minui: Move to Soong." | Tao Bao | 2018-08-06 | 3 | -60/+46 |
| | | | |\| | | |
|
| | | | | * | | | Merge "minui: Move to Soong." | Tao Bao | 2018-08-06 | 3 | -60/+46 |
| | | | | |\ \ \ |
|
| | | | | | * | | | minui: Move to Soong. | Tao Bao | 2018-08-05 | 3 | -60/+46 |
| | | | | |/ / / |
|
* | | | | | | | | Snap for 4933458 from 18834739ebc1da34aa677d1286abeae79ff69680 to qt-release | android-build-team Robot | 2018-08-05 | 15 | -171/+152 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a am: ce0409a560 am: 8f545f4c8c | Tao Bao | 2018-08-04 | 6 | -64/+69 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a am: ce0409a560 | Tao Bao | 2018-08-04 | 6 | -64/+69 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a | Tao Bao | 2018-08-04 | 6 | -64/+69 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minui: Use runtime properties instead of build time vars." | Tao Bao | 2018-08-04 | 6 | -64/+69 |
| | | | |\| | | |
|
| | | | | * | | | Merge "minui: Use runtime properties instead of build time vars." | Tao Bao | 2018-08-03 | 6 | -64/+69 |
| | | | | |\ \ \ |
|
| | | | | | * | | | minui: Use runtime properties instead of build time vars. | Tao Bao | 2018-08-02 | 6 | -64/+69 |
| * | | | | | | | | Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518 am: 814468deb5 | Tao Bao | 2018-08-04 | 9 | -107/+83 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518 | Tao Bao | 2018-08-04 | 9 | -107/+83 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 | Tao Bao | 2018-08-04 | 9 | -107/+83 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "ui: Read custom recovery UI values via system property." | Tao Bao | 2018-08-04 | 9 | -107/+83 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "ui: Read custom recovery UI values via system property." | Tao Bao | 2018-08-03 | 9 | -107/+83 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | ui: Read custom recovery UI values via system property. | Tao Bao | 2018-08-01 | 9 | -107/+83 |
* | | | | | | | | | | Snap for 4927259 from 67b66c019ac5760b5e6d9e1280f2d36cec509956 to qt-release | android-build-team Robot | 2018-08-02 | 4 | -34/+58 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6 am: e9775341be | Zhomart Mukhamejanov | 2018-08-02 | 1 | -6/+6 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6 | Zhomart Mukhamejanov | 2018-08-02 | 1 | -6/+6 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Remove non-A/B mention from README." am: f8b04fe48d | Zhomart Mukhamejanov | 2018-08-02 | 1 | -6/+6 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Remove non-A/B mention from README." | Zhomart Mukhamejanov | 2018-08-02 | 1 | -6/+6 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "Remove non-A/B mention from README." | Zhomart Mukhamejanov | 2018-08-02 | 1 | -6/+6 |
| | | | | |\ \ \ \ \
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
| | | | | | * | | | | Remove non-A/B mention from README. | Zhomart Mukhamejanov | 2018-08-02 | 1 | -6/+6 |
| | | | | |/ / / / |
|
| * | | | | | | | | Merge "minui: Clean up the use of `rotation`." am: a9ef617aa7 am: f22aeefaed am: f4e7bec485 | Tao Bao | 2018-08-01 | 2 | -27/+50 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "minui: Clean up the use of `rotation`." am: a9ef617aa7 am: f22aeefaed | Tao Bao | 2018-08-01 | 2 | -27/+50 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "minui: Clean up the use of `rotation`." am: a9ef617aa7 | Tao Bao | 2018-08-01 | 2 | -27/+50 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "minui: Clean up the use of `rotation`." | Tao Bao | 2018-08-01 | 2 | -27/+50 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "minui: Clean up the use of `rotation`." | Tao Bao | 2018-08-01 | 2 | -27/+50 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | minui: Clean up the use of `rotation`. | Tao Bao | 2018-08-01 | 2 | -27/+50 |
| | | | | | |/ / / |
|
| * | | | | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6 am: 4adfcf962f | Jaegeuk Kim | 2018-08-01 | 1 | -1/+2 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6 | Jaegeuk Kim | 2018-08-01 | 1 | -1/+2 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 | Jaegeuk Kim | 2018-08-01 | 1 | -1/+2 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file" | Jaegeuk Kim | 2018-08-01 | 1 | -1/+2 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "uncrypt: fix f2fs ioctl argument for pin_file" | Treehugger Robot | 2018-08-01 | 1 | -1/+2 |
| | | | | |\ \ \ \
| | | | | | |/ / /
| | | | | |/| | | |
|
| | | | | | * | | | uncrypt: fix f2fs ioctl argument for pin_file | Jaegeuk Kim | 2018-08-01 | 1 | -1/+2 |
| | | | | |/ / / |
|
* | | | | | | | | Snap for 4922124 from e540feb25eb01bddec3ca9bccb63a23846549af3 to qt-release | android-build-team Robot | 2018-07-31 | 6 | -33/+163 |
|\| | | | | | | |
|
| * | | | | | | | Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409 am: 9e9ef363fb | Jerry Zhang | 2018-07-31 | 6 | -33/+163 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409 | Jerry Zhang | 2018-07-31 | 6 | -33/+163 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: Add ability to interrupt UI" am: 561ee9362c | Jerry Zhang | 2018-07-31 | 6 | -33/+163 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: Add ability to interrupt UI" | Jerry Zhang | 2018-07-31 | 6 | -33/+163 |
| | | | |\| | | |
|
| | | | | * | | | Merge "recovery: Add ability to interrupt UI" | Treehugger Robot | 2018-07-31 | 6 | -33/+163 |
| | | | | |\ \ \
| | | | | | |/ /
| | | | | |/| | |
|
| | | | | | * | | recovery: Add ability to interrupt UI | Jerry Zhang | 2018-07-30 | 6 | -33/+163 |
| | | | | |/ / |
|
* | | | | | | | Snap for 4919674 from 40e5596aa7020fe65b3e14336c61d5e096a1f6b2 to qt-release | android-build-team Robot | 2018-07-29 | 11 | -72/+204 |
|\| | | | | | |
|
| * | | | | | | Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6 am: 3bef3a72bd | Josh Gao | 2018-07-28 | 1 | -22/+8 |
| |\| | | | | |
|
| | * | | | | | Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6 | Josh Gao | 2018-07-28 | 1 | -22/+8 |
| | |\| | | | |
|
| | | * | | | | Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a | Josh Gao | 2018-07-28 | 1 | -22/+8 |
| | | |\| | | |
|
| | | | * | | | Merge "minadbd: avoid overrriding services_to_fd." | Josh Gao | 2018-07-28 | 1 | -22/+8 |
| | | | |\| | |
|
| | | | | * | | Merge "minadbd: avoid overrriding services_to_fd." | Josh Gao | 2018-07-28 | 1 | -22/+8 |
| | | | | |\ \ |
|
| | | | | | * | | minadbd: avoid overrriding services_to_fd. | Josh Gao | 2018-07-27 | 1 | -22/+8 |
| | | | | | |/ |
|
| * | | | | | | Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b am: dcc5fa4d4f | Hridya Valsaraju | 2018-07-27 | 3 | -3/+3 |
| |\| | | | | |
|
| | * | | | | | Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b | Hridya Valsaraju | 2018-07-27 | 3 | -3/+3 |
| | |\| | | | |
|
| | | * | | | | Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 | Hridya Valsaraju | 2018-07-27 | 3 | -3/+3 |
| | | |\| | | |
|
| | | | * | | | Merge "Move recovery from /sbin to /system/bin" | Hridya Valsaraju | 2018-07-27 | 3 | -3/+3 |
| | | | |\| | |
|
| | | | | * | | Merge "Move recovery from /sbin to /system/bin" | Treehugger Robot | 2018-07-27 | 3 | -3/+3 |
| | | | | |\ \ |
|
| | | | | | * | | Move recovery from /sbin to /system/bin | Hridya Valsaraju | 2018-07-27 | 3 | -3/+3 |
| | | | | |/ / |
|
| * | | | | | | Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2 am: 2a047b9ff3 | Tianjie Xu | 2018-07-26 | 6 | -45/+191 |
| |\| | | | | |
|
| | * | | | | | Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2 | Tianjie Xu | 2018-07-26 | 6 | -45/+191 |
| | |\| | | | |
|
| | | * | | | | Merge "Add proto3 support for care_map" am: 8d9b3aec3d | Tianjie Xu | 2018-07-26 | 6 | -45/+191 |
| | | |\| | | |
|
| | | | * | | | Merge "Add proto3 support for care_map" | Tianjie Xu | 2018-07-26 | 6 | -45/+191 |
| | | | |\| | |
|
| | | | | * | | Merge "Add proto3 support for care_map" | Tianjie Xu | 2018-07-26 | 6 | -45/+191 |
| | | | | |\ \ |
|
| | | | | | * | | Add proto3 support for care_map | Tianjie Xu | 2018-07-25 | 6 | -45/+191 |
| | | | | | |/ |
|
| * | | | | | | Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23 am: 39e5bdaedb am: f2e7b1757a | Tao Bao | 2018-07-26 | 1 | -2/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23 am: 39e5bdaedb | Tao Bao | 2018-07-26 | 1 | -2/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23 | Tao Bao | 2018-07-26 | 1 | -2/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "bootloader_message: Build libbootloader_message as shared lib." | Tao Bao | 2018-07-26 | 1 | -2/+2 |
| | | | |\| | |
|
| | | | | * | | Merge "bootloader_message: Build libbootloader_message as shared lib." | Tao Bao | 2018-07-26 | 1 | -2/+2 |
| | | | | |\ \
| | | | | | |/
| | | | | |/| |
|
| | | | | | * | bootloader_message: Build libbootloader_message as shared lib. | Tao Bao | 2018-07-25 | 1 | -2/+2 |
| | | | | |/ |
|
* | | | | | | Snap for 4908492 from 2e0f71a45dcce04fd36b1756ca25891486e47a7f to qt-release | android-build-team Robot | 2018-07-24 | 6 | -27/+8 |
|\| | | | | |
|
| * | | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master am: 85b714c876 | Xin Li | 2018-07-24 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master | Xin Li | 2018-07-23 | 0 | -0/+0 |
| | |\| | | |
|
| | | * | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master | Xin Li | 2018-07-23 | 0 | -0/+0 |
| | | |\ \ \ |
|
| | | | * \ \ | Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master | Xin Li | 2018-07-23 | 0 | -0/+0 |
| | | | |\ \ \ |
|
| * | | | | | | | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master am: 5c9e580f4f am: 56ba447c57 | Hridya Valsaraju | 2018-07-23 | 6 | -27/+8 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master am: 5c9e580f4f | Hridya Valsaraju | 2018-07-23 | 6 | -27/+8 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master | Hridya Valsaraju | 2018-07-23 | 6 | -27/+8 |
| | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | / /
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master | TreeHugger Robot | 2018-07-23 | 6 | -27/+8 |
| | | | |\ \ \ |
|
| | | | | * | | | Revert "Make recovery libraries shared / recovery_available" | Hridya Valsaraju | 2018-07-23 | 6 | -27/+8 |
* | | | | | | | | Snap for 4906041 from bfbe71e900d38660386fdb447ce09e85aa1c1f81 to qt-release | android-build-team Robot | 2018-07-22 | 13 | -346/+286 |
|\| | | | | | | |
|
| * | | | | | | | Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942 am: 4ad9995b5b | Tao Bao | 2018-07-21 | 6 | -338/+252 |
| |\| | | | | | |
|
| | * | | | | | | Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942 | Tao Bao | 2018-07-21 | 6 | -338/+252 |
| | |\| | | | |
| | | |_|_|/ /
| | |/| | | | |
|
| | | * | | | | Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 | Tao Bao | 2018-07-21 | 6 | -338/+252 |
| | | |\| | | |
|
| | | | * | | | Merge "applypatch: Change applypatch command-line arguments." | Tao Bao | 2018-07-21 | 6 | -338/+252 |
| | | | |\ \ \
| | | | | | |/
| | | | | |/| |
|
| | | | | * | | Merge "applypatch: Change applypatch command-line arguments." | Tao Bao | 2018-07-21 | 6 | -338/+252 |
| | | | | |\ \ |
|
| | | | | | * | | applypatch: Change applypatch command-line arguments. | Tao Bao | 2018-07-20 | 6 | -338/+252 |
| * | | | | | | | Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3 am: 393a97ff8b am: d275207d9d | Karl Shaffer | 2018-07-20 | 1 | -0/+7 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3 am: 393a97ff8b | Karl Shaffer | 2018-07-20 | 1 | -0/+7 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3 | Karl Shaffer | 2018-07-20 | 1 | -0/+7 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Updates Wear UI to Display Localized Recovery Text." | Karl Shaffer | 2018-07-20 | 1 | -0/+7 |
| | | | |\| | |
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | Merge "Updates Wear UI to Display Localized Recovery Text." | Treehugger Robot | 2018-07-20 | 1 | -0/+7 |
| | | | | |\ \
| | | | | | |/
| | | | | |/| |
|
| | | | | | * | Updates Wear UI to Display Localized Recovery Text. | Karl Shaffer | 2018-07-20 | 1 | -0/+7 |
| | | | | |/ |
|
| * | | | | | [automerger skipped] Make recovery libraries shared / recovery_available am: c936a69619 am: 3e8262d633 | Jerry Zhang | 2018-07-20 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | Make recovery libraries shared / recovery_available am: c936a69619 | Jerry Zhang | 2018-07-20 | 6 | -8/+27 |
| | |\| | | |
|
| | | * | | | Make recovery libraries shared / recovery_available | Jerry Zhang | 2018-07-20 | 6 | -8/+27 |
| | |/| | |
| | | |/ / |
|
| | | * | | Make recovery libraries shared / recovery_available | Jerry Zhang | 2018-07-20 | 6 | -8/+27 |
| * | | | | Make recovery libraries shared / recovery_available | Jerry Zhang | 2018-07-20 | 6 | -8/+27 |
* | | | | | Snap for 4899223 from 6e46cff9b27df699a1f78442606cbd09aed53461 to qt-release | android-build-team Robot | 2018-07-18 | 5 | -10/+32 |
|\| | | | |
|
| * | | | | Merge "Fix the arguments passed to getopt_long(3)." am: 29932e7bcc am: 2f9d61ad25 | Tao Bao | 2018-07-18 | 5 | -10/+32 |
| |\| | | |
|
| | * | | | Merge "Fix the arguments passed to getopt_long(3)." am: 29932e7bcc | Tao Bao | 2018-07-18 | 5 | -10/+32 |
| | |\| | |
|
| | | * | | Merge "Fix the arguments passed to getopt_long(3)." | Tao Bao | 2018-07-17 | 5 | -10/+32 |
| | | |\| |
|
| | | | * | Merge "Fix the arguments passed to getopt_long(3)." | Tao Bao | 2018-07-17 | 5 | -10/+32 |
| | | | |\ |
|
| | | | | * | Fix the arguments passed to getopt_long(3). | Tao Bao | 2018-07-17 | 5 | -10/+32 |
| | | | |/ |
|
* | | | | | Snap for 4894319 from 399efe580621fb5c22aa163982af4b00122fa4ef to qt-release | android-build-team Robot | 2018-07-15 | 7 | -84/+98 |
|\| | | | |
|
| * | | | | Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." am: 624b6b6cd5 am: 603b7ed470 | Tao Bao | 2018-07-13 | 5 | -25/+16 |
| |\| | | |
|
| | * | | | Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." am: 624b6b6cd5 | Tao Bao | 2018-07-13 | 5 | -25/+16 |
| | |\| | |
|
| | | * | | Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." | Tao Bao | 2018-07-13 | 5 | -25/+16 |
| | | |\| |
|
| | | | * | Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." | Tao Bao | 2018-07-13 | 5 | -25/+16 |
| | | | |\ |
|
| | | | | * | applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache(). | Tao Bao | 2018-07-13 | 5 | -25/+16 |
| | | | |/ |
|
| * | | | | Merge "tests: Clean up the temporary dirs post-run." am: b46e565fd8 am: d8e96f4b4d | Tao Bao | 2018-07-13 | 2 | -21/+22 |
| |\| | | |
|
| | * | | | Merge "tests: Clean up the temporary dirs post-run." am: b46e565fd8 | Tao Bao | 2018-07-13 | 2 | -21/+22 |
| | |\| | |
|
| | | * | | Merge "tests: Clean up the temporary dirs post-run." | Tao Bao | 2018-07-13 | 2 | -21/+22 |
| | | |\| |
|
| | | | * | Merge "tests: Clean up the temporary dirs post-run." | Tao Bao | 2018-07-13 | 2 | -21/+22 |
| | | | |\ |
|
| | | | | * | tests: Clean up the temporary dirs post-run. | Tao Bao | 2018-07-12 | 2 | -21/+22 |
| * | | | | | Merge "applypatch: Fix the return type of FreeSpaceForFile()." am: 90c9e4f55c am: c9f676bc64 | Tao Bao | 2018-07-13 | 4 | -25/+51 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Fix the return type of FreeSpaceForFile()." am: 90c9e4f55c | Tao Bao | 2018-07-13 | 4 | -25/+51 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Fix the return type of FreeSpaceForFile()." | Tao Bao | 2018-07-13 | 4 | -25/+51 |
| | | |\| | |
|
| | | | * | | Merge "applypatch: Fix the return type of FreeSpaceForFile()." | Tao Bao | 2018-07-13 | 4 | -25/+51 |
| | | | |\| |
|
| | | | | * | applypatch: Fix the return type of FreeSpaceForFile(). | Tao Bao | 2018-07-12 | 4 | -25/+51 |
| | | | |/ |
|
| * | | | | Merge "applypatch: Switch freecache.cpp to libbase logging." am: a0b2aad0f8 am: cea180895c | Tao Bao | 2018-07-12 | 1 | -21/+17 |
| |\| | | |
|
| | * | | | Merge "applypatch: Switch freecache.cpp to libbase logging." am: a0b2aad0f8 | Tao Bao | 2018-07-12 | 1 | -21/+17 |
| | |\| | |
|
| | | * | | Merge "applypatch: Switch freecache.cpp to libbase logging." | Tao Bao | 2018-07-12 | 1 | -21/+17 |
| | | |\| |
|
| | | | * | Merge "applypatch: Switch freecache.cpp to libbase logging." | Tao Bao | 2018-07-12 | 1 | -21/+17 |
| | | | |\ |
|
| | | | | * | applypatch: Switch freecache.cpp to libbase logging. | Tao Bao | 2018-07-12 | 1 | -21/+17 |
| | | | |/ |
|
* | | | | | Snap for 4887897 from ad7beb410d7c54373bf13962a78762f0d740ff78 to qt-release | android-build-team Robot | 2018-07-12 | 3 | -98/+4 |
|\| | | | |
|
| * | | | | Merge "Remove the debug code for bspatch flakiness" am: a9f9acca91 am: 04a6af06fb | Tao Bao | 2018-07-12 | 3 | -98/+4 |
| |\| | | |
|
| | * | | | Merge "Remove the debug code for bspatch flakiness" am: a9f9acca91 | Tao Bao | 2018-07-12 | 3 | -98/+4 |
| | |\| | |
|
| | | * | | Merge "Remove the debug code for bspatch flakiness" | Tao Bao | 2018-07-12 | 3 | -98/+4 |
| | | |\| |
|
| | | | * | Merge "Remove the debug code for bspatch flakiness" | Tao Bao | 2018-07-12 | 3 | -98/+4 |
| | | | |\ |
|
| | | | | * | Remove the debug code for bspatch flakiness | Tianjie Xu | 2018-07-11 | 3 | -98/+4 |
| | | | |/ |
|
* | | | | | Snap for 4885240 from 76b289022d233ad0f2372bf1ab01fa6bcfee0b95 to qt-release | android-build-team Robot | 2018-07-11 | 13 | -263/+250 |
|\| | | | |
|
| * | | | | Merge "updater: Let read_file() return Value::Type::STRING." am: ac234b4493 am: e089c1a149 | Tao Bao | 2018-07-10 | 2 | -5/+28 |
| |\| | | |
|
| | * | | | Merge "updater: Let read_file() return Value::Type::STRING." am: ac234b4493 | Tao Bao | 2018-07-10 | 2 | -5/+28 |
| | |\| | |
|
| | | * | | Merge "updater: Let read_file() return Value::Type::STRING." | Tao Bao | 2018-07-10 | 2 | -5/+28 |
| | | |\| |
|
| | | | * | Merge "updater: Let read_file() return Value::Type::STRING." | Tao Bao | 2018-07-10 | 2 | -5/+28 |
| | | | |\ |
|
| | | | | * | updater: Let read_file() return Value::Type::STRING. | Tao Bao | 2018-07-10 | 2 | -5/+28 |
| | | | |/ |
|
| * | | | | Merge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706e am: 17cda674f3 | Tao Bao | 2018-07-10 | 5 | -74/+71 |
| |\| | | |
|
| | * | | | Merge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706e | Tao Bao | 2018-07-10 | 5 | -74/+71 |
| | |\| | |
|
| | | * | | Merge "edify: Rename parse_string to ParseString and let it take std::string." | Tao Bao | 2018-07-10 | 5 | -74/+71 |
| | | |\| |
|
| | | | * | Merge "edify: Rename parse_string to ParseString and let it take std::string." | Tao Bao | 2018-07-10 | 5 | -74/+71 |
| | | | |\ |
|
| | | | | * | edify: Rename parse_string to ParseString and let it take std::string. | Tao Bao | 2018-07-10 | 5 | -74/+71 |
| * | | | | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043 am: d8a2c2682a | Tao Bao | 2018-07-10 | 8 | -85/+82 |
| |\| | | | |
|
| | * | | | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043 | Tao Bao | 2018-07-10 | 8 | -85/+82 |
| | |\| | | |
|
| | | * | | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class." | Tao Bao | 2018-07-10 | 8 | -85/+82 |
| | | |\| | |
|
| | | | * | | Merge "edify: Remove VAL_INVALID and move ValueType into Value class." | Tao Bao | 2018-07-10 | 8 | -85/+82 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | edify: Remove VAL_INVALID and move ValueType into Value class. | Tao Bao | 2018-07-10 | 8 | -85/+82 |
| | | | |/ |
|
| * | | | | Merge "applypatch: Restrict applypatch_check to eMMC targets." am: e02cbaaa62 am: 254d43a3b9 | Tao Bao | 2018-07-10 | 4 | -99/+66 |
| |\| | | |
|
| | * | | | Merge "applypatch: Restrict applypatch_check to eMMC targets." am: e02cbaaa62 | Tao Bao | 2018-07-10 | 4 | -99/+66 |
| | |\| | |
|
| | | * | | Merge "applypatch: Restrict applypatch_check to eMMC targets." | Tao Bao | 2018-07-10 | 4 | -99/+66 |
| | | |\| |
|
| | | | * | Merge "applypatch: Restrict applypatch_check to eMMC targets." | Tao Bao | 2018-07-10 | 4 | -99/+66 |
| | | | |\ |
|
| | | | | * | applypatch: Restrict applypatch_check to eMMC targets. | Tao Bao | 2018-07-10 | 4 | -99/+66 |
| * | | | | | Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58c am: 471053ba87 | Tao Bao | 2018-07-10 | 1 | -4/+7 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58c | Tao Bao | 2018-07-10 | 1 | -4/+7 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Fix a potential nullptr dereferencing." | Tao Bao | 2018-07-10 | 1 | -4/+7 |
| | | |\| | |
|
| | | | * | | Merge "applypatch: Fix a potential nullptr dereferencing." | Tao Bao | 2018-07-10 | 1 | -4/+7 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | applypatch: Fix a potential nullptr dereferencing. | Tao Bao | 2018-07-10 | 1 | -4/+7 |
* | | | | | | Snap for 4882954 from 862b7c49ff3839ee0004d84485e0a16d6f985c1d to qt-release | android-build-team Robot | 2018-07-10 | 6 | -86/+98 |
|\| | | | | |
|
| * | | | | | Merge "updater: Remove the support for sha1_check()." am: fbc0f6062c am: e2136c46cb | Tao Bao | 2018-07-10 | 2 | -82/+29 |
| |\| | | | |
|
| | * | | | | Merge "updater: Remove the support for sha1_check()." am: fbc0f6062c | Tao Bao | 2018-07-10 | 2 | -82/+29 |
| | |\| | | |
|
| | | * | | | Merge "updater: Remove the support for sha1_check()." | Tao Bao | 2018-07-10 | 2 | -82/+29 |
| | | |\| | |
|
| | | | * | | Merge "updater: Remove the support for sha1_check()." | Tao Bao | 2018-07-10 | 2 | -82/+29 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | updater: Remove the support for sha1_check(). | Tao Bao | 2018-07-09 | 2 | -82/+29 |
| | | | |/ |
|
| * | | | | Merge "updater: Add ABORT command." am: c059b6c1c6 am: b450952d6a | Tao Bao | 2018-07-09 | 5 | -4/+69 |
| |\| | | |
|
| | * | | | Merge "updater: Add ABORT command." am: c059b6c1c6 | Tao Bao | 2018-07-09 | 5 | -4/+69 |
| | |\| | |
|
| | | * | | Merge "updater: Add ABORT command." | Tao Bao | 2018-07-09 | 5 | -4/+69 |
| | | |\| |
|
| | | | * | Merge "updater: Add ABORT command." | Tao Bao | 2018-07-09 | 5 | -4/+69 |
| | | | |\ |
|
| | | | | * | updater: Add ABORT command. | Tao Bao | 2018-07-07 | 5 | -4/+69 |
| | | | |/ |
|
* | | | | | Snap for 4880201 from 9dfbf6a63b4c585cfa21f3751ea84fa245150944 to qt-release | android-build-team Robot | 2018-07-07 | 3 | -289/+331 |
|\| | | | |
|
| * | | | | Merge "tests: Split unit tests out of component/applypatch_test.cpp." am: cf1f9bdb12 am: cac6932cf4 | Tao Bao | 2018-07-06 | 3 | -289/+331 |
| |\| | | |
|
| | * | | | Merge "tests: Split unit tests out of component/applypatch_test.cpp." am: cf1f9bdb12 | Tao Bao | 2018-07-06 | 3 | -289/+331 |
| | |\| | |
|
| | | * | | Merge "tests: Split unit tests out of component/applypatch_test.cpp." | Tao Bao | 2018-07-06 | 3 | -289/+331 |
| | | |\| |
|
| | | | * | Merge "tests: Split unit tests out of component/applypatch_test.cpp." | Tao Bao | 2018-07-06 | 3 | -289/+331 |
| | | | |\ |
|
| | | | | * | tests: Split unit tests out of component/applypatch_test.cpp. | Tao Bao | 2018-07-06 | 3 | -289/+331 |
| | | | |/ |
|
* | | | | | Snap for 4878387 from 6bfc75a300a496f9ee4f9ff83bb3d89c8c117430 to qt-release | android-build-team Robot | 2018-07-06 | 2 | -2/+41 |
|\| | | | |
|
| * | | | | Merge "minui/drm: wait for page flip completion" am: d419966730 am: d3e023c265 | Jeremy Compostella | 2018-07-04 | 1 | -1/+38 |
| |\| | | |
|
| | * | | | Merge "minui/drm: wait for page flip completion" am: d419966730 | Jeremy Compostella | 2018-07-04 | 1 | -1/+38 |
| | |\| | |
|
| | | * | | Merge "minui/drm: wait for page flip completion" | Jeremy Compostella | 2018-07-04 | 1 | -1/+38 |
| | | |\| |
|
| | | | * | Merge "minui/drm: wait for page flip completion" | Treehugger Robot | 2018-07-04 | 1 | -1/+38 |
| | | | |\ |
|
| | | | | * | minui/drm: wait for page flip completion | Jeremy Compostella | 2018-07-03 | 1 | -1/+38 |
| * | | | | | Merge "No longer print hash for stashed blocks during verification of retry" am: 0a84d7260b am: 65419746cb | Tianjie Xu | 2018-07-03 | 1 | -1/+3 |
| |\| | | | |
|
| | * | | | | Merge "No longer print hash for stashed blocks during verification of retry" am: 0a84d7260b | Tianjie Xu | 2018-07-03 | 1 | -1/+3 |
| | |\| | | |
|
| | | * | | | Merge "No longer print hash for stashed blocks during verification of retry" | Tianjie Xu | 2018-07-03 | 1 | -1/+3 |
| | | |\| | |
|
| | | | * | | Merge "No longer print hash for stashed blocks during verification of retry" | Tianjie Xu | 2018-07-03 | 1 | -1/+3 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | No longer print hash for stashed blocks during verification of retry | Tianjie Xu | 2018-07-03 | 1 | -1/+3 |
| | | | |/ |
|
* | | | | | Snap for 4869171 from c3701ea992f7421f7d4cf78184b765e178c63707 to qt-release | android-build-team Robot | 2018-06-29 | 5 | -17/+830 |
|\| | | | |
|
| * | | | | Merge "updater: Check the number of args in Command::Parse." am: 95b8d2b064 am: 42f96e5516 | Tao Bao | 2018-06-26 | 2 | -9/+41 |
| |\| | | |
|
| | * | | | Merge "updater: Check the number of args in Command::Parse." am: 95b8d2b064 | Tao Bao | 2018-06-26 | 2 | -9/+41 |
| | |\| | |
|
| | | * | | Merge "updater: Check the number of args in Command::Parse." | Tao Bao | 2018-06-26 | 2 | -9/+41 |
| | | |\| |
|
| | | | * | Merge "updater: Check the number of args in Command::Parse." | Tao Bao | 2018-06-26 | 2 | -9/+41 |
| | | | |\ |
|
| | | | | * | updater: Check the number of args in Command::Parse. | Tao Bao | 2018-06-25 | 2 | -9/+41 |
| * | | | | | Merge "updater: Add Command parsing codes." am: afc2962e60 am: e6604307f6 | Tao Bao | 2018-06-26 | 5 | -17/+798 |
| |\| | | | |
|
| | * | | | | Merge "updater: Add Command parsing codes." am: afc2962e60 | Tao Bao | 2018-06-26 | 5 | -17/+798 |
| | |\| | | |
|
| | | * | | | Merge "updater: Add Command parsing codes." | Tao Bao | 2018-06-26 | 5 | -17/+798 |
| | | |\| | |
|
| | | | * | | Merge "updater: Add Command parsing codes." | Tao Bao | 2018-06-26 | 5 | -17/+798 |
| | | | |\| |
|
| | | | | * | updater: Add Command parsing codes. | Tao Bao | 2018-06-25 | 5 | -17/+798 |
| | | | |/ |
|
* | | | | | Snap for 4861480 from a9be0c16f3375a2b540d52bff7eefb695bae1ad2 to qt-release | android-build-team Robot | 2018-06-26 | 4 | -18/+19 |
|\| | | | |
|
| * | | | | Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." am: b4181566f9 am: 839c40513a | Tao Bao | 2018-06-25 | 4 | -18/+19 |
| |\| | | |
|
| | * | | | Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." am: b4181566f9 | Tao Bao | 2018-06-25 | 4 | -18/+19 |
| | |\| | |
|
| | | * | | Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." | Tao Bao | 2018-06-25 | 4 | -18/+19 |
| | | |\| |
|
| | | | * | Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." | Tao Bao | 2018-06-25 | 4 | -18/+19 |
| | | | |\ |
|
| | | | | * | applypatch: {Load,Save}FileContents and ParseSha1 take std::string. | Tao Bao | 2018-06-20 | 4 | -18/+19 |
* | | | | | | Snap for 4859748 from b8cb76e380953c08fb03660f4a6d203c081307ac to qt-release | android-build-team Robot | 2018-06-25 | 2 | -113/+118 |
|\| | | | | |
|
| * | | | | | Merge "applypatch: Move to libbase logging." am: bd76709827 am: 513c7fb9e0 | Tao Bao | 2018-06-24 | 2 | -113/+118 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Move to libbase logging." am: bd76709827 | Tao Bao | 2018-06-24 | 2 | -113/+118 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Move to libbase logging." | Tao Bao | 2018-06-24 | 2 | -113/+118 |
| | | |\| | |
|
| | | | * | | Merge "applypatch: Move to libbase logging." | Treehugger Robot | 2018-06-24 | 2 | -113/+118 |
| | | | |\| |
|
| | | | | * | applypatch: Move to libbase logging. | Tao Bao | 2018-06-20 | 2 | -113/+118 |
* | | | | | | Snap for 4856842 from 8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04 to qt-release | android-build-team Robot | 2018-06-22 | 17 | -311/+323 |
|\| | | | | |
|
| * | | | | | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f am: 681ae40d41 | Jiyong Park | 2018-06-21 | 3 | -14/+8 |
| |\| | | | |
|
| | * | | | | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f | Jiyong Park | 2018-06-21 | 3 | -14/+8 |
| | |\| | | |
|
| | | * | | | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" | Jiyong Park | 2018-06-21 | 3 | -14/+8 |
| | | |\| | |
|
| | | | * | | Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" | Treehugger Robot | 2018-06-21 | 3 | -14/+8 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | e2fsdroid and mke2fs are dynamic executable in recovery partition | Jiyong Park | 2018-06-20 | 3 | -14/+8 |
| * | | | | | Merge "applypatch: Clean up the function comments." am: 24e1321bc3 am: d4c1045d4e | Tao Bao | 2018-06-20 | 2 | -116/+105 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Clean up the function comments." am: 24e1321bc3 | Tao Bao | 2018-06-20 | 2 | -116/+105 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Clean up the function comments." | Tao Bao | 2018-06-20 | 2 | -116/+105 |
| | | |\| | |
|
| | | | * | | Merge "applypatch: Clean up the function comments." | Tao Bao | 2018-06-20 | 2 | -116/+105 |
| | | | |\ \ |
|
| | | | | * | | applypatch: Clean up the function comments. | Tao Bao | 2018-06-20 | 2 | -116/+105 |
| * | | | | | | Merge "updater: Defer the creation of the new data writer." am: ddc81680e6 am: ae3e472a43 | Tao Bao | 2018-06-20 | 1 | -24/+24 |
| |\| | | | | |
|
| | * | | | | | Merge "updater: Defer the creation of the new data writer." am: ddc81680e6 | Tao Bao | 2018-06-20 | 1 | -24/+24 |
| | |\| | | | |
|
| | | * | | | | Merge "updater: Defer the creation of the new data writer." | Tao Bao | 2018-06-20 | 1 | -24/+24 |
| | | |\| | | |
|
| | | | * | | | Merge "updater: Defer the creation of the new data writer." | Tao Bao | 2018-06-20 | 1 | -24/+24 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | updater: Defer the creation of the new data writer. | Tao Bao | 2018-06-18 | 1 | -24/+24 |
| * | | | | | | Merge "updater_sample: add privileged system app docs" am: 4a2c2d8102 am: 9b4d364409 | Zhomart Mukhamejanov | 2018-06-20 | 3 | -29/+57 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: add privileged system app docs" am: 4a2c2d8102 | Zhomart Mukhamejanov | 2018-06-20 | 3 | -29/+57 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: add privileged system app docs" | Zhomart Mukhamejanov | 2018-06-20 | 3 | -29/+57 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: add privileged system app docs" | Zhomart Mukhamejanov | 2018-06-20 | 3 | -29/+57 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | updater_sample: add privileged system app docs | Zhomart Mukhamejanov | 2018-06-18 | 3 | -29/+57 |
| * | | | | | | Merge "Drop the dependency on AB_OTA_UPDATER flag." am: 9fb0d89583 am: a855c33880 | Tao Bao | 2018-06-19 | 7 | -127/+126 |
| |\| | | | | |
|
| | * | | | | | Merge "Drop the dependency on AB_OTA_UPDATER flag." am: 9fb0d89583 | Tao Bao | 2018-06-19 | 7 | -127/+126 |
| | |\| | | | |
|
| | | * | | | | Merge "Drop the dependency on AB_OTA_UPDATER flag." | Tao Bao | 2018-06-19 | 7 | -127/+126 |
| | | |\| | | |
|
| | | | * | | | Merge "Drop the dependency on AB_OTA_UPDATER flag." | Tao Bao | 2018-06-19 | 7 | -127/+126 |
| | | | |\ \ \ |
|
| | | | | * | | | Drop the dependency on AB_OTA_UPDATER flag. | Tao Bao | 2018-06-19 | 7 | -127/+126 |
| * | | | | | | | Merge "updater_sample: run as a systemp app" am: 6b788b1848 am: bb1c6bf7cc | Zhomart Mukhamejanov | 2018-06-19 | 2 | -1/+3 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater_sample: run as a systemp app" am: 6b788b1848 | Zhomart Mukhamejanov | 2018-06-19 | 2 | -1/+3 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater_sample: run as a systemp app" | Zhomart Mukhamejanov | 2018-06-19 | 2 | -1/+3 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater_sample: run as a systemp app" | Zhomart Mukhamejanov | 2018-06-19 | 2 | -1/+3 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| / /
| | | | | |/ / |
|
| | | | | * | | updater_sample: run as a systemp app | Zhomart Mukhamejanov | 2018-06-18 | 2 | -1/+3 |
* | | | | | | | Snap for 4848708 from 0c0a6dd512a3144cd8a710921554eb074f273905 to qt-release | android-build-team Robot | 2018-06-19 | 3 | -5/+28 |
|\| | | | | | |
|
| * | | | | | | Merge "updater_sample: add proguard.flags" am: 5af63a45d9 am: 468ad1d965 | Zhomart Mukhamejanov | 2018-06-19 | 3 | -5/+28 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: add proguard.flags" am: 5af63a45d9 | Zhomart Mukhamejanov | 2018-06-19 | 3 | -5/+28 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: add proguard.flags" | Zhomart Mukhamejanov | 2018-06-19 | 3 | -5/+28 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: add proguard.flags" | Zhomart Mukhamejanov | 2018-06-19 | 3 | -5/+28 |
| | | | |\| |
| | | | | |/
| | | | |/| |
|
| | | | | * | updater_sample: add proguard.flags | Zhomart Mukhamejanov | 2018-06-18 | 3 | -5/+28 |
| | | | |/ |
|
* | | | | | Snap for 4842501 from ad22bcbf8de1a9bafc384c1bac46f3052605a066 to qt-release | android-build-team Robot | 2018-06-15 | 8 | -40/+86 |
|\| | | | |
|
| * | | | | Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478 am: c48f0b6923 | Zhomart Mukhamejanov | 2018-06-14 | 1 | -0/+1 |
| |\| | | |
|
| | * | | | Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478 | Zhomart Mukhamejanov | 2018-06-14 | 1 | -0/+1 |
| | |\| | |
|
| | | * | | Merge "updater_sample: add metadata mismatch error code" | Zhomart Mukhamejanov | 2018-06-14 | 1 | -0/+1 |
| | | |\| |
|
| | | | * | Merge "updater_sample: add metadata mismatch error code" | Zhomart Mukhamejanov | 2018-06-14 | 1 | -0/+1 |
| | | | |\ |
|
| | | | | * | updater_sample: add metadata mismatch error code | Zhomart Mukhamejanov | 2018-06-14 | 1 | -0/+1 |
| * | | | | | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3 am: c7b4418a80 | Tao Bao | 2018-06-14 | 1 | -1/+38 |
| |\| | | | |
|
| | * | | | | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3 | Tao Bao | 2018-06-14 | 1 | -1/+38 |
| | |\| | | |
|
| | | * | | | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." | Tao Bao | 2018-06-14 | 1 | -1/+38 |
| | | |\| | |
|
| | | | * | | Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." | Tao Bao | 2018-06-14 | 1 | -1/+38 |
| | | | |\ \ |
|
| | | | | * | | tests: Skip ScreenRecoveryUITest on gr_init failure. | Tao Bao | 2018-06-14 | 1 | -1/+38 |
| * | | | | | | Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8 am: 888dae6c13 | Ian Pedowitz | 2018-06-14 | 3 | -28/+6 |
| |\| | | | | |
|
| | * | | | | | Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8 | Ian Pedowitz | 2018-06-14 | 3 | -28/+6 |
| | |\| | | | |
|
| | | * | | | | Merge "Revert "updater_sample: add proguard.flags"" | Ian Pedowitz | 2018-06-14 | 3 | -28/+6 |
| | | |\| | | |
|
| | | | * | | | Merge "Revert "updater_sample: add proguard.flags"" | Ian Pedowitz | 2018-06-14 | 3 | -28/+6 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Revert "updater_sample: add proguard.flags" | Ian Pedowitz | 2018-06-14 | 3 | -28/+6 |
| * | | | | | | Merge "screen_ui: Move the call to gr_init() into Init()." am: 4264ee890e am: 2a3c46a068 | Tao Bao | 2018-06-14 | 1 | -2/+6 |
| |\| | | | | |
|
| | * | | | | | Merge "screen_ui: Move the call to gr_init() into Init()." am: 4264ee890e | Tao Bao | 2018-06-14 | 1 | -2/+6 |
| | |\| | | | |
|
| | | * | | | | Merge "screen_ui: Move the call to gr_init() into Init()." | Tao Bao | 2018-06-14 | 1 | -2/+6 |
| | | |\| | | |
|
| | | | * | | | Merge "screen_ui: Move the call to gr_init() into Init()." | Tao Bao | 2018-06-14 | 1 | -2/+6 |
| | | | |\ \ \ |
|
| | | | | * | | | screen_ui: Move the call to gr_init() into Init(). | Tao Bao | 2018-06-14 | 1 | -2/+6 |
| * | | | | | | | Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 am: 52a702181e | Tao Bao | 2018-06-14 | 1 | -0/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 | Tao Bao | 2018-06-14 | 1 | -0/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "screen_ui: Call gr_exit() from dtor." | Tao Bao | 2018-06-14 | 1 | -0/+2 |
| | | |\| | | | |
|
| | | | * | | | | Merge "screen_ui: Call gr_exit() from dtor." | Treehugger Robot | 2018-06-14 | 1 | -0/+2 |
| | | | |\| | | |
|
| | | | | * | | | screen_ui: Call gr_exit() from dtor. | Tao Bao | 2018-06-14 | 1 | -0/+2 |
| * | | | | | | | Merge "Recovery image is self-contained" am: 397e8f2279 am: 93ea306913 | Jiyong Park | 2018-06-14 | 3 | -17/+8 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Recovery image is self-contained" am: 397e8f2279 | Jiyong Park | 2018-06-14 | 3 | -17/+8 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Recovery image is self-contained" | Jiyong Park | 2018-06-14 | 3 | -17/+8 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Recovery image is self-contained" | Treehugger Robot | 2018-06-14 | 3 | -17/+8 |
| | | | |\ \ \ \
| | | | | |_|_|/
| | | | |/| | | |
|
| | | | | * | | | Recovery image is self-contained | Jiyong Park | 2018-06-07 | 3 | -17/+8 |
| * | | | | | | | Merge "updater_sample: add proguard.flags" am: 5ced47d120 am: 9b6a9aceae | Zhomart Mukhamejanov | 2018-06-14 | 3 | -6/+28 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater_sample: add proguard.flags" am: 5ced47d120 | Zhomart Mukhamejanov | 2018-06-14 | 3 | -6/+28 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater_sample: add proguard.flags" | Zhomart Mukhamejanov | 2018-06-14 | 3 | -6/+28 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater_sample: add proguard.flags" | Zhomart Mukhamejanov | 2018-06-14 | 3 | -6/+28 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | /
| | | | | | |/
| | | | | |/| |
|
| | | | | * | | updater_sample: add proguard.flags | Zhomart Mukhamejanov | 2018-06-13 | 3 | -6/+28 |
| * | | | | | | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe am: cc08655e65 | Tao Bao | 2018-06-14 | 2 | -20/+31 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe | Tao Bao | 2018-06-14 | 2 | -20/+31 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." | Tao Bao | 2018-06-14 | 2 | -20/+31 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." | Tao Bao | 2018-06-14 | 2 | -20/+31 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | minui: Add constness to GRSurface* in gr_get_{width,height}. | Tao Bao | 2018-06-13 | 2 | -20/+31 |
| | | | |/ / |
|
* | | | | | | Snap for 4832164 from 821d03bb6f53ac4ef772fa39159a4beba103ffd5 to qt-release | android-build-team Robot | 2018-06-10 | 1 | -12/+10 |
|\| | | | | |
|
| * | | | | | Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a am: 941d3ab754 | Tao Bao | 2018-06-09 | 1 | -12/+10 |
| |\| | | | |
|
| | * | | | | Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a | Tao Bao | 2018-06-09 | 1 | -12/+10 |
| | |\| | | |
|
| | | * | | | Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." | Tao Bao | 2018-06-09 | 1 | -12/+10 |
| | | |\| | |
|
| | | | * | | Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." | Tao Bao | 2018-06-09 | 1 | -12/+10 |
| | | | |\ \ |
|
| | | | | * | | updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3(). | Tao Bao | 2018-06-08 | 1 | -12/+10 |
| | | | |/ / |
|
| * | | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master am: d8a411c90a | Xin Li | 2018-06-09 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master | Xin Li | 2018-06-09 | 0 | -0/+0 |
| | |\| | | |
|
| | | * | | | Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master | Xin Li | 2018-06-09 | 9 | -25/+105 |
| | | |\ \ \ |
|
| | | | * \ \ | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master | Xin Li | 2018-06-08 | 9 | -25/+105 |
| | | | |\ \ \ |
|
* | | | | | | | | Snap for 4831764 from 4fed385c6c7146ba4d0c2f8953a29556922136b6 to qt-release | android-build-team Robot | 2018-06-09 | 2 | -11/+24 |
|\| | | | | | | |
|
| * | | | | | | | Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d am: 165a197cdf | Tao Bao | 2018-06-08 | 2 | -11/+24 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d | Tao Bao | 2018-06-08 | 2 | -11/+24 |
| | |\| | | | |
| | | |_|/ / /
| | |/| | | | |
|
| | | * | | | | Merge "updater: Remove the redundant check on line count." | Tao Bao | 2018-06-08 | 2 | -11/+24 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| / /
| | | | |/ / |
|
| | | | * | | Merge "updater: Remove the redundant check on line count." | Tao Bao | 2018-06-08 | 2 | -11/+24 |
| | | | |\ \ |
|
| | | | | * | | updater: Remove the redundant check on line count. | Tao Bao | 2018-06-07 | 2 | -11/+24 |
* | | | | | | | Snap for 4829746 from 4b5dc30a92ce528b65b99da6aad0bfb45ebafa8a to qt-release | android-build-team Robot | 2018-06-08 | 15 | -131/+222 |
|\| | | | | | |
|
| * | | | | | | Merge "updater_sample: update README.md" am: 1cb7222784 am: fc824cb998 | Zhomart Mukhamejanov | 2018-06-08 | 1 | -3/+5 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: update README.md" am: 1cb7222784 | Zhomart Mukhamejanov | 2018-06-08 | 1 | -3/+5 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: update README.md" | Zhomart Mukhamejanov | 2018-06-08 | 1 | -3/+5 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: update README.md" | Zhomart Mukhamejanov | 2018-06-08 | 1 | -3/+5 |
| | | | |\ \ \ |
|
| | | | | * | | | updater_sample: update README.md | Zhomart Mukhamejanov | 2018-06-08 | 1 | -3/+5 |
| | | | |/ / / |
|
| * | | | | | | Merge "updater_sample: fix payload spec tests" am: 684d7216e6 am: 7c8e5b6ee8 | Zhomart Mukhamejanov | 2018-06-08 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: fix payload spec tests" am: 684d7216e6 | Zhomart Mukhamejanov | 2018-06-08 | 1 | -1/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: fix payload spec tests" | Zhomart Mukhamejanov | 2018-06-08 | 1 | -1/+1 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: fix payload spec tests" | Zhomart Mukhamejanov | 2018-06-08 | 1 | -1/+1 |
| | | | |\ \ \ |
|
| | | | | * | | | updater_sample: fix payload spec tests | Zhomart Mukhamejanov | 2018-06-07 | 1 | -1/+1 |
| | | | |/ / / |
|
| * | | | | | | Merge "updater_sample: change gen_update_config args" am: eeabbecb64 am: 493e6cb9e0 | Zhomart Mukhamejanov | 2018-06-07 | 1 | -3/+3 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: change gen_update_config args" am: eeabbecb64 | Zhomart Mukhamejanov | 2018-06-07 | 1 | -3/+3 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: change gen_update_config args" | Zhomart Mukhamejanov | 2018-06-07 | 1 | -3/+3 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: change gen_update_config args" | Zhomart Mukhamejanov | 2018-06-07 | 1 | -3/+3 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | updater_sample: change gen_update_config args | Zhomart Mukhamejanov | 2018-06-07 | 1 | -3/+3 |
| | | | |/ / |
|
| * | | | | | Merge "updater_sample: Add suspend/resume update" am: 382691fbb0 am: f4c1420742 | Zhomart Mukhamejanov | 2018-06-07 | 4 | -13/+80 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: Add suspend/resume update" am: 382691fbb0 | Zhomart Mukhamejanov | 2018-06-07 | 4 | -13/+80 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: Add suspend/resume update" | Zhomart Mukhamejanov | 2018-06-07 | 4 | -13/+80 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: Add suspend/resume update" | Zhomart Mukhamejanov | 2018-06-07 | 4 | -13/+80 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | updater_sample: Add suspend/resume update | Zhomart Mukhamejanov | 2018-06-05 | 4 | -13/+80 |
| * | | | | | Merge "updater: Replace the reference arguments with pointers." am: cef8431fed am: 9c22d924e8 | Tao Bao | 2018-06-07 | 1 | -102/+101 |
| |\| | | | |
|
| | * | | | | Merge "updater: Replace the reference arguments with pointers." am: cef8431fed | Tao Bao | 2018-06-07 | 1 | -102/+101 |
| | |\| | | |
|
| | | * | | | Merge "updater: Replace the reference arguments with pointers." | Tao Bao | 2018-06-07 | 1 | -102/+101 |
| | | |\| | |
|
| | | | * | | Merge "updater: Replace the reference arguments with pointers." | Tao Bao | 2018-06-07 | 1 | -102/+101 |
| | | | |\ \ |
|
| | | | | * | | updater: Replace the reference arguments with pointers. | Tao Bao | 2018-06-05 | 1 | -102/+101 |
| | | | | |/ |
|
| * | | | | | Merge "minui: Handle the failures from the drm backend in gr_init" am: 0e2d900739 am: c8d9d6ca17 | Tianjie Xu | 2018-06-07 | 3 | -7/+16 |
| |\| | | | |
|
| | * | | | | Merge "minui: Handle the failures from the drm backend in gr_init" am: 0e2d900739 | Tianjie Xu | 2018-06-07 | 3 | -7/+16 |
| | |\| | | |
|
| | | * | | | Merge "minui: Handle the failures from the drm backend in gr_init" | Tianjie Xu | 2018-06-06 | 3 | -7/+16 |
| | | |\| | |
|
| | | | * | | Merge "minui: Handle the failures from the drm backend in gr_init" | Tianjie Xu | 2018-06-06 | 3 | -7/+16 |
| | | | |\ \ |
|
| | | | | * | | minui: Handle the failures from the drm backend in gr_init | Tianjie Xu | 2018-06-06 | 3 | -7/+16 |
| * | | | | | | Merge "ui: join only if joinable." am: 2454b2493a am: ccff03d196 | Tao Bao | 2018-06-06 | 3 | -2/+11 |
| |\| | | | | |
|
| | * | | | | | Merge "ui: join only if joinable." am: 2454b2493a | Tao Bao | 2018-06-06 | 3 | -2/+11 |
| | |\| | | | |
|
| | | * | | | | Merge "ui: join only if joinable." | Tao Bao | 2018-06-06 | 3 | -2/+11 |
| | | |\| | | |
|
| | | | * | | | Merge "ui: join only if joinable." | Tao Bao | 2018-06-06 | 3 | -2/+11 |
| | | | |\ \ \ |
|
| | | | | * | | | ui: join only if joinable. | Tao Bao | 2018-06-06 | 3 | -2/+11 |
| | | | |/ / / |
|
| * | | | | | | Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0 am: d770790a8f | Tao Bao | 2018-06-06 | 2 | -0/+5 |
| |\| | | | | |
|
| | * | | | | | Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0 | Tao Bao | 2018-06-06 | 2 | -0/+5 |
| | |\| | | | |
|
| | | * | | | | Merge "tests: Specify the death test style to avoid flakiness." | Tao Bao | 2018-06-06 | 2 | -0/+5 |
| | | |\| | | |
|
| | | | * | | | Merge "tests: Specify the death test style to avoid flakiness." | Tao Bao | 2018-06-06 | 2 | -0/+5 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | tests: Specify the death test style to avoid flakiness. | Tao Bao | 2018-06-05 | 2 | -0/+5 |
| | | | |/ / |
|
* | | | | | | Snap for 4821358 from 31b994e8e93e04e29f59ac98e845b42750668178 to qt-release | android-build-team Robot | 2018-06-05 | 11 | -167/+560 |
|\| | | | | |
|
| * | | | | | Merge "updater_sample: Add UI docs to README" am: e36b6ec97c am: 321a7134e9 | Zhomart Mukhamejanov | 2018-06-05 | 1 | -0/+25 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: Add UI docs to README" am: e36b6ec97c | Zhomart Mukhamejanov | 2018-06-05 | 1 | -0/+25 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: Add UI docs to README" | Zhomart Mukhamejanov | 2018-06-05 | 1 | -0/+25 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: Add UI docs to README" | Zhomart Mukhamejanov | 2018-06-05 | 1 | -0/+25 |
| | | | |\ \ |
|
| | | | | * | | updater_sample: Add UI docs to README | Zhomart Mukhamejanov | 2018-06-05 | 1 | -0/+25 |
| | | | |/ / |
|
| * | | | | | Merge "updater_sample: improve updater state handling" am: 269be9f22d am: 188190cc8c | Zhomart Mukhamejanov | 2018-06-05 | 8 | -167/+307 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: improve updater state handling" am: 269be9f22d | Zhomart Mukhamejanov | 2018-06-05 | 8 | -167/+307 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: improve updater state handling" | Zhomart Mukhamejanov | 2018-06-05 | 8 | -167/+307 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: improve updater state handling" | Zhomart Mukhamejanov | 2018-06-05 | 8 | -167/+307 |
| | | | |\ \ |
|
| | | | | * | | updater_sample: improve updater state handling | Zhomart Mukhamejanov | 2018-06-04 | 8 | -167/+307 |
| | | | | |/ |
|
| * | | | | | Merge "tests: Add ResumableUpdaterTest." am: a21a63bf56 am: 1d33962b86 | Tao Bao | 2018-06-05 | 2 | -0/+228 |
| |\| | | | |
|
| | * | | | | Merge "tests: Add ResumableUpdaterTest." am: a21a63bf56 | Tao Bao | 2018-06-05 | 2 | -0/+228 |
| | |\| | | |
|
| | | * | | | Merge "tests: Add ResumableUpdaterTest." | Tao Bao | 2018-06-04 | 2 | -0/+228 |
| | | |\| | |
|
| | | | * | | Merge "tests: Add ResumableUpdaterTest." | Tao Bao | 2018-06-04 | 2 | -0/+228 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | tests: Add ResumableUpdaterTest. | Tao Bao | 2018-06-04 | 2 | -0/+228 |
| | | | |/ |
|
* | | | | | Snap for 4818218 from 92824456bd66b98e512baf405722ba59113b2766 to qt-release | android-build-team Robot | 2018-06-02 | 3 | -5/+23 |
|\| | | | |
|
| * | | | | Merge "updater_sample: validate state only once" am: 02ee7bf29d am: 8bb3085865 | Zhomart Mukhamejanov | 2018-06-01 | 1 | -1/+8 |
| |\| | | |
|
| | * | | | Merge "updater_sample: validate state only once" am: 02ee7bf29d | Zhomart Mukhamejanov | 2018-06-01 | 1 | -1/+8 |
| | |\| | |
|
| | | * | | Merge "updater_sample: validate state only once" | Zhomart Mukhamejanov | 2018-06-01 | 1 | -1/+8 |
| | | |\| |
|
| | | | * | Merge "updater_sample: validate state only once" | Zhomart Mukhamejanov | 2018-06-01 | 1 | -1/+8 |
| | | | |\ |
|
| | | | | * | updater_sample: validate state only once | Zhomart Mukhamejanov | 2018-06-01 | 1 | -1/+8 |
| * | | | | | Merge "Let gr_init proceed even if we failed to load a font file" am: 2d85a0f6f7 am: 80918c9773 | Tianjie Xu | 2018-06-01 | 2 | -4/+15 |
| |\| | | | |
|
| | * | | | | Merge "Let gr_init proceed even if we failed to load a font file" am: 2d85a0f6f7 | Tianjie Xu | 2018-06-01 | 2 | -4/+15 |
| | |\| | | |
|
| | | * | | | Merge "Let gr_init proceed even if we failed to load a font file" | Tianjie Xu | 2018-06-01 | 2 | -4/+15 |
| | | |\| | |
|
| | | | * | | Merge "Let gr_init proceed even if we failed to load a font file" | Treehugger Robot | 2018-06-01 | 2 | -4/+15 |
| | | | |\ \ |
|
| | | | | * | | Let gr_init proceed even if we failed to load a font file | Tianjie Xu | 2018-06-01 | 2 | -4/+15 |
* | | | | | | | Snap for 4816034 from f5f2d8cc13a2a7136f2e6c7eee6975350d72eab7 to qt-release | android-build-team Robot | 2018-06-01 | 27 | -404/+983 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176 am: b0d9b3594b | David Anderson | 2018-06-01 | 4 | -1/+203 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176 | David Anderson | 2018-06-01 | 4 | -1/+203 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: add --fsck_unshare_blocks option for adb remount" | David Anderson | 2018-06-01 | 4 | -1/+203 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: add --fsck_unshare_blocks option for adb remount" | Treehugger Robot | 2018-06-01 | 4 | -1/+203 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | recovery: add --fsck_unshare_blocks option for adb remount | David Anderson | 2018-05-30 | 4 | -1/+203 |
| * | | | | | | Merge "updater_sample: Add @GuardedBy" am: 2759733136 am: a37a085a11 | Zhomart Mukhamejanov | 2018-06-01 | 2 | -1/+8 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: Add @GuardedBy" am: 2759733136 | Zhomart Mukhamejanov | 2018-06-01 | 2 | -1/+8 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: Add @GuardedBy" | Zhomart Mukhamejanov | 2018-06-01 | 2 | -1/+8 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: Add @GuardedBy" | Zhomart Mukhamejanov | 2018-06-01 | 2 | -1/+8 |
| | | | |\ \ \ |
|
| | | | | * | | | updater_sample: Add @GuardedBy | Zhomart Mukhamejanov | 2018-06-01 | 2 | -1/+8 |
| | | | |/ / / |
|
| * | | | | | | Merge "updater_sample: Improve update completion handling" am: 9455173f87 am: 86f05074d2 | Zhomart Mukhamejanov | 2018-06-01 | 3 | -1/+147 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: Improve update completion handling" am: 9455173f87 | Zhomart Mukhamejanov | 2018-06-01 | 3 | -1/+147 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: Improve update completion handling" | Zhomart Mukhamejanov | 2018-06-01 | 3 | -1/+147 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: Improve update completion handling" | Zhomart Mukhamejanov | 2018-06-01 | 3 | -1/+147 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | updater_sample: Improve update completion handling | Zhomart Mukhamejanov | 2018-05-31 | 3 | -1/+147 |
| | | | |/ / |
|
| * | | | | | Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7 am: 838f30a8f7 | Tao Bao | 2018-06-01 | 1 | -15/+8 |
| |\| | | | |
|
| | * | | | | Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7 | Tao Bao | 2018-06-01 | 1 | -15/+8 |
| | |\| | | |
|
| | | * | | | Merge "updater: Drop the 'blocks' parameter in LoadStash()." | Tao Bao | 2018-06-01 | 1 | -15/+8 |
| | | |\| | |
|
| | | | * | | Merge "updater: Drop the 'blocks' parameter in LoadStash()." | Tao Bao | 2018-05-31 | 1 | -15/+8 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | updater: Drop the 'blocks' parameter in LoadStash(). | Tao Bao | 2018-05-31 | 1 | -15/+8 |
| | | | |/ |
|
| * | | | | Merge "updater_sample: add UpdaterState" am: 721f6d851f am: b2a0611ea7 | Zhomart Mukhamejanov | 2018-05-30 | 4 | -68/+128 |
| |\| | | |
|
| | * | | | Merge "updater_sample: add UpdaterState" am: 721f6d851f | Zhomart Mukhamejanov | 2018-05-30 | 4 | -68/+128 |
| | |\| | |
|
| | | * | | Merge "updater_sample: add UpdaterState" | Zhomart Mukhamejanov | 2018-05-30 | 4 | -68/+128 |
| | | |\| |
|
| | | | * | Merge "updater_sample: add UpdaterState" | Zhomart Mukhamejanov | 2018-05-30 | 4 | -68/+128 |
| | | | |\ |
|
| | | | | * | updater_sample: add UpdaterState | Zhomart Mukhamejanov | 2018-05-26 | 4 | -68/+128 |
| * | | | | | Merge "updater_sample: add UpdateData" am: 8f15a82229 am: 8dd98e8c45 | Zhomart Mukhamejanov | 2018-05-30 | 1 | -29/+121 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: add UpdateData" am: 8f15a82229 | Zhomart Mukhamejanov | 2018-05-30 | 1 | -29/+121 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: add UpdateData" | Zhomart Mukhamejanov | 2018-05-30 | 1 | -29/+121 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: add UpdateData" | Zhomart Mukhamejanov | 2018-05-30 | 1 | -29/+121 |
| | | | |\| |
|
| | | | | * | updater_sample: add UpdateData | Zhomart Mukhamejanov | 2018-05-26 | 1 | -29/+121 |
| * | | | | | Merge "recovery: c++ify pthread use in UI" am: 85a007c47c am: 956580b139 | Jerry Zhang | 2018-05-30 | 5 | -127/+87 |
| |\| | | | |
|
| | * | | | | Merge "recovery: c++ify pthread use in UI" am: 85a007c47c | Jerry Zhang | 2018-05-30 | 5 | -127/+87 |
| | |\| | | |
|
| | | * | | | Merge "recovery: c++ify pthread use in UI" | Jerry Zhang | 2018-05-30 | 5 | -127/+87 |
| | | |\| | |
|
| | | | * | | Merge "recovery: c++ify pthread use in UI" | Jerry Zhang | 2018-05-30 | 5 | -127/+87 |
| | | | |\ \ |
|
| | | | | * | | recovery: c++ify pthread use in UI | Jerry Zhang | 2018-05-30 | 5 | -127/+87 |
| * | | | | | | Merge "ui: Use std::thread to create input/progress threads." am: b8634ca793 am: 4fcc200272 | Tao Bao | 2018-05-29 | 5 | -66/+64 |
| |\| | | | | |
|
| | * | | | | | Merge "ui: Use std::thread to create input/progress threads." am: b8634ca793 | Tao Bao | 2018-05-29 | 5 | -66/+64 |
| | |\| | | | |
|
| | | * | | | | Merge "ui: Use std::thread to create input/progress threads." | Tao Bao | 2018-05-29 | 5 | -66/+64 |
| | | |\| | | |
|
| | | | * | | | Merge "ui: Use std::thread to create input/progress threads." | Tao Bao | 2018-05-29 | 5 | -66/+64 |
| | | | |\| | |
|
| | | | | * | | ui: Use std::thread to create input/progress threads. | Tao Bao | 2018-05-22 | 5 | -66/+64 |
| * | | | | | | Merge "updater: Add Commmand class to manage BBOTA commands." am: a488bd992f am: 89d65805c6 | Tao Bao | 2018-05-29 | 6 | -63/+171 |
| |\| | | | | |
|
| | * | | | | | Merge "updater: Add Commmand class to manage BBOTA commands." am: a488bd992f | Tao Bao | 2018-05-29 | 6 | -63/+171 |
| | |\| | | | |
|
| | | * | | | | Merge "updater: Add Commmand class to manage BBOTA commands." | Tao Bao | 2018-05-29 | 6 | -63/+171 |
| | | |\| | | |
|
| | | | * | | | Merge "updater: Add Commmand class to manage BBOTA commands." | Tao Bao | 2018-05-29 | 6 | -63/+171 |
| | | | |\ \ \ |
|
| | | | | * | | | updater: Add Commmand class to manage BBOTA commands. | Tao Bao | 2018-05-26 | 6 | -63/+171 |
| | | | | | |/
| | | | | |/| |
|
| * | | | | | | Merge "tools: Move to Soong." am: 6b16093b29 am: 9016deefe4 | Tao Bao | 2018-05-29 | 6 | -37/+50 |
| |\| | | | | |
|
| | * | | | | | Merge "tools: Move to Soong." am: 6b16093b29 | Tao Bao | 2018-05-29 | 6 | -37/+50 |
| | |\| | | | |
|
| | | * | | | | Merge "tools: Move to Soong." | Tao Bao | 2018-05-29 | 6 | -37/+50 |
| | | |\| | | |
|
| | | | * | | | Merge "tools: Move to Soong." | Tao Bao | 2018-05-29 | 6 | -37/+50 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | tools: Move to Soong. | Tao Bao | 2018-05-17 | 6 | -37/+50 |
* | | | | | | | Snap for 4806815 from e76ed816b94f1e89be3f965152ea83dd48f67b51 to qt-release | android-build-team Robot | 2018-05-26 | 6 | -43/+188 |
|\| | | | | | |
|
| * | | | | | | Merge "updater_sample: Add OWNERS." am: 44e857390a am: 101af85e34 | Tao Bao | 2018-05-25 | 1 | -0/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: Add OWNERS." am: 44e857390a | Tao Bao | 2018-05-25 | 1 | -0/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: Add OWNERS." | Tao Bao | 2018-05-25 | 1 | -0/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: Add OWNERS." | Treehugger Robot | 2018-05-25 | 1 | -0/+2 |
| | | | |\ \ \ |
|
| | | | | * | | | updater_sample: Add OWNERS. | Tao Bao | 2018-05-25 | 1 | -0/+2 |
| * | | | | | | | Merge "updater_sample: add updater state" am: c290e088ed am: 4e17087235 | Zhomart Mukhamejanov | 2018-05-25 | 5 | -43/+186 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater_sample: add updater state" am: c290e088ed | Zhomart Mukhamejanov | 2018-05-25 | 5 | -43/+186 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater_sample: add updater state" | Zhomart Mukhamejanov | 2018-05-25 | 5 | -43/+186 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater_sample: add updater state" | Zhomart Mukhamejanov | 2018-05-25 | 5 | -43/+186 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | updater_sample: add updater state | Zhomart Mukhamejanov | 2018-05-25 | 5 | -43/+186 |
| | | | |/ / / |
|
* | | | | | | | Snap for 4804332 from 5d63c909abe8bb7d7f64715132be840131b41ae2 to qt-release | android-build-team Robot | 2018-05-25 | 17 | -563/+756 |
|\| | | | | | |
|
| * | | | | | | Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6 am: 17d46f2551 | Tao Bao | 2018-05-25 | 1 | -13/+15 |
| |\| | | | | |
|
| | * | | | | | Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6 | Tao Bao | 2018-05-25 | 1 | -13/+15 |
| | |\| | | | |
|
| | | * | | | | Merge "tests: Setup last_command_file for UpdaterTest." | Tao Bao | 2018-05-25 | 1 | -13/+15 |
| | | |\| | | |
|
| | | | * | | | Merge "tests: Setup last_command_file for UpdaterTest." | Tao Bao | 2018-05-25 | 1 | -13/+15 |
| | | | |\ \ \ |
|
| | | | | * | | | tests: Setup last_command_file for UpdaterTest. | Tao Bao | 2018-05-25 | 1 | -13/+15 |
| * | | | | | | | Merge "Mark as recovery_available:true" am: ddf2947359 am: 6d81f8732c | Jiyong Park | 2018-05-25 | 1 | -0/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Mark as recovery_available:true" am: ddf2947359 | Jiyong Park | 2018-05-25 | 1 | -0/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Mark as recovery_available:true" | Jiyong Park | 2018-05-25 | 1 | -0/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Mark as recovery_available:true" | Treehugger Robot | 2018-05-25 | 1 | -0/+1 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | Mark as recovery_available:true | Jiyong Park | 2018-05-24 | 1 | -0/+1 |
| * | | | | | | | Merge "tests: Refactor the common lines in UpdaterTest." am: faa47854f4 am: 83e341e754 | Tao Bao | 2018-05-25 | 1 | -286/+182 |
| |\| | | | | | |
|
| | * | | | | | | Merge "tests: Refactor the common lines in UpdaterTest." am: faa47854f4 | Tao Bao | 2018-05-25 | 1 | -286/+182 |
| | |\| | | | | |
|
| | | * | | | | | Merge "tests: Refactor the common lines in UpdaterTest." | Tao Bao | 2018-05-25 | 1 | -286/+182 |
| | | |\| | | | |
|
| | | | * | | | | Merge "tests: Refactor the common lines in UpdaterTest." | Tao Bao | 2018-05-25 | 1 | -286/+182 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | tests: Refactor the common lines in UpdaterTest. | Tao Bao | 2018-05-24 | 1 | -286/+182 |
| | | | | |/ / / |
|
| * | | | | | | | Merge "Convert deflate image chunks to raw if the raw data is smaller" am: fc0f04cba7 am: 8e72eb7077 | Tianjie Xu | 2018-05-25 | 6 | -35/+80 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Convert deflate image chunks to raw if the raw data is smaller" am: fc0f04cba7 | Tianjie Xu | 2018-05-25 | 6 | -35/+80 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Convert deflate image chunks to raw if the raw data is smaller" | Tianjie Xu | 2018-05-25 | 6 | -35/+80 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Convert deflate image chunks to raw if the raw data is smaller" | Tianjie Xu | 2018-05-25 | 6 | -35/+80 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Convert deflate image chunks to raw if the raw data is smaller | Tianjie Xu | 2018-05-24 | 6 | -35/+80 |
| | | | | | |/ /
| | | | | |/| | |
|
| * | | | | | | | Merge "updater_sample: create UpdateManager" am: 2a0b23bdf6 am: dd885ab568 | Zhomart Mukhamejanov | 2018-05-25 | 9 | -243/+492 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater_sample: create UpdateManager" am: 2a0b23bdf6 | Zhomart Mukhamejanov | 2018-05-24 | 9 | -243/+492 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater_sample: create UpdateManager" | Zhomart Mukhamejanov | 2018-05-24 | 9 | -243/+492 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater_sample: create UpdateManager" | Zhomart Mukhamejanov | 2018-05-24 | 9 | -243/+492 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | updater_sample: create UpdateManager | Zhomart Mukhamejanov | 2018-05-24 | 9 | -243/+492 |
| | | | |/ / / |
|
* | | | | | | | Snap for 4796633 from d0c3f62d3e002b82380b983b9e5c81c6662eea5b to qt-release | android-build-team Robot | 2018-05-22 | 12 | -101/+121 |
|\| | | | | | |
|
| * | | | | | | Merge "updater: Use a bool to indicate if allowed to skip a command." am: 3a8b348936 am: 082733b555 | Tao Bao | 2018-05-22 | 1 | -22/+17 |
| |\| | | | | |
|
| | * | | | | | Merge "updater: Use a bool to indicate if allowed to skip a command." am: 3a8b348936 | Tao Bao | 2018-05-22 | 1 | -22/+17 |
| | |\| | | | |
|
| | | * | | | | Merge "updater: Use a bool to indicate if allowed to skip a command." | Tao Bao | 2018-05-22 | 1 | -22/+17 |
| | | |\| | | |
|
| | | | * | | | Merge "updater: Use a bool to indicate if allowed to skip a command." | Tao Bao | 2018-05-22 | 1 | -22/+17 |
| | | | |\ \ \ |
|
| | | | | * | | | updater: Use a bool to indicate if allowed to skip a command. | Tao Bao | 2018-05-22 | 1 | -22/+17 |
| * | | | | | | | Merge "recovery: Add ability to set title lines" am: cba047f944 am: 6283f64568 | Jerry Zhang | 2018-05-22 | 5 | -5/+19 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: Add ability to set title lines" am: cba047f944 | Jerry Zhang | 2018-05-22 | 5 | -5/+19 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: Add ability to set title lines" | Jerry Zhang | 2018-05-22 | 5 | -5/+19 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: Add ability to set title lines" | Jerry Zhang | 2018-05-22 | 5 | -5/+19 |
| | | | |\ \ \ \
| | | | | | |_|/
| | | | | |/| | |
|
| | | | | * | | | recovery: Add ability to set title lines | Jerry Zhang | 2018-05-22 | 5 | -5/+19 |
| * | | | | | | | Merge "updater: Clean up the header lines computation." am: a5735e9b5f am: 1e29bb6717 | Tao Bao | 2018-05-22 | 1 | -6/+4 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Clean up the header lines computation." am: a5735e9b5f | Tao Bao | 2018-05-22 | 1 | -6/+4 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Clean up the header lines computation." | Tao Bao | 2018-05-22 | 1 | -6/+4 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater: Clean up the header lines computation." | Tao Bao | 2018-05-22 | 1 | -6/+4 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| / /
| | | | | |/ / |
|
| | | | | * | | updater: Clean up the header lines computation. | Tao Bao | 2018-05-21 | 1 | -6/+4 |
| * | | | | | | [automerger skipped] Merge "Move stuff from recovery into librecovery." am: 901f0c3516 am: dd88112054 -s ours | Tao Bao | 2018-05-22 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | [automerger skipped] Merge "Move stuff from recovery into librecovery." am: 901f0c3516 | Tao Bao | 2018-05-22 | 0 | -0/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "Move stuff from recovery into librecovery." | Tao Bao | 2018-05-22 | 2 | -43/+40 |
| | | |\| | | |
|
| | | | * | | | Merge "Move stuff from recovery into librecovery." | Tao Bao | 2018-05-22 | 2 | -43/+40 |
| | | | |\ \ \ |
|
| | | | | * | | | Move stuff from recovery into librecovery. | Tao Bao | 2018-05-17 | 2 | -43/+40 |
| | | | | | |/
| | | | | |/| |
|
| * | | | | | | Merge "Move stuff from recovery into librecovery." into pi-dev-plus-aosp | Tao Bao | 2018-05-22 | 2 | -57/+66 |
| |\| | | | | |
|
| | * | | | | | Merge "Move stuff from recovery into librecovery." into pi-dev-plus-aosp | Tao Bao | 2018-05-22 | 2 | -57/+66 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Move stuff from recovery into librecovery. | Tao Bao | 2018-05-17 | 2 | -57/+66 |
| * | | | | | | | Merge "updater_config: make utils/PayloadSpecs non-static" am: 928f2cbf9b am: 3714929c32 | Zhomart Mukhamejanov | 2018-05-21 | 4 | -13/+17 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater_config: make utils/PayloadSpecs non-static" am: 928f2cbf9b | Zhomart Mukhamejanov | 2018-05-21 | 4 | -13/+17 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "updater_config: make utils/PayloadSpecs non-static" | Zhomart Mukhamejanov | 2018-05-21 | 4 | -13/+17 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "updater_config: make utils/PayloadSpecs non-static" | Zhomart Mukhamejanov | 2018-05-21 | 4 | -13/+17 |
| | | | |\ \ \ \
| | | | | |_|_|/
| | | | |/| | | |
|
| | | | | * | | | updater_config: make utils/PayloadSpecs non-static | Zhomart Mukhamejanov | 2018-05-18 | 4 | -13/+17 |
| | | | |/ / / |
|
* | | | | | | | Snap for 4790189 from 76610d1681e8500c8137f877dde41cac3df96356 to qt-release | android-build-team Robot | 2018-05-18 | 18 | -206/+507 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: Reset optind to 1 after getopt" am: 38d90316b2 am: 25d31c9f9c | Jerry Zhang | 2018-05-17 | 2 | -0/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: Reset optind to 1 after getopt" am: 38d90316b2 | Jerry Zhang | 2018-05-17 | 2 | -0/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Reset optind to 1 after getopt" | Jerry Zhang | 2018-05-17 | 2 | -0/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: Reset optind to 1 after getopt" | Treehugger Robot | 2018-05-17 | 2 | -0/+2 |
| | | | |\ \ \ |
|
| | | | | * | | | recovery: Reset optind to 1 after getopt | Jerry Zhang | 2018-05-17 | 2 | -0/+2 |
| | | | |/ / / |
|
| * | | | | | | Merge "updater_sample: add switch slot demo" am: 2ddc54f5fd am: 4f26e44969 | Tao Bao | 2018-05-17 | 11 | -16/+210 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: add switch slot demo" am: 2ddc54f5fd | Tao Bao | 2018-05-17 | 11 | -16/+210 |
| | |\| | | |
| | | |_|/ /
| | |/| | | |
|
| | | * | | | Merge "updater_sample: add switch slot demo" | Tao Bao | 2018-05-17 | 11 | -16/+210 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: add switch slot demo" | Tao Bao | 2018-05-17 | 11 | -16/+210 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | updater_sample: add switch slot demo | Zhomart Mukhamejanov | 2018-05-17 | 11 | -16/+210 |
| | | | |/ |
|
| * | | | | [automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58b am: 0abc18d520 -s ours | Tao Bao | 2018-05-17 | 0 | -0/+0 |
| |\| | | |
|
| | * | | | [automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58b | Tao Bao | 2018-05-17 | 0 | -0/+0 |
| | |\| | |
|
| | | * | | Merge "recovery: Refactor common setup into main()" | Tao Bao | 2018-05-17 | 4 | -171/+235 |
| | | |\| |
|
| | | | * | Merge "recovery: Refactor common setup into main()" | Tao Bao | 2018-05-17 | 4 | -171/+235 |
| | | | |\ |
|
| | | | | * | recovery: Refactor common setup into main() | Jerry Zhang | 2018-05-16 | 4 | -171/+235 |
| * | | | | | Merge "Last command file should be updated after a command finishes" am: 6dfc54cae1 am: 45b7dbea74 | Tianjie Xu | 2018-05-17 | 1 | -11/+7 |
| |\| | | | |
|
| | * | | | | Merge "Last command file should be updated after a command finishes" am: 6dfc54cae1 | Tianjie Xu | 2018-05-17 | 1 | -11/+7 |
| | |\| | | |
|
| | | * | | | Merge "Last command file should be updated after a command finishes" | Tianjie Xu | 2018-05-17 | 1 | -11/+7 |
| | | |\| | |
|
| | | | * | | Merge "Last command file should be updated after a command finishes" | Tianjie Xu | 2018-05-17 | 1 | -11/+7 |
| | | | |\ \ |
|
| | | | | * | | Last command file should be updated after a command finishes | Tianjie Xu | 2018-05-16 | 1 | -11/+7 |
| | | | | |/ |
|
| * | | | | | Merge "recovery: Refactor common setup into main()" into pi-dev-plus-aosp | Jerry Zhang | 2018-05-16 | 4 | -171/+235 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Refactor common setup into main()" into pi-dev-plus-aosp | Jerry Zhang | 2018-05-16 | 4 | -171/+235 |
| | |\ \ \ \ |
|
| | | * | | | | recovery: Refactor common setup into main() | Jerry Zhang | 2018-05-16 | 4 | -171/+235 |
| * | | | | | | Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38 am: b730743b40 | Tao Bao | 2018-05-16 | 2 | -8/+53 |
| |\| | | | | |
|
| | * | | | | | Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38 | Tao Bao | 2018-05-16 | 2 | -8/+53 |
| | |\ \ \ \ \
| | | |/ / / /
| | |/| / / /
| | | |/ / / |
|
| | | * | | | Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." | Tao Bao | 2018-05-16 | 2 | -8/+53 |
| | | |\| | |
|
| | | | * | | Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." | Tao Bao | 2018-05-16 | 2 | -8/+53 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | wear_ui: Address a TODO regarding {intro,loop}_frames. | Tao Bao | 2018-05-14 | 2 | -8/+53 |
| | | | |/ |
|
* | | | | | Snap for 4778411 from baa4f0d2af970e014bb7b48f7dc8a5b92eb29bee to qt-release | android-build-team Robot | 2018-05-12 | 13 | -131/+377 |
|\| | | | |
|
| * | | | | Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0 am: 0c2998ffe3 | Tao Bao | 2018-05-12 | 2 | -72/+122 |
| |\| | | |
|
| | * | | | Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0 | Tao Bao | 2018-05-12 | 2 | -72/+122 |
| | |\| | |
|
| | | * | | Merge "Clean up the Makefile for recovery and tests." | Tao Bao | 2018-05-12 | 2 | -72/+122 |
| | | |\| |
|
| | | | * | Merge "Clean up the Makefile for recovery and tests." | Tao Bao | 2018-05-12 | 2 | -72/+122 |
| | | | |\ |
|
| | | | | * | Clean up the Makefile for recovery and tests. | Tao Bao | 2018-05-12 | 2 | -72/+122 |
| | | | |/ |
|
| * | | | | Merge "screen_ui: Fix an issue in RTL locale detection." am: 13d56e9bed am: 0e42c5680c | Tao Bao | 2018-05-12 | 2 | -4/+4 |
| |\| | | |
|
| | * | | | Merge "screen_ui: Fix an issue in RTL locale detection." am: 13d56e9bed | Tao Bao | 2018-05-11 | 2 | -4/+4 |
| | |\| | |
|
| | | * | | Merge "screen_ui: Fix an issue in RTL locale detection." | Tao Bao | 2018-05-11 | 2 | -4/+4 |
| | | |\| |
|
| | | | * | Merge "screen_ui: Fix an issue in RTL locale detection." | Treehugger Robot | 2018-05-11 | 2 | -4/+4 |
| | | | |\ |
|
| | | | | * | screen_ui: Fix an issue in RTL locale detection. | Tao Bao | 2018-05-09 | 2 | -4/+4 |
| * | | | | | Merge "Move device.cpp into librecovery_ui." am: db6dc14bff am: fb8636f48f | Tao Bao | 2018-05-12 | 1 | -7/+10 |
| |\| | | | |
|
| | * | | | | Merge "Move device.cpp into librecovery_ui." am: db6dc14bff | Tao Bao | 2018-05-11 | 1 | -7/+10 |
| | |\| | | |
|
| | | * | | | Merge "Move device.cpp into librecovery_ui." | Tao Bao | 2018-05-11 | 1 | -7/+10 |
| | | |\| | |
|
| | | | * | | Merge "Move device.cpp into librecovery_ui." | Tao Bao | 2018-05-11 | 1 | -7/+10 |
| | | | |\ \ |
|
| | | | | * | | Move device.cpp into librecovery_ui. | Tao Bao | 2018-05-11 | 1 | -7/+10 |
| * | | | | | | Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36 am: ca88c67135 | Tao Bao | 2018-05-11 | 10 | -11/+202 |
| |\| | | | | |
|
| | * | | | | | Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36 | Tao Bao | 2018-05-11 | 10 | -11/+202 |
| | |\| | | | |
|
| | | * | | | | Merge "tests: Add tests for ScreenRecoveryUI." | Tao Bao | 2018-05-11 | 10 | -12/+202 |
| | | |\| | | |
|
| | | | * | | | Merge "tests: Add tests for ScreenRecoveryUI." | Tao Bao | 2018-05-11 | 10 | -12/+202 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| /
| | | | | |/ |
|
| | | | | * | tests: Add tests for ScreenRecoveryUI. | Tao Bao | 2018-05-09 | 10 | -12/+202 |
| * | | | | | Merge "recovery: Configure device menu based on runtime info." am: e498ef2f03 am: bd32e1b50b | Tao Bao | 2018-05-11 | 4 | -46/+48 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Configure device menu based on runtime info." am: e498ef2f03 | Tao Bao | 2018-05-11 | 4 | -46/+48 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Configure device menu based on runtime info." | Tao Bao | 2018-05-11 | 4 | -46/+48 |
| | | |\| | |
|
| | | | * | | Merge "recovery: Configure device menu based on runtime info." | Tao Bao | 2018-05-11 | 4 | -46/+48 |
| | | | |\ \ |
|
| | | | | * | | recovery: Configure device menu based on runtime info. | Tao Bao | 2018-05-11 | 4 | -46/+48 |
* | | | | | | | Snap for 4775956 from 76e673417377b9ef960fba4dc7d1e8c2a505a679 to qt-release | android-build-team Robot | 2018-05-11 | 21 | -156/+506 |
|\| | | | | | |
|
| * | | | | | | Merge "updater_sample: add HAL compatibility check" am: 563d34f712 am: 0045e76c7c | Zhomart Mukhamejanov | 2018-05-11 | 2 | -27/+60 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: add HAL compatibility check" am: 563d34f712 | Zhomart Mukhamejanov | 2018-05-11 | 2 | -27/+60 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: add HAL compatibility check" | Zhomart Mukhamejanov | 2018-05-11 | 2 | -27/+60 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: add HAL compatibility check" | Zhomart Mukhamejanov | 2018-05-11 | 2 | -27/+60 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | updater_sample: add HAL compatibility check | Zhomart Mukhamejanov | 2018-05-10 | 2 | -27/+60 |
| * | | | | | | Merge "Document the clang-format usage." am: 797550fb8b am: cc71d271c1 | Tao Bao | 2018-05-11 | 1 | -0/+30 |
| |\| | | | | |
|
| | * | | | | | Merge "Document the clang-format usage." am: 797550fb8b | Tao Bao | 2018-05-11 | 1 | -0/+30 |
| | |\| | | | |
|
| | | * | | | | Merge "Document the clang-format usage." | Tao Bao | 2018-05-11 | 1 | -0/+30 |
| | | |\| | | |
|
| | | | * | | | Merge "Document the clang-format usage." | Tao Bao | 2018-05-11 | 1 | -0/+30 |
| | | | |\ \ \ |
|
| | | | | * | | | Document the clang-format usage. | Tao Bao | 2018-05-10 | 1 | -0/+30 |
| * | | | | | | | Merge "Device owns the RecoveryUI instance." am: 6df846e337 am: 8d593973d6 | Tao Bao | 2018-05-11 | 6 | -29/+26 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Device owns the RecoveryUI instance." am: 6df846e337 | Tao Bao | 2018-05-11 | 6 | -29/+26 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Device owns the RecoveryUI instance." | Tao Bao | 2018-05-11 | 6 | -29/+26 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Device owns the RecoveryUI instance." | Tao Bao | 2018-05-11 | 6 | -29/+26 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | Device owns the RecoveryUI instance. | Tao Bao | 2018-05-10 | 6 | -29/+26 |
| * | | | | | | | Merge "updater_sample: fix UpdateConfig" am: 7217e7045d am: 48294e3d86 | Zhomart Mukhamejanov | 2018-05-11 | 3 | -4/+8 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater_sample: fix UpdateConfig" am: 7217e7045d | Zhomart Mukhamejanov | 2018-05-11 | 3 | -4/+8 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater_sample: fix UpdateConfig" | Zhomart Mukhamejanov | 2018-05-10 | 3 | -4/+8 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater_sample: fix UpdateConfig" | Zhomart Mukhamejanov | 2018-05-10 | 3 | -4/+8 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | updater_sample: fix UpdateConfig | Zhomart Mukhamejanov | 2018-05-10 | 3 | -4/+8 |
| | | | |/ / / |
|
| * | | | | | | Merge "updater_sample: add http header demo" am: fe5b3e2b2d am: 319e191238 | Zhomart Mukhamejanov | 2018-05-10 | 4 | -13/+51 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: add http header demo" am: fe5b3e2b2d | Zhomart Mukhamejanov | 2018-05-10 | 4 | -13/+51 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: add http header demo" | Zhomart Mukhamejanov | 2018-05-10 | 4 | -13/+51 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: add http header demo" | Zhomart Mukhamejanov | 2018-05-10 | 4 | -13/+51 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | updater_sample: add http header demo | Zhomart Mukhamejanov | 2018-05-10 | 4 | -13/+51 |
| * | | | | | | Merge "screen_ui: Fix an issue when displaying wrapped text." am: 1d4ef4ba4b am: ae4b00c427 | Tao Bao | 2018-05-09 | 2 | -7/+10 |
| |\| | | | | |
|
| | * | | | | | Merge "screen_ui: Fix an issue when displaying wrapped text." am: 1d4ef4ba4b | Tao Bao | 2018-05-09 | 2 | -7/+10 |
| | |\| | | | |
|
| | | * | | | | Merge "screen_ui: Fix an issue when displaying wrapped text." | Tao Bao | 2018-05-09 | 2 | -7/+10 |
| | | |\| | | |
|
| | | | * | | | Merge "screen_ui: Fix an issue when displaying wrapped text." | Tao Bao | 2018-05-09 | 2 | -7/+10 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | screen_ui: Fix an issue when displaying wrapped text. | Tao Bao | 2018-05-09 | 2 | -7/+10 |
| | | | |/ / |
|
| * | | | | | Merge "updater_sample: update tools" am: daa86e9024 am: 9fdeb57ab0 | Zhomart Mukhamejanov | 2018-05-09 | 7 | -93/+74 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: update tools" am: daa86e9024 | Zhomart Mukhamejanov | 2018-05-09 | 7 | -93/+74 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: update tools" | Zhomart Mukhamejanov | 2018-05-09 | 7 | -93/+74 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: update tools" | Zhomart Mukhamejanov | 2018-05-09 | 7 | -93/+74 |
| | | | |\ \ |
|
| | | | | * | | updater_sample: update tools | Zhomart Mukhamejanov | 2018-05-08 | 7 | -93/+74 |
| * | | | | | | Merge "updater_sample: add streaming support" am: c23a53c272 am: e88d4682ea | Zhomart Mukhamejanov | 2018-05-09 | 6 | -20/+266 |
| |\| | | | | |
|
| | * | | | | | Merge "updater_sample: add streaming support" am: c23a53c272 | Zhomart Mukhamejanov | 2018-05-09 | 6 | -20/+266 |
| | |\| | | | |
|
| | | * | | | | Merge "updater_sample: add streaming support" | Zhomart Mukhamejanov | 2018-05-09 | 6 | -20/+266 |
| | | |\| | | |
|
| | | | * | | | Merge "updater_sample: add streaming support" | Zhomart Mukhamejanov | 2018-05-09 | 6 | -20/+266 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | updater_sample: add streaming support | Zhomart Mukhamejanov | 2018-05-08 | 6 | -20/+266 |
| | | | |/ / |
|
| * | | | | | Merge "recovery: Remove unneeded include of minui.h." am: 0a2c4e260f am: 5004300d6f | Tao Bao | 2018-05-08 | 1 | -1/+0 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Remove unneeded include of minui.h." am: 0a2c4e260f | Tao Bao | 2018-05-08 | 1 | -1/+0 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Remove unneeded include of minui.h." | Tao Bao | 2018-05-08 | 1 | -1/+0 |
| | | |\| | |
|
| | | | * | | Merge "recovery: Remove unneeded include of minui.h." | Tao Bao | 2018-05-08 | 1 | -1/+0 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | recovery: Remove unneeded include of minui.h. | Tao Bao | 2018-05-08 | 1 | -1/+0 |
| * | | | | | Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." am: 1f3a9c0a43 am: 730d541588 | android-build-prod (mdb) | 2018-05-08 | 3 | -6/+7 |
| |\| | | | |
|
| | * | | | | Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." am: 1f3a9c0a43 | android-build-prod (mdb) | 2018-05-08 | 3 | -6/+7 |
| | |\| | | |
|
| | | * | | | Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." | android-build-prod (mdb) | 2018-05-08 | 3 | -6/+7 |
| | | |\| | |
|
| | | | * | | Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." | android-build-prod (mdb) | 2018-05-08 | 3 | -6/+7 |
| | | | |\ \ |
|
| | | | | * | | screen_ui: Drop the parameter in CheckBackgroundTextImages. | Tao Bao | 2018-05-08 | 3 | -6/+7 |
| * | | | | | | Merge "recovery: Get UI and locale from device." am: d8abd2bd70 am: 07bf50a51d | Tao Bao | 2018-05-08 | 6 | -5/+23 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: Get UI and locale from device." am: d8abd2bd70 | Tao Bao | 2018-05-08 | 6 | -5/+23 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Get UI and locale from device." | Tao Bao | 2018-05-08 | 6 | -5/+23 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: Get UI and locale from device." | Tao Bao | 2018-05-08 | 6 | -5/+23 |
| | | | |\| |
| | | | | |/
| | | | |/| |
|
| | | | | * | recovery: Get UI and locale from device. | Jerry Zhang | 2018-05-08 | 6 | -5/+23 |
| | | | |/ |
|
* | | | | | Snap for 4767896 from 55bdab5e8ddb8ca919099eeaf8800148e38e5a50 to qt-release | android-build-team Robot | 2018-05-08 | 11 | -293/+363 |
|\| | | | |
|
| * | | | | [automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4 am: 260d4ba55f -s ours | Tao Bao | 2018-05-08 | 0 | -0/+0 |
| |\| | | |
|
| | * | | | [automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4 | Tao Bao | 2018-05-08 | 0 | -0/+0 |
| | |\| | |
|
| | | * | | Merge "recovery: Refactor logging code into logging.cpp" | Tao Bao | 2018-05-08 | 10 | -251/+280 |
| | | |\| |
|
| | | | * | Merge "recovery: Refactor logging code into logging.cpp" | Tao Bao | 2018-05-08 | 10 | -251/+280 |
| | | | |\ |
|
| | | | | * | recovery: Refactor logging code into logging.cpp | Jerry Zhang | 2018-05-07 | 10 | -251/+280 |
| * | | | | | Merge "updater: Skip an updated partition on retry." am: 0ffe13b56f am: 83906f75bb | Tao Bao | 2018-05-08 | 1 | -39/+77 |
| |\| | | | |
|
| | * | | | | Merge "updater: Skip an updated partition on retry." am: 0ffe13b56f | Tao Bao | 2018-05-08 | 1 | -39/+77 |
| | |\| | | |
|
| | | * | | | Merge "updater: Skip an updated partition on retry." | Tao Bao | 2018-05-08 | 1 | -39/+77 |
| | | |\| | |
|
| | | | * | | Merge "updater: Skip an updated partition on retry." | Tao Bao | 2018-05-08 | 1 | -39/+77 |
| | | | |\ \ |
|
| | | | | * | | updater: Skip an updated partition on retry. | Tao Bao | 2018-05-08 | 1 | -39/+77 |
| | | | | |/ |
|
| * | | | | | Merge "updater: Fix an issue when resuming an update." am: 1dc9e2ddef am: 47bf5e68e6 | Tao Bao | 2018-05-08 | 1 | -3/+6 |
| |\| | | | |
|
| | * | | | | Merge "updater: Fix an issue when resuming an update." am: 1dc9e2ddef | Tao Bao | 2018-05-08 | 1 | -3/+6 |
| | |\| | | |
|
| | | * | | | Merge "updater: Fix an issue when resuming an update." | Tao Bao | 2018-05-08 | 1 | -3/+6 |
| | | |\| | |
|
| | | | * | | Merge "updater: Fix an issue when resuming an update." | Tao Bao | 2018-05-08 | 1 | -3/+6 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | updater: Fix an issue when resuming an update. | Tao Bao | 2018-05-08 | 1 | -3/+6 |
| | | | |/ |
|
| * | | | | recovery: Refactor logging code into logging.cpp | Jerry Zhang | 2018-05-07 | 0 | -0/+0 |
| |\| | | |
|
| | * | | | recovery: Refactor logging code into logging.cpp | Jerry Zhang | 2018-05-07 | 10 | -251/+280 |
| * | | | | recovery: Refactor logging code into logging.cpp | Jerry Zhang | 2018-05-07 | 10 | -251/+280 |
* | | | | | Snap for 4764723 from 6cf0a98b93c30475bf41b7bd5b95db1b162a65ba to qt-release | android-build-team Robot | 2018-05-05 | 19 | -44/+48 |
|\| | | | |
|
| * | | | | Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4 am: c4ba6b738f | android-build-prod (mdb) | 2018-05-04 | 19 | -40/+41 |
| |\| | | |
|
| | * | | | Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4 | android-build-prod (mdb) | 2018-05-04 | 19 | -40/+41 |
| | |\| | |
|
| | | * | | Merge changes I1cc5d702,I32ab9854 | android-build-prod (mdb) | 2018-05-04 | 19 | -40/+41 |
| | | |\| |
|
| | | | * | Merge changes I1cc5d702,I32ab9854 | android-build-prod (mdb) | 2018-05-04 | 19 | -40/+41 |
| | | | |\ |
|
| | | | | * | Move reboot() from common.h into otautil/sysutil.h. | Tao Bao | 2018-05-04 | 8 | -20/+21 |
| | | | | * | otautil: Rename dir/sys/thermal utils. | Tao Bao | 2018-05-04 | 16 | -20/+20 |
| * | | | | | Merge "otautil: Only build the needed files for host build." am: 5818e894df am: d7d087f31c | Tao Bao | 2018-05-04 | 1 | -7/+10 |
| |\| | | | |
|
| | * | | | | Merge "otautil: Only build the needed files for host build." am: 5818e894df | Tao Bao | 2018-05-04 | 1 | -7/+10 |
| | |\| | | |
|
| | | * | | | Merge "otautil: Only build the needed files for host build." | Tao Bao | 2018-05-04 | 1 | -7/+10 |
| | | |\| | |
|
| | | | * | | Merge "otautil: Only build the needed files for host build." | Tao Bao | 2018-05-04 | 1 | -7/+10 |
| | | | |\| |
|
| | | | | * | otautil: Only build the needed files for host build. | Tao Bao | 2018-05-04 | 1 | -7/+10 |
| | | | |/ |
|
* | | | | | Snap for 4762932 from 96106592a2cebb78cc7d2772376cd1caf34ce9a1 to qt-release | android-build-team Robot | 2018-05-04 | 38 | -593/+1035 |
|\| | | | |
|
| * | | | | Merge "Move menu headers/items to std::vector<std::string>." am: fb86bb2a07 am: 0d9ed29541 | Tao Bao | 2018-05-04 | 10 | -141/+147 |
| |\| | | |
|
| | * | | | Merge "Move menu headers/items to std::vector<std::string>." am: fb86bb2a07 | Tao Bao | 2018-05-04 | 10 | -141/+147 |
| | |\| | |
|
| | | * | | Merge "Move menu headers/items to std::vector<std::string>." | Tao Bao | 2018-05-04 | 10 | -141/+147 |
| | | |\| |
|
| | | | * | Merge "Move menu headers/items to std::vector<std::string>." | Tao Bao | 2018-05-04 | 10 | -141/+147 |
| | | | |\ |
|
| | | | | * | Move menu headers/items to std::vector<std::string>. | Tao Bao | 2018-05-03 | 10 | -141/+147 |
| * | | | | | Merge "updater_sample: update tests" am: 219445a320 am: f3d1e58163 | Zhomart Mukhamejanov | 2018-05-04 | 3 | -15/+29 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: update tests" am: 219445a320 | Zhomart Mukhamejanov | 2018-05-04 | 3 | -15/+29 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: update tests" | Zhomart Mukhamejanov | 2018-05-04 | 3 | -15/+29 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: update tests" | Zhomart Mukhamejanov | 2018-05-04 | 3 | -15/+29 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | updater_sample: update tests | Zhomart Mukhamejanov | 2018-05-03 | 3 | -15/+29 |
| | | | |/ |
|
| * | | | | Merge "updater_sample: update ui and README, clean-up" am: 9c544a2bc6 am: c36f5ff1c7 | Zhomart Mukhamejanov | 2018-05-03 | 7 | -98/+151 |
| |\| | | |
|
| | * | | | Merge "updater_sample: update ui and README, clean-up" am: 9c544a2bc6 | Zhomart Mukhamejanov | 2018-05-03 | 7 | -98/+151 |
| | |\| | |
|
| | | * | | Merge "updater_sample: update ui and README, clean-up" | Zhomart Mukhamejanov | 2018-05-03 | 7 | -98/+151 |
| | | |\| |
|
| | | | * | Merge "updater_sample: update ui and README, clean-up" | Zhomart Mukhamejanov | 2018-05-03 | 7 | -98/+151 |
| | | | |\ |
|
| | | | | * | updater_sample: update ui and README, clean-up | Zhomart Mukhamejanov | 2018-05-03 | 7 | -98/+151 |
| | | | |/ |
|
| * | | | | Merge "screen_ui: Merge Menu::Start() into its ctor." am: 0cabcd0126 am: bcf8beaeed | android-build-prod (mdb) | 2018-05-03 | 4 | -48/+29 |
| |\| | | |
|
| | * | | | Merge "screen_ui: Merge Menu::Start() into its ctor." am: 0cabcd0126 | android-build-prod (mdb) | 2018-05-03 | 4 | -48/+29 |
| | |\| | |
|
| | | * | | Merge "screen_ui: Merge Menu::Start() into its ctor." | android-build-prod (mdb) | 2018-05-03 | 4 | -48/+29 |
| | | |\| |
|
| | | | * | Merge "screen_ui: Merge Menu::Start() into its ctor." | android-build-prod (mdb) | 2018-05-03 | 4 | -48/+29 |
| | | | |\ |
|
| | | | | * | screen_ui: Merge Menu::Start() into its ctor. | Tao Bao | 2018-05-03 | 4 | -48/+29 |
| * | | | | | Merge "updater_sample: Add streaming to PayloadSpec" am: 3a79b36377 am: 98837bdcd1 | Zhomart Mukhamejanov | 2018-05-03 | 9 | -26/+56 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: Add streaming to PayloadSpec" am: 3a79b36377 | Zhomart Mukhamejanov | 2018-05-03 | 9 | -26/+56 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: Add streaming to PayloadSpec" | Zhomart Mukhamejanov | 2018-05-03 | 9 | -26/+56 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: Add streaming to PayloadSpec" | Zhomart Mukhamejanov | 2018-05-03 | 9 | -26/+56 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | updater_sample: Add streaming to PayloadSpec | Zhomart Mukhamejanov | 2018-05-02 | 9 | -26/+56 |
| * | | | | | Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ce am: a9d78d45d6 | android-build-prod (mdb) | 2018-05-03 | 5 | -49/+62 |
| |\| | | | |
|
| | * | | | | Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ce | android-build-prod (mdb) | 2018-05-03 | 5 | -49/+62 |
| | |\| | | |
|
| | | * | | | Merge "screen_ui: Use std::string in DrawTextLine() and siblings." | android-build-prod (mdb) | 2018-05-03 | 5 | -49/+62 |
| | | |\| | |
|
| | | | * | | Merge "screen_ui: Use std::string in DrawTextLine() and siblings." | android-build-prod (mdb) | 2018-05-03 | 5 | -49/+62 |
| | | | |\ \ |
|
| | | | | * | | screen_ui: Use std::string in DrawTextLine() and siblings. | Tao Bao | 2018-05-03 | 5 | -49/+62 |
| | | | |/ / |
|
| * | | | | | Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8 am: 30f2775b37 | Tao Bao | 2018-05-03 | 5 | -11/+14 |
| |\| | | | |
|
| | * | | | | Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8 | Tao Bao | 2018-05-02 | 5 | -11/+14 |
| | |\| | | |
|
| | | * | | | Merge "screen_ui: Drop the dependency on common.h." | Tao Bao | 2018-05-02 | 5 | -11/+14 |
| | | |\| | |
|
| | | | * | | Merge "screen_ui: Drop the dependency on common.h." | Tao Bao | 2018-05-02 | 5 | -11/+14 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | screen_ui: Drop the dependency on common.h. | Tao Bao | 2018-05-02 | 5 | -11/+14 |
| | | | |/ |
|
| * | | | | Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513 am: a2f44ebd09 | Tao Bao | 2018-05-01 | 6 | -83/+102 |
| |\| | | |
|
| | * | | | Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513 | Tao Bao | 2018-05-01 | 6 | -83/+102 |
| | |\| | |
|
| | | * | | Merge "Add ScreenRecoveryUI::ShowMenu()." | Tao Bao | 2018-05-01 | 6 | -83/+102 |
| | | |\| |
|
| | | | * | Merge "Add ScreenRecoveryUI::ShowMenu()." | Tao Bao | 2018-05-01 | 6 | -83/+102 |
| | | | |\ |
|
| | | | | * | Add ScreenRecoveryUI::ShowMenu(). | Tao Bao | 2018-05-01 | 6 | -83/+102 |
| * | | | | | Merge "updater_sample: add FileDownloader" am: 5c119482b3 am: 013098f6d2 | Zhomart Mukhamejanov | 2018-05-01 | 2 | -0/+173 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: add FileDownloader" am: 5c119482b3 | Zhomart Mukhamejanov | 2018-05-01 | 2 | -0/+173 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: add FileDownloader" | Zhomart Mukhamejanov | 2018-05-01 | 2 | -0/+173 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: add FileDownloader" | Zhomart Mukhamejanov | 2018-05-01 | 2 | -0/+173 |
| | | | |\ \ |
|
| | | | | * | | updater_sample: add FileDownloader | Zhomart Mukhamejanov | 2018-05-01 | 2 | -0/+173 |
| | | | |/ / |
|
| * | | | | | Merge "updater_sample: Improve UpdateConfig" am: af5958818a am: 0b54d77832 | Zhomart Mukhamejanov | 2018-05-01 | 9 | -47/+140 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: Improve UpdateConfig" am: af5958818a | Zhomart Mukhamejanov | 2018-05-01 | 9 | -47/+140 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: Improve UpdateConfig" | Zhomart Mukhamejanov | 2018-05-01 | 9 | -47/+140 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: Improve UpdateConfig" | Zhomart Mukhamejanov | 2018-05-01 | 9 | -47/+140 |
| | | | |\ \ |
|
| | | | | * | | updater_sample: Improve UpdateConfig | Zhomart Mukhamejanov | 2018-05-01 | 9 | -47/+140 |
| * | | | | | | [automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073 am: 17f6c1b041 -s ours | Tao Bao | 2018-05-01 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | [automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073 | Tao Bao | 2018-05-01 | 0 | -0/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Split main() into recovery_main.cpp." | Tao Bao | 2018-05-01 | 5 | -135/+192 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: Split main() into recovery_main.cpp." | Tao Bao | 2018-05-01 | 5 | -135/+192 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| /
| | | | | |/ |
|
| | | | | * | recovery: Split main() into recovery_main.cpp. | Tao Bao | 2018-05-01 | 5 | -135/+192 |
| | | | |/ |
|
| * | | | | recovery: Split main() into recovery_main.cpp. | Tao Bao | 2018-05-01 | 5 | -134/+191 |
| |\| | | |
|
| | * | | | recovery: Split main() into recovery_main.cpp. | Tao Bao | 2018-05-01 | 5 | -134/+191 |
* | | | | | Snap for 4754751 from 7ffa008463d282902fe96decddb6aa8250bc6161 to qt-release | android-build-team Robot | 2018-05-01 | 3 | -62/+60 |
|\| | | | |
|
| * | | | | Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142 am: 7e61191258 | Tao Bao | 2018-05-01 | 2 | -1/+4 |
| |\| | | |
|
| | * | | | Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142 | Tao Bao | 2018-05-01 | 2 | -1/+4 |
| | |\| | |
|
| | | * | | Merge "Drop '#include "ui.h"' from device.h." | Tao Bao | 2018-05-01 | 2 | -1/+4 |
| | | |\| |
|
| | | | * | Merge "Drop '#include "ui.h"' from device.h." | Tao Bao | 2018-05-01 | 2 | -1/+4 |
| | | | |\ |
|
| | | | | * | Drop '#include "ui.h"' from device.h. | Tao Bao | 2018-05-01 | 2 | -1/+4 |
| | | | |/ |
|
| * | | | | Merge changes I78839ed4,I75ac0e26 am: e4d65b681a am: 040674586b | Tao Bao | 2018-04-30 | 1 | -61/+56 |
| |\| | | |
|
| | * | | | Merge changes I78839ed4,I75ac0e26 am: e4d65b681a | Tao Bao | 2018-04-30 | 1 | -61/+56 |
| | |\| | |
|
| | | * | | Merge changes I78839ed4,I75ac0e26 | Tao Bao | 2018-04-30 | 1 | -61/+56 |
| | | |\| |
|
| | | | * | Merge changes I78839ed4,I75ac0e26 | Tao Bao | 2018-04-30 | 1 | -61/+56 |
| | | | |\ |
|
| | | | | * | recovery: Move a few constants closer to their uses. | Tao Bao | 2018-04-30 | 1 | -53/+48 |
| | | | | * | recovery: Fix the return value when failing to convert to FBE. | Tao Bao | 2018-04-30 | 1 | -8/+8 |
| | | | |/ |
|
* | | | | | Snap for 4751911 from af01117405a1539ce3de28525a0001861a1f6da1 to qt-release | android-build-team Robot | 2018-04-29 | 9 | -61/+46 |
|\| | | | |
|
| * | | | | Merge "Merge libmounts into libotautil." am: 686353215f am: cddf5dbf67 | android-build-prod (mdb) | 2018-04-28 | 9 | -61/+46 |
| |\| | | |
|
| | * | | | Merge "Merge libmounts into libotautil." am: 686353215f | android-build-prod (mdb) | 2018-04-28 | 9 | -61/+46 |
| | |\| | |
|
| | | * | | Merge "Merge libmounts into libotautil." | android-build-prod (mdb) | 2018-04-28 | 9 | -61/+46 |
| | | |\| |
|
| | | | * | Merge "Merge libmounts into libotautil." | android-build-prod (mdb) | 2018-04-28 | 9 | -61/+46 |
| | | | |\ |
|
| | | | | * | Merge libmounts into libotautil. | Tao Bao | 2018-04-28 | 9 | -61/+46 |
| | | | |/ |
|
* | | | | | Snap for 4751292 from 77850f36d4155d8ff6b5913af820d31633d40646 to qt-release | android-build-team Robot | 2018-04-28 | 3 | -69/+64 |
|\| | | | |
|
| * | | | | Merge "recovery: Revoke (most of) short options." am: 3de3756081 am: 29c9690864 | Tao Bao | 2018-04-28 | 1 | -55/+46 |
| |\| | | |
|
| | * | | | Merge "recovery: Revoke (most of) short options." am: 3de3756081 | Tao Bao | 2018-04-28 | 1 | -55/+46 |
| | |\| | |
|
| | | * | | Merge "recovery: Revoke (most of) short options." | Tao Bao | 2018-04-28 | 1 | -55/+46 |
| | | |\| |
|
| | | | * | Merge "recovery: Revoke (most of) short options." | Tao Bao | 2018-04-28 | 1 | -55/+46 |
| | | | |\ |
|
| | | | | * | recovery: Revoke (most of) short options. | Tao Bao | 2018-04-27 | 1 | -55/+46 |
| * | | | | | Merge "Save the target file when applypatch tests fail" am: 957c1abfba am: 7ad3e673ba | Tianjie Xu | 2018-04-27 | 2 | -14/+18 |
| |\| | | | |
|
| | * | | | | Merge "Save the target file when applypatch tests fail" am: 957c1abfba | Tianjie Xu | 2018-04-27 | 2 | -14/+18 |
| | |\| | | |
|
| | | * | | | Merge "Save the target file when applypatch tests fail" | Tianjie Xu | 2018-04-27 | 2 | -14/+18 |
| | | |\| | |
|
| | | | * | | Merge "Save the target file when applypatch tests fail" | Tianjie Xu | 2018-04-27 | 2 | -14/+18 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | Save the target file when applypatch tests fail | Tianjie Xu | 2018-04-27 | 2 | -14/+18 |
* | | | | | | Snap for 4748783 from 1ad0f9962a334e51a8ca59e2ca4ff5ee84359964 to qt-release | android-build-team Robot | 2018-04-27 | 52 | -344/+2383 |
|\| | | | | |
|
| * | | | | | Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c am: 811baa37d3 | Zhomart Mukhamejanov | 2018-04-27 | 4 | -27/+89 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c | Zhomart Mukhamejanov | 2018-04-27 | 4 | -27/+89 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: fix gen_update_config.py" | Zhomart Mukhamejanov | 2018-04-27 | 4 | -27/+89 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: fix gen_update_config.py" | Zhomart Mukhamejanov | 2018-04-27 | 4 | -27/+89 |
| | | | |\ \ |
|
| | | | | * | | updater_sample: fix gen_update_config.py | Zhomart Mukhamejanov | 2018-04-27 | 4 | -27/+89 |
| | | | | |/ |
|
| * | | | | | [automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964 am: b73e921a27 -s ours | android-build-prod (mdb) | 2018-04-27 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | [automerger skipped] Merge "recovery: Print the actually required battery level." am: ca456f3964 | android-build-prod (mdb) | 2018-04-27 | 0 | -0/+0 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Print the actually required battery level." | android-build-prod (mdb) | 2018-04-27 | 1 | -60/+62 |
| | | |\| | |
|
| | | | * | | Merge "recovery: Print the actually required battery level." | android-build-prod (mdb) | 2018-04-27 | 1 | -60/+62 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | * | recovery: Print the actually required battery level. | Tao Bao | 2018-04-27 | 1 | -60/+62 |
| | | | |/ |
|
| * | | | | Merge "recovery: Print the actually required battery level." into pi-dev-plus-aosp | Tao Bao | 2018-04-27 | 1 | -15/+17 |
| |\| | | |
|
| | * | | | Merge "recovery: Print the actually required battery level." into pi-dev-plus-aosp | Tao Bao | 2018-04-27 | 1 | -15/+17 |
| | |\ \ \ |
|
| | | * | | | recovery: Print the actually required battery level. | Tao Bao | 2018-04-27 | 1 | -15/+17 |
| * | | | | | [automerger skipped] Merge "Mark ui_print with __printflike." am: 220b531e3d am: a742fb0994 -s ours | Tao Bao | 2018-04-27 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | [automerger skipped] Merge "Mark ui_print with __printflike." am: 220b531e3d | Tao Bao | 2018-04-27 | 0 | -0/+0 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | Merge "Mark ui_print with __printflike." | Tao Bao | 2018-04-27 | 2 | -2/+2 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Merge "Mark ui_print with __printflike." | Tao Bao | 2018-04-27 | 2 | -2/+2 |
| | | | |\ \ |
|
| | | | | * | | Mark ui_print with __printflike. | Tao Bao | 2018-04-26 | 2 | -2/+2 |
| | | | |/ / |
|
| * | | | | | Merge "Mark ui_print with __printflike." into pi-dev-plus-aosp | Tao Bao | 2018-04-27 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | Merge "Mark ui_print with __printflike." into pi-dev-plus-aosp | Tao Bao | 2018-04-27 | 1 | -1/+1 |
| | |\ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | | * | | | Mark ui_print with __printflike. | Tao Bao | 2018-04-26 | 1 | -1/+1 |
| * | | | | | Merge "Mark ui_print with __printflike." | TreeHugger Robot | 2018-04-26 | 1 | -1/+1 |
| |\ \ \ \ \ |
|
| | * | | | | | Mark ui_print with __printflike. | Tao Bao | 2018-04-26 | 1 | -1/+1 |
| * | | | | | | Merge "sample_updater: create tools/gen_update_config.py" am: 6bd1d9b8d9 am: 9882160d8d | Zhomart Mukhamejanov | 2018-04-26 | 3 | -8/+189 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "sample_updater: create tools/gen_update_config.py" am: 6bd1d9b8d9 | Zhomart Mukhamejanov | 2018-04-26 | 3 | -8/+189 |
| | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | | |
|
| | | * | | | | Merge "sample_updater: create tools/gen_update_config.py" | Zhomart Mukhamejanov | 2018-04-26 | 3 | -8/+189 |
| | | |\ \ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | * | | | Merge "sample_updater: create tools/gen_update_config.py" | Zhomart Mukhamejanov | 2018-04-26 | 3 | -8/+189 |
| | | | |\ \ \ |
|
| | | | | * | | | sample_updater: create tools/gen_update_config.py | Zhomart Mukhamejanov | 2018-04-26 | 3 | -8/+189 |
| * | | | | | | | Merge "sample_updater: add tests resources" am: 7d064166ce am: 6131d00348 | Zhomart Mukhamejanov | 2018-04-26 | 3 | -0/+49 |
| |\| | | | | |
| | |_|_|_|/ /
| |/| | | | | |
|
| | * | | | | | Merge "sample_updater: add tests resources" am: 7d064166ce | Zhomart Mukhamejanov | 2018-04-26 | 3 | -0/+49 |
| | |\| | | |
| | | |_|_|/
| | |/| | | |
|
| | | * | | | Merge "sample_updater: add tests resources" | Zhomart Mukhamejanov | 2018-04-26 | 3 | -0/+49 |
| | | |\| | |
|
| | | | * | | Merge "sample_updater: add tests resources" | Zhomart Mukhamejanov | 2018-04-26 | 3 | -0/+49 |
| | | | |\ \ |
|
| | | | | * | | sample_updater: add tests resources | Zhomart Mukhamejanov | 2018-04-26 | 3 | -0/+49 |
| | | | | |/ |
|
| * | | | | | Merge "Dump the uncompressed data's SHA1 to debug flaky tests" am: cc8587b508 am: 247821648f | Tianjie Xu | 2018-04-26 | 2 | -3/+75 |
| |\| | | | |
|
| | * | | | | Merge "Dump the uncompressed data's SHA1 to debug flaky tests" am: cc8587b508 | Tianjie Xu | 2018-04-26 | 2 | -3/+75 |
| | |\| | | |
|
| | | * | | | Merge "Dump the uncompressed data's SHA1 to debug flaky tests" | Tianjie Xu | 2018-04-26 | 2 | -3/+75 |
| | | |\| | |
|
| | | | * | | Merge "Dump the uncompressed data's SHA1 to debug flaky tests" | Tianjie Xu | 2018-04-26 | 2 | -3/+75 |
| | | | |\ \ |
|
| | | | | * | | Dump the uncompressed data's SHA1 to debug flaky tests | Tianjie Xu | 2018-04-26 | 2 | -3/+75 |
| * | | | | | | Merge "Rename CacheLocation to Paths." am: 49c7f1cec3 am: ce562bacfd | android-build-prod (mdb) | 2018-04-26 | 16 | -213/+230 |
| |\| | | | | |
|
| | * | | | | | Merge "Rename CacheLocation to Paths." am: 49c7f1cec3 | android-build-prod (mdb) | 2018-04-26 | 16 | -213/+230 |
| | |\| | | | |
|
| | | * | | | | Merge "Rename CacheLocation to Paths." | android-build-prod (mdb) | 2018-04-26 | 16 | -213/+230 |
| | | |\| | | |
|
| | | | * | | | Merge "Rename CacheLocation to Paths." | android-build-prod (mdb) | 2018-04-26 | 16 | -213/+230 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | Rename CacheLocation to Paths. | Tao Bao | 2018-04-26 | 16 | -213/+230 |
| | | | |/ / |
|
| * | | | | | Merge "updater_sample: Use stubs libs for android.test.base / runner." am: d97b643de4 am: 23d17302b1 | Zhomart Mukhamejanov | 2018-04-26 | 1 | -2/+2 |
| |\| | | | |
|
| | * | | | | Merge "updater_sample: Use stubs libs for android.test.base / runner." am: d97b643de4 | Zhomart Mukhamejanov | 2018-04-26 | 1 | -2/+2 |
| | |\| | | |
|
| | | * | | | Merge "updater_sample: Use stubs libs for android.test.base / runner." | Zhomart Mukhamejanov | 2018-04-26 | 1 | -2/+2 |
| | | |\| | |
|
| | | | * | | Merge "updater_sample: Use stubs libs for android.test.base / runner." | Zhomart Mukhamejanov | 2018-04-26 | 1 | -2/+2 |
| | | | |\ \ |
|
| | | | | * | | updater_sample: Use stubs libs for android.test.base / runner. | Tao Bao | 2018-04-26 | 1 | -2/+2 |
| * | | | | | | Merge "Rename the dir for SystemUpdaterSample." am: a544bfab2b am: 4b52553cbb | android-build-prod (mdb) | 2018-04-26 | 27 | -5/+5 |
| |\| | | | | |
|
| | * | | | | | Merge "Rename the dir for SystemUpdaterSample." am: a544bfab2b | android-build-prod (mdb) | 2018-04-26 | 27 | -5/+5 |
| | |\| | | | |
|
| | | * | | | | Merge "Rename the dir for SystemUpdaterSample." | android-build-prod (mdb) | 2018-04-26 | 27 | -5/+5 |
| | | |\| | | |
|
| | | | * | | | Merge "Rename the dir for SystemUpdaterSample." | android-build-prod (mdb) | 2018-04-26 | 27 | -5/+5 |
| | | | |\| |
| | | | | |/
| | | | |/| |
|
| | | | | * | Rename the dir for SystemUpdaterSample. | Tao Bao | 2018-04-26 | 27 | -5/+5 |
| | | | |/ |
|
| * | | | | Merge "sample_updater: add non-streaming demo" am: 4816fc1c46 am: a399c289bb | Zhomart Mukhamejanov | 2018-04-25 | 26 | -97/+1723 |
| |\| | | |
|
| | * | | | Merge "sample_updater: add non-streaming demo" am: 4816fc1c46 | Zhomart Mukhamejanov | 2018-04-25 | 26 | -97/+1723 |
| | |\| | |
|
| | | * | | Merge "sample_updater: add non-streaming demo" | Zhomart Mukhamejanov | 2018-04-25 | 26 | -97/+1723 |
| | | |\| |
|
| | | | * | Merge "sample_updater: add non-streaming demo" | Zhomart Mukhamejanov | 2018-04-25 | 26 | -97/+1723 |
| | | | |\ |
|
| | | | | * | sample_updater: add non-streaming demo | Zhomart Mukhamejanov | 2018-04-25 | 26 | -97/+1723 |
| | | | |/ |
|
| * | | | | [automerger skipped] Wipe the metadata partition when we wipe data. am: 723056a83f -s ours | Paul Crowley | 2018-04-25 | 0 | -0/+0 |
| |\| | | |
|
| | * | | | [automerger skipped] Wipe the metadata partition when we wipe data. | Paul Crowley | 2018-04-25 | 0 | -0/+0 |
| | |\ \ \ |
|
| | | * | | | Wipe the metadata partition when we wipe data. | Paul Crowley | 2018-04-25 | 1 | -5/+14 |
| * | | | | | Merge "updater: Remove an unneeded strdup()." am: ab3c24bd51 am: 76f0edc05e | android-build-prod (mdb) | 2018-04-25 | 1 | -1/+1 |
| |\| | | | |
|
| | * | | | | Merge "updater: Remove an unneeded strdup()." am: ab3c24bd51 | android-build-prod (mdb) | 2018-04-25 | 1 | -1/+1 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | Merge "updater: Remove an unneeded strdup()." | android-build-prod (mdb) | 2018-04-25 | 1 | -1/+1 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Merge "updater: Remove an unneeded strdup()." | android-build-prod (mdb) | 2018-04-25 | 1 | -1/+1 |
| | | | |\ \ |
|
| | | | | * | | updater: Remove an unneeded strdup(). | Tao Bao | 2018-04-25 | 1 | -1/+1 |
| * | | | | | | Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2 am: 62fd21b9bb | Paul Crowley | 2018-04-25 | 1 | -5/+14 |
| |\| | | | | |
|
| | * | | | | | Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2 | Paul Crowley | 2018-04-25 | 1 | -5/+14 |
| | |\| | | | |
|
| | | * | | | | Merge "Wipe the metadata partition when we wipe data." | Paul Crowley | 2018-04-25 | 1 | -5/+14 |
| | | |\| | | |
|
| | | | * | | | Merge "Wipe the metadata partition when we wipe data." | Treehugger Robot | 2018-04-25 | 1 | -5/+14 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Wipe the metadata partition when we wipe data. | Paul Crowley | 2018-04-25 | 1 | -5/+14 |
| * | | | | | | Merge "Dump debug information for apply_patch unit tests" am: fe527cced4 am: 943c2057ad | Tianjie Xu | 2018-04-24 | 3 | -1/+22 |
| |\| | | | | |
|
| | * | | | | | Merge "Dump debug information for apply_patch unit tests" am: fe527cced4 | Tianjie Xu | 2018-04-24 | 3 | -1/+22 |
| | |\| | | | |
|
| | | * | | | | Merge "Dump debug information for apply_patch unit tests" | Tianjie Xu | 2018-04-24 | 3 | -1/+22 |
| | | |\| | | |
|
| | | | * | | | Merge "Dump debug information for apply_patch unit tests" | Tianjie Xu | 2018-04-24 | 3 | -1/+22 |
| | | | |\ \ \ |
|
| | | | | * | | | Dump debug information for apply_patch unit tests | Tianjie Xu | 2018-04-24 | 3 | -1/+22 |
| | | | |/ / / |
|
* | | | | | | | Snap for 4740273 from 766a4103888803454d3aa5f8de08df990b6f8fa0 to qt-release | android-build-team Robot | 2018-04-24 | 6 | -118/+105 |
|\| | | | | | |
|
| * | | | | | | Merge "update_verifier: Move to Soong." am: ed022fccdf am: 9bc286dd71 | Tao Bao | 2018-04-24 | 3 | -70/+83 |
| |\| | | | | |
|
| | * | | | | | Merge "update_verifier: Move to Soong." am: ed022fccdf | Tao Bao | 2018-04-24 | 3 | -70/+83 |
| | |\| | | | |
|
| | | * | | | | Merge "update_verifier: Move to Soong." | Tao Bao | 2018-04-24 | 3 | -70/+83 |
| | | |\| | | |
|
| | | | * | | | Merge "update_verifier: Move to Soong." | Tao Bao | 2018-04-24 | 3 | -70/+83 |
| | | | |\ \ \ |
|
| | | | | * | | | update_verifier: Move to Soong. | Tao Bao | 2018-04-20 | 3 | -70/+83 |
| * | | | | | | | Merge "Make update_verifier generic across verified boot versions." am: ea63f59469 am: abcac8e1e7 | Tao Bao | 2018-04-24 | 4 | -48/+22 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Make update_verifier generic across verified boot versions." am: ea63f59469 | Tao Bao | 2018-04-24 | 4 | -48/+22 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Make update_verifier generic across verified boot versions." | Tao Bao | 2018-04-24 | 4 | -48/+22 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Make update_verifier generic across verified boot versions." | Tao Bao | 2018-04-24 | 4 | -48/+22 |
| | | | |\| | |
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Make update_verifier generic across verified boot versions. | Tao Bao | 2018-04-20 | 4 | -48/+22 |
| | | | |/ / |
|
* | | | | | | Snap for 4736303 from 73edea3e67ca22b93217d97605a18d2d0a267483 to qt-release | android-build-team Robot | 2018-04-21 | 5 | -37/+24 |
|\| | | | | |
|
| * | | | | | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239c am: 4cf3bc1875 | Tao Bao | 2018-04-20 | 5 | -37/+24 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239c | Tao Bao | 2018-04-20 | 5 | -37/+24 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." | Tao Bao | 2018-04-20 | 5 | -37/+24 |
| | | |\| | |
|
| | | | * | | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." | Treehugger Robot | 2018-04-20 | 5 | -37/+24 |
| | | | |\ \ |
|
| | | | | * | | applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch. | Tao Bao | 2018-04-20 | 5 | -37/+24 |
| | | | |/ / |
|
* | | | | | | Snap for 4733905 from 0d4ef610f469ff42f42dba9fd535aaa8d8fd276b to qt-release | android-build-team Robot | 2018-04-20 | 3 | -1/+26 |
|\| | | | | |
|
| * | | | | | Merge "applypatch: Dump patch info on mismatching patching result." am: d2c32b281b am: ea70fd7d1d | Tao Bao | 2018-04-20 | 2 | -1/+21 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Dump patch info on mismatching patching result." am: d2c32b281b | Tao Bao | 2018-04-19 | 2 | -1/+21 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Dump patch info on mismatching patching result." | Tao Bao | 2018-04-19 | 2 | -1/+21 |
| | | |\| | |
|
| | | | * | | Merge "applypatch: Dump patch info on mismatching patching result." | Tao Bao | 2018-04-19 | 2 | -1/+21 |
| | | | |\ \ |
|
| | | | | * | | applypatch: Dump patch info on mismatching patching result. | Tao Bao | 2018-04-19 | 2 | -1/+21 |
| | | | |/ / |
|
| * | | | | | Merge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777 am: 11e31203a6 | Zhomart Mukhamejanov | 2018-04-18 | 1 | -0/+5 |
| |\| | | | |
|
| | * | | | | Merge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777 | Zhomart Mukhamejanov | 2018-04-18 | 1 | -0/+5 |
| | |\| | | |
|
| | | * | | | Merge "Add sample_updater style check to PREUPLOAD.cfg" | Zhomart Mukhamejanov | 2018-04-18 | 1 | -0/+5 |
| | | |\| | |
|
| | | | * | | Merge "Add sample_updater style check to PREUPLOAD.cfg" | Zhomart Mukhamejanov | 2018-04-18 | 1 | -0/+5 |
| | | | |\ \ |
|
| | | | | * | | Add sample_updater style check to PREUPLOAD.cfg | Zhomart Mukhamejanov | 2018-04-18 | 1 | -0/+5 |
| | | | |/ / |
|
* | | | | | | Snap for 4726042 from d57f3c7736536cdeb854252b846ea4cf21810a6a to qt-release | android-build-team Robot | 2018-04-17 | 4 | -101/+130 |
|\| | | | | |
|
| * | | | | | Merge "tests: Move ResourcesTest into component test." am: 07d0032def am: 9adbc572a3 | Tao Bao | 2018-04-17 | 3 | -101/+126 |
| |\| | | | |
|
| | * | | | | Merge "tests: Move ResourcesTest into component test." am: 07d0032def | Tao Bao | 2018-04-17 | 3 | -101/+126 |
| | |\| | | |
|
| | | * | | | Merge "tests: Move ResourcesTest into component test." | Tao Bao | 2018-04-17 | 3 | -101/+126 |
| | | |\| | |
|
| | | | * | | Merge "tests: Move ResourcesTest into component test." | Treehugger Robot | 2018-04-17 | 3 | -101/+126 |
| | | | |\ \ |
|
| | | | | * | | tests: Move ResourcesTest into component test. | Tao Bao | 2018-04-16 | 3 | -101/+126 |
| * | | | | | | Merge "Disable lld where it fails." am: 0c8eea86f9 am: dd2277a9bd | Chih-Hung Hsieh | 2018-04-16 | 1 | -0/+4 |
| |\| | | | | |
|
| | * | | | | | Merge "Disable lld where it fails." am: 0c8eea86f9 | Chih-Hung Hsieh | 2018-04-16 | 1 | -0/+4 |
| | |\| | | | |
|
| | | * | | | | Merge "Disable lld where it fails." | Chih-Hung Hsieh | 2018-04-16 | 1 | -0/+4 |
| | | |\| | | |
|
| | | | * | | | Merge "Disable lld where it fails." | Treehugger Robot | 2018-04-16 | 1 | -0/+4 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Disable lld where it fails. | Chih-Hung Hsieh | 2018-04-16 | 1 | -0/+4 |
| | | | |/ / |
|
* | | | | | | Snap for 4722634 from 563a102d0f38e75ffe4e9180ea31cf2a4ba989cf to qt-release | android-build-team Robot | 2018-04-15 | 4 | -154/+153 |
|\| | | | | |
|
| * | | | | | Merge "Expose PngHandler via resources.h." am: 3c8fdf3274 am: c41aba80b7 | Tao Bao | 2018-04-15 | 3 | -153/+152 |
| |\| | | | |
|
| | * | | | | Merge "Expose PngHandler via resources.h." am: 3c8fdf3274 | Tao Bao | 2018-04-15 | 3 | -153/+152 |
| | |\| | | |
|
| | | * | | | Merge "Expose PngHandler via resources.h." | Tao Bao | 2018-04-15 | 3 | -153/+152 |
| | | |\| | |
|
| | | | * | | Merge "Expose PngHandler via resources.h." | Treehugger Robot | 2018-04-14 | 3 | -153/+152 |
| | | | |\ \ |
|
| | | | | * | | Expose PngHandler via resources.h. | Tao Bao | 2018-04-14 | 3 | -153/+152 |
| * | | | | | | Merge "minadbd: track signature change of service_to_fd." am: 5ac8cfe1ed am: 959f010f7b | Josh Gao | 2018-04-15 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "minadbd: track signature change of service_to_fd." am: 5ac8cfe1ed | Josh Gao | 2018-04-15 | 0 | -0/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "minadbd: track signature change of service_to_fd." | Josh Gao | 2018-04-15 | 1 | -1/+1 |
| | | |\| | | |
|
| | | | * | | | Merge "minadbd: track signature change of service_to_fd." | Treehugger Robot | 2018-04-14 | 1 | -1/+1 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | minadbd: track signature change of service_to_fd. | Josh Gao | 2018-04-14 | 1 | -1/+1 |
| * | | | | | | Merge "minadbd: track signature change of service_to_fd." into pi-dev am: eacb9c0697 | Josh Gao | 2018-04-15 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "minadbd: track signature change of service_to_fd." into pi-dev | Josh Gao | 2018-04-15 | 1 | -1/+1 |
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | | * | | | | Merge "minadbd: track signature change of service_to_fd." into pi-dev | TreeHugger Robot | 2018-04-14 | 1 | -1/+1 |
| | | |\ \ \ \ |
|
| | | | * | | | | minadbd: track signature change of service_to_fd. | Josh Gao | 2018-04-14 | 1 | -1/+1 |
* | | | | | | | | Snap for 4721377 from ee18bb5739418bc2f24fea6edd328d228af4bc54 to qt-release | android-build-team Robot | 2018-04-14 | 6 | -60/+271 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Remove the old log files if cache space is insufficient for OTA" am: 0b3e25719d am: 8982db6ae1 | Tianjie Xu | 2018-04-13 | 6 | -60/+271 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Remove the old log files if cache space is insufficient for OTA" am: 0b3e25719d | Tianjie Xu | 2018-04-13 | 6 | -60/+271 |
| | |\ \ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Remove the old log files if cache space is insufficient for OTA" | Tianjie Xu | 2018-04-13 | 6 | -60/+271 |
| | | |\ \ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | * | | | | Merge "Remove the old log files if cache space is insufficient for OTA" | Tianjie Xu | 2018-04-13 | 6 | -60/+271 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Remove the old log files if cache space is insufficient for OTA | Tianjie Xu | 2018-04-13 | 6 | -60/+271 |
| | | | |/ / / / |
|
* | | | | | | | | Snap for 4719555 from 432e844d2b561fd1408b3be40472b4c1cff42077 to qt-release | android-build-team Robot | 2018-04-13 | 3 | -7/+6 |
|\| | | | | | | |
|
| * | | | | | | | Merge "recovery: enable fsverity feature bit" into pi-dev am: 257dd337da | Jaegeuk Kim | 2018-04-11 | 2 | -6/+5 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: enable fsverity feature bit" into pi-dev | Jaegeuk Kim | 2018-04-11 | 2 | -6/+5 |
| | |\ \ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | * | | | | | Merge "recovery: enable fsverity feature bit" into pi-dev | TreeHugger Robot | 2018-04-11 | 2 | -6/+5 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | recovery: enable fsverity feature bit | Jaegeuk Kim | 2018-04-06 | 2 | -6/+5 |
| * | | | | | | | | Use the non-LTO, non-PGO version of libhwbinder am: 2ca4a403e7 | Pirama Arumuga Nainar | 2018-04-10 | 1 | -1/+1 |
| |\| | | | | | | |
|
| | * | | | | | | | Use the non-LTO, non-PGO version of libhwbinder | Pirama Arumuga Nainar | 2018-04-10 | 1 | -1/+1 |
| | |\| | | | | | |
|
| | | * | | | | | | Use the non-LTO, non-PGO version of libhwbinder | Pirama Arumuga Nainar | 2018-04-09 | 1 | -1/+1 |
* | | | | | | | | | Snap for 4707145 from d4dd093d08b24f7b934496ddc48b681b143d2086 to qt-release | android-build-team Robot | 2018-04-08 | 1 | -1/+1 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Use non-LTO variant of libhwbinder" into pi-dev am: 7fdb6355e4 | Yi Kong | 2018-04-06 | 1 | -1/+1 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Use non-LTO variant of libhwbinder" into pi-dev | Yi Kong | 2018-04-06 | 1 | -1/+1 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Use non-LTO variant of libhwbinder" into pi-dev | TreeHugger Robot | 2018-04-06 | 1 | -1/+1 |
| | | |\ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | | * | | | | | Use non-LTO variant of libhwbinder | Yi Kong | 2018-04-03 | 1 | -1/+1 |
| | | | | |_|/ /
| | | | |/| | | |
|
* | | | | | | | | Snap for 4704169 from 2a79abfdb3998a9c1d36c10add8beb038532b77a to qt-release | android-build-team Robot | 2018-04-06 | 2 | -5/+22 |
|\| | | | | | | |
|
| * | | | | | | | install: mkfs.f2fs: specify sector size for target image size am: 1224544806 | Jaegeuk Kim | 2018-04-05 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | install: mkfs.f2fs: specify sector size for target image size | Jaegeuk Kim | 2018-04-05 | 0 | -0/+0 |
| | |\| | | | | |
|
| | | * | | | | | install: mkfs.f2fs: specify sector size for target image size | Jaegeuk Kim | 2018-04-05 | 1 | -0/+2 |
| * | | | | | | | Merge "install: mkfs.f2fs: specify sector size for target image size" am: ea8a6a9af2 am: 70ac7ea78f | Jaegeuk Kim | 2018-04-05 | 1 | -0/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "install: mkfs.f2fs: specify sector size for target image size" am: ea8a6a9af2 | Jaegeuk Kim | 2018-04-05 | 1 | -0/+2 |
| | |\ \ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | * | | | | | Merge "install: mkfs.f2fs: specify sector size for target image size" | Jaegeuk Kim | 2018-04-05 | 1 | -0/+2 |
| | | |\ \ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | * | | | | Merge "install: mkfs.f2fs: specify sector size for target image size" | Treehugger Robot | 2018-04-05 | 1 | -0/+2 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | install: mkfs.f2fs: specify sector size for target image size | Jaegeuk Kim | 2018-04-05 | 1 | -0/+2 |
| | | | |/ / / / |
|
| * | | | | | | | [automerger skipped] f2fs: support f2fs by setting unmovable bit for package file am: 848f227eea -s ours | Jaegeuk Kim | 2018-04-05 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | [automerger skipped] f2fs: support f2fs by setting unmovable bit for package file | Jaegeuk Kim | 2018-04-05 | 0 | -0/+0 |
| | |\ \ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | * | | | | | f2fs: support f2fs by setting unmovable bit for package file | Jaegeuk Kim | 2018-04-05 | 1 | -4/+22 |
| * | | | | | | | [automerger skipped] mkfs.f2fs: specify sector size for target image size am: 4358262b75 -s ours | Jaegeuk Kim | 2018-04-05 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | [automerger skipped] mkfs.f2fs: specify sector size for target image size | Jaegeuk Kim | 2018-04-05 | 0 | -0/+0 |
| | |\| | | | | |
|
| | | * | | | | | mkfs.f2fs: specify sector size for target image size | Jaegeuk Kim | 2018-04-04 | 1 | -5/+20 |
| | | | |_|/ /
| | | |/| | | |
|
| * | | | | | | Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319 am: fc0f970c93 | Jaegeuk Kim | 2018-04-04 | 1 | -5/+20 |
| |\| | | | | |
|
| | * | | | | | Merge "mkfs.f2fs: specify sector size for target image size" am: 81c3c4a319 | Jaegeuk Kim | 2018-04-04 | 1 | -5/+20 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "mkfs.f2fs: specify sector size for target image size" | Jaegeuk Kim | 2018-04-04 | 1 | -5/+20 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "mkfs.f2fs: specify sector size for target image size" | Treehugger Robot | 2018-04-04 | 1 | -5/+20 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | mkfs.f2fs: specify sector size for target image size | Jaegeuk Kim | 2018-04-04 | 1 | -5/+20 |
| | | | |/ / |
|
* | | | | | | Snap for 4696223 from 90336bc85ec12352b8a3720286474bf84b507594 to qt-release | android-build-team Robot | 2018-04-03 | 11 | -151/+276 |
|\| | | | | |
|
| * | | | | | Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28 am: 8028dc1ce4 | Tao Bao | 2018-04-03 | 4 | -62/+25 |
| |\| | | | |
|
| | * | | | | Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28 | Tao Bao | 2018-04-03 | 4 | -62/+25 |
| | |\| | | |
|
| | | * | | | Merge "tests: Pick up testdata with LOCAL_TEST_DATA." | Tao Bao | 2018-04-03 | 4 | -62/+25 |
| | | |\| | |
|
| | | | * | | Merge "tests: Pick up testdata with LOCAL_TEST_DATA." | Treehugger Robot | 2018-04-03 | 4 | -62/+25 |
| | | | |\ \ |
|
| | | | | * | | tests: Pick up testdata with LOCAL_TEST_DATA. | Tao Bao | 2018-04-02 | 4 | -62/+25 |
| * | | | | | | Merge "Do not skip the update installation if it's a retry" am: e566168c94 am: 2e0ac38d40 | Tianjie Xu | 2018-04-03 | 1 | -2/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "Do not skip the update installation if it's a retry" am: e566168c94 | Tianjie Xu | 2018-04-03 | 1 | -2/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "Do not skip the update installation if it's a retry" | Tianjie Xu | 2018-04-03 | 1 | -2/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "Do not skip the update installation if it's a retry" | Tianjie Xu | 2018-04-03 | 1 | -2/+2 |
| | | | |\ \ \ |
|
| | | | | * | | | Do not skip the update installation if it's a retry | Tianjie Xu | 2018-04-02 | 1 | -2/+2 |
| | | | |/ / / |
|
| * | | | | | | Merge "Create the SystemUpdate activity class." am: c506482abc am: c974a1f404 | Jiachen Zhao | 2018-04-02 | 4 | -4/+104 |
| |\| | | | | |
|
| | * | | | | | Merge "Create the SystemUpdate activity class." am: c506482abc | Jiachen Zhao | 2018-04-02 | 4 | -4/+104 |
| | |\| | | | |
|
| | | * | | | | Merge "Create the SystemUpdate activity class." | Jiachen Zhao | 2018-04-02 | 4 | -4/+104 |
| | | |\| | | |
|
| | | | * | | | Merge "Create the SystemUpdate activity class." | Jiachen Zhao | 2018-04-02 | 4 | -4/+104 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Create the SystemUpdate activity class. | Jiachen Zhao | 2018-04-01 | 4 | -4/+104 |
| * | | | | | | Merge "Move a few modules to Soong." am: d408a865af am: 47be7bcdba | Tao Bao | 2018-04-02 | 2 | -83/+145 |
| |\| | | | | |
|
| | * | | | | | Merge "Move a few modules to Soong." am: d408a865af | Tao Bao | 2018-04-02 | 2 | -83/+145 |
| | |\| | | | |
|
| | | * | | | | Merge "Move a few modules to Soong." | Tao Bao | 2018-04-02 | 2 | -83/+145 |
| | | |\| | | |
|
| | | | * | | | Merge "Move a few modules to Soong." | Treehugger Robot | 2018-04-02 | 2 | -83/+145 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Move a few modules to Soong. | Tao Bao | 2018-03-27 | 2 | -83/+145 |
* | | | | | | | Snap for 4693670 from 966fffcd1760038cbfd0680aec7c5792aa1b68a5 to qt-release | android-build-team Robot | 2018-04-01 | 4 | -0/+48 |
|\| | | | | | |
|
| * | | | | | | Merge "Create folder for SystemUpdate sample app." am: f0e2811092 am: c6152041fd | Jiachen Zhao | 2018-03-31 | 4 | -0/+48 |
| |\| | | | | |
|
| | * | | | | | Merge "Create folder for SystemUpdate sample app." am: f0e2811092 | Jiachen Zhao | 2018-03-31 | 4 | -0/+48 |
| | |\| | | | |
|
| | | * | | | | Merge "Create folder for SystemUpdate sample app." | Jiachen Zhao | 2018-03-31 | 4 | -0/+48 |
| | | |\| | | |
|
| | | | * | | | Merge "Create folder for SystemUpdate sample app." | Jiachen Zhao | 2018-03-31 | 4 | -0/+48 |
| | | | |\ \ \ |
|
| | | | | * | | | Create folder for SystemUpdate sample app. | Jiachen Zhao | 2018-03-31 | 4 | -0/+48 |
| | | | |/ / / |
|
* | | | | | | | Snap for 4693202 from adc47121e3bd0e27414383cd12accbd8a945eefb to qt-release | android-build-team Robot | 2018-03-31 | 3 | -300/+5 |
|\| | | | | | |
|
| * | | | | | | Merge "Remove the obsolete mkfont.c and font_10x18.h" am: 8b9faa0008 am: dea56f6531 | Tianjie Xu | 2018-03-30 | 3 | -300/+5 |
| |\| | | | | |
|
| | * | | | | | Merge "Remove the obsolete mkfont.c and font_10x18.h" am: 8b9faa0008 | Tianjie Xu | 2018-03-30 | 3 | -300/+5 |
| | |\| | | | |
|
| | | * | | | | Merge "Remove the obsolete mkfont.c and font_10x18.h" | Tianjie Xu | 2018-03-30 | 3 | -300/+5 |
| | | |\| | | |
|
| | | | * | | | Merge "Remove the obsolete mkfont.c and font_10x18.h" | Tianjie Xu | 2018-03-30 | 3 | -300/+5 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Remove the obsolete mkfont.c and font_10x18.h | Tianjie Xu | 2018-03-30 | 3 | -300/+5 |
* | | | | | | | Snap for 4680931 from 9ce71aaa872a67af491782c87c25129f586d6231 to qt-release | android-build-team Robot | 2018-03-27 | 1 | -11/+19 |
|\| | | | | | |
|
| * | | | | | | [automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189 am: 1da2937623 -s ours | Tao Bao | 2018-03-27 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | [automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189 | Tao Bao | 2018-03-27 | 0 | -0/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." | Tao Bao | 2018-03-27 | 1 | -12/+20 |
| | | |\| | | |
|
| | | | * | | | Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." | Treehugger Robot | 2018-03-27 | 1 | -12/+20 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Specify a default module for TARGET_RECOVERY_UI_LIB. | Tao Bao | 2018-03-27 | 1 | -12/+20 |
| | | | |/ / |
|
| * | | | | | Specify a default module for TARGET_RECOVERY_UI_LIB. | Tao Bao | 2018-03-27 | 1 | -11/+19 |
| |\| | | | |
|
| | * | | | | Specify a default module for TARGET_RECOVERY_UI_LIB. | Tao Bao | 2018-03-27 | 1 | -11/+19 |
* | | | | | | Snap for 4677759 from 602806663885b9a9c3bd0972da7c3216ab70dc0e to qt-release | android-build-team Robot | 2018-03-25 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | [automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65 am: baf619c21c -s ours | Tianjie Xu | 2018-03-24 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | [automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65 | Tianjie Xu | 2018-03-24 | 0 | -0/+0 |
| | |\| | | |
|
| | | * | | | Merge "Factor out a menu class for screen ui" | Tianjie Xu | 2018-03-24 | 7 | -185/+472 |
| | | |\| | |
|
| | | | * | | Merge "Factor out a menu class for screen ui" | Tianjie Xu | 2018-03-24 | 7 | -185/+472 |
| | | | |\ \ |
|
| | | | | * | | Factor out a menu class for screen ui | Tianjie Xu | 2018-03-24 | 7 | -185/+472 |
| | | | |/ / |
|
| * | | | | | Factor out a menu class for screen ui | Tianjie Xu | 2018-03-24 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | Factor out a menu class for screen ui | Tianjie Xu | 2018-03-24 | 7 | -184/+471 |
* | | | | | | Snap for 4677325 from f5a58b32bf0af7363780dbbf68de726fa70e7538 to qt-release | android-build-team Robot | 2018-03-24 | 9 | -198/+482 |
|\| | | | | |
|
| * | | | | | Merge "update_verifier: Support verifying product partition." am: ab8d782bd4 am: 7ce215d3b9 | Tao Bao | 2018-03-24 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | Merge "update_verifier: Support verifying product partition." am: ab8d782bd4 | Tao Bao | 2018-03-24 | 0 | -0/+0 |
| | |\| | | |
|
| | | * | | | Merge "update_verifier: Support verifying product partition." | Tao Bao | 2018-03-24 | 2 | -14/+11 |
| | | |\| | |
|
| | | | * | | Merge "update_verifier: Support verifying product partition." | Treehugger Robot | 2018-03-23 | 2 | -14/+11 |
| | | | |\ \ |
|
| | | | | * | | update_verifier: Support verifying product partition. | Tao Bao | 2018-03-23 | 2 | -14/+11 |
| | | | |/ / |
|
| * | | | | | Merge "Factor out a menu class for screen ui" | Tianjie Xu | 2018-03-24 | 7 | -184/+471 |
| |\ \ \ \ \ |
|
| | * | | | | | Factor out a menu class for screen ui | Tianjie Xu | 2018-03-23 | 7 | -184/+471 |
| * | | | | | | update_verifier: Support verifying product partition. am: 454d8cb805 | Tao Bao | 2018-03-24 | 2 | -14/+11 |
| |\ \ \ \ \ \
| | |/ / / / /
| |/| / / / /
| | |/ / / / |
|
| | * | | | | update_verifier: Support verifying product partition. | Tao Bao | 2018-03-24 | 2 | -14/+11 |
| | |\ \ \ \
| | | | |_|/
| | | |/| | |
|
| | | * | | | update_verifier: Support verifying product partition. | Tao Bao | 2018-03-23 | 2 | -14/+11 |
* | | | | | | Snap for 4674419 from 64e620a09ef0fadff9b65b93494b26835d37563a to qt-release | android-build-team Robot | 2018-03-23 | 2 | -49/+112 |
|\| | | | | |
|
| * | | | | | Merge "f2fs: support f2fs by setting unmovable bit for package file" am: 28dcad554c am: a0e2a1aa8b | Jaegeuk Kim | 2018-03-22 | 1 | -4/+38 |
| |\| | | | |
|
| | * | | | | Merge "f2fs: support f2fs by setting unmovable bit for package file" am: 28dcad554c | Jaegeuk Kim | 2018-03-22 | 1 | -4/+38 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | Merge "f2fs: support f2fs by setting unmovable bit for package file" | Jaegeuk Kim | 2018-03-22 | 1 | -4/+38 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Merge "f2fs: support f2fs by setting unmovable bit for package file" | Jaegeuk Kim | 2018-03-22 | 1 | -4/+38 |
| | | | |\ \ |
|
| | | | | * | | f2fs: support f2fs by setting unmovable bit for package file | Jaegeuk Kim | 2018-03-22 | 1 | -4/+38 |
| * | | | | | | tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test. am: d26f95287a -s ours | Tao Bao | 2018-03-21 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test. | Tao Bao | 2018-03-21 | 0 | -0/+0 |
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | | * | | | | tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test. | Tao Bao | 2018-03-20 | 1 | -0/+51 |
| * | | | | | | Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." am: e0b05ba553 am: 40bfff9159 | Tao Bao | 2018-03-20 | 1 | -45/+74 |
| |\| | | | | |
|
| | * | | | | | Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." am: e0b05ba553 | Tao Bao | 2018-03-20 | 1 | -45/+74 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." | Tao Bao | 2018-03-20 | 1 | -45/+74 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "tests: Split ApplyPatchModesTest.PatchModeEmmcTarget." | Treehugger Robot | 2018-03-20 | 1 | -45/+74 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | tests: Split ApplyPatchModesTest.PatchModeEmmcTarget. | Tao Bao | 2018-03-20 | 1 | -45/+74 |
| | | | |/ / |
|
* | | | | | | Snap for 4653637 from 4f261da503e88d9f0a2c9cb2cbb59272bab95ce0 to qt-release | android-build-team Robot | 2018-03-14 | 3 | -0/+53 |
|\| | | | | |
|
| * | | | | | recovery: add libhidl-gen-utils depedency am: 91b48f9161 -s ours | Yifan Hong | 2018-03-13 | 0 | -0/+0 |
| |\| | | | |
|
| | * | | | | recovery: add libhidl-gen-utils depedency | Yifan Hong | 2018-03-13 | 0 | -0/+0 |
| | |\ \ \ \
| | | | |_|/
| | | |/| | |
|
| | | * | | | recovery: add libhidl-gen-utils depedency | Yifan Hong | 2018-03-13 | 2 | -0/+2 |
| * | | | | | Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." am: 3537a2659e am: 20d9c8ea5a | Tao Bao | 2018-03-13 | 1 | -0/+51 |
| |\| | | | |
|
| | * | | | | Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." am: 3537a2659e | Tao Bao | 2018-03-13 | 1 | -0/+51 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." | Tao Bao | 2018-03-13 | 1 | -0/+51 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Merge "tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test." | Treehugger Robot | 2018-03-13 | 1 | -0/+51 |
| | | | |\ \ |
|
| | | | | * | | tests: Add ApplyPatchModesTest.PatchModeEmmcTargetWithBsdiffPatch test. | Tao Bao | 2018-03-13 | 1 | -0/+51 |
| * | | | | | | Merge "recovery: add libhidl-gen-utils depedency" am: fc39f3ffd7 am: da5bb13507 | Yifan Hong | 2018-03-12 | 2 | -0/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: add libhidl-gen-utils depedency" am: fc39f3ffd7 | Yifan Hong | 2018-03-12 | 2 | -0/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: add libhidl-gen-utils depedency" | Yifan Hong | 2018-03-12 | 2 | -0/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: add libhidl-gen-utils depedency" | Yifan Hong | 2018-03-12 | 2 | -0/+2 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | recovery: add libhidl-gen-utils depedency | Yifan Hong | 2018-03-08 | 2 | -0/+2 |
* | | | | | | | Snap for 4648378 from 996610f45ae636c8e4c8c785ff63845153f84d09 to qt-release | android-build-team Robot | 2018-03-12 | 3 | -13/+5 |
|\| | | | | | |
|
| * | | | | | | Merge "Set the update locations to default in CacheLocation's constructor" am: 0acbdac82b am: 7120c687a5 | Tianjie Xu | 2018-03-09 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "Set the update locations to default in CacheLocation's constructor" am: 0acbdac82b | Tianjie Xu | 2018-03-09 | 0 | -0/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "Set the update locations to default in CacheLocation's constructor" | Tianjie Xu | 2018-03-09 | 3 | -13/+5 |
| | | |\| | | |
|
| | | | * | | | Merge "Set the update locations to default in CacheLocation's constructor" | Tianjie Xu | 2018-03-09 | 3 | -13/+5 |
| | | | |\ \ \ |
|
| | | | | * | | | Set the update locations to default in CacheLocation's constructor | Tianjie Xu | 2018-03-08 | 3 | -13/+5 |
| * | | | | | | | Set the update locations to default in CacheLocation's constructor am: 01daebbe68 | Tianjie Xu | 2018-03-09 | 3 | -13/+5 |
| |\| | | | | | |
|
| | * | | | | | | Set the update locations to default in CacheLocation's constructor | Tianjie Xu | 2018-03-09 | 3 | -13/+5 |
| | |\ \ \ \ \ \
| | | | |_|_|_|/
| | | |/| | | | |
|
| | | * | | | | | Set the update locations to default in CacheLocation's constructor | Tianjie Xu | 2018-03-08 | 3 | -13/+5 |
* | | | | | | | | Snap for 4641592 from 9c332915ba9fe8f1f99e5019bcb2db25f21b8024 to qt-release | android-build-team Robot | 2018-03-08 | 7 | -76/+115 |
|\| | | | | | |
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | Merge "Export fuse_sideload.h for libfusesideload." am: ddf93c0055 am: 9b0c133ff5 | Tao Bao | 2018-03-07 | 5 | -13/+38 |
| |\| | | | | |
|
| | * | | | | | Merge "Export fuse_sideload.h for libfusesideload." am: ddf93c0055 | Tao Bao | 2018-03-07 | 5 | -13/+38 |
| | |\| | | | |
|
| | | * | | | | Merge "Export fuse_sideload.h for libfusesideload." | Tao Bao | 2018-03-07 | 5 | -13/+38 |
| | | |\| | | |
|
| | | | * | | | Merge "Export fuse_sideload.h for libfusesideload." | Treehugger Robot | 2018-03-07 | 5 | -13/+38 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | Export fuse_sideload.h for libfusesideload. | Tao Bao | 2018-03-07 | 5 | -13/+38 |
| * | | | | | | Merge "Drop the no-op Android.bp." am: 242d41b808 am: 2d62142fff | Tao Bao | 2018-03-07 | 1 | -8/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "Drop the no-op Android.bp." am: 242d41b808 | Tao Bao | 2018-03-07 | 1 | -8/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "Drop the no-op Android.bp." | Tao Bao | 2018-03-07 | 1 | -8/+0 |
| | | |\| | | |
|
| | | | * | | | Merge "Drop the no-op Android.bp." | Treehugger Robot | 2018-03-07 | 1 | -8/+0 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | Drop the no-op Android.bp. | Tao Bao | 2018-03-07 | 1 | -8/+0 |
| * | | | | | | Merge "minadbd: Move to Soong." am: 56160b2b03 am: 734f76fc38 | Tao Bao | 2018-03-07 | 3 | -56/+78 |
|/| | | | | |
| |/ / / / / |
|
| * / / / / | Merge "minadbd: Move to Soong." am: 56160b2b03 | Tao Bao | 2018-03-07 | 3 | -56/+78 |
|/| | | | |
| |/ / / / |
|
| * | | | | Merge "minadbd: Move to Soong." | Tao Bao | 2018-03-07 | 3 | -56/+78 |
| |\| | | |
|
| | * | | | Merge "minadbd: Move to Soong." | Treehugger Robot | 2018-03-07 | 3 | -56/+78 |
| | |\ \ \
| | | |/ /
| | |/| /
| | | |/ |
|
| | | * | minadbd: Move to Soong. | Tao Bao | 2018-03-07 | 3 | -56/+78 |
| | |/ |
|
* | | | Merge "Add a singleton CacheLocation to replace the hard coded locations" am: 47cd789eed am: a72f93d6da | Tianjie Xu | 2018-03-01 | 11 | -27/+139 |
|\ \ \ |
|
| * | | | Merge "Add a singleton CacheLocation to replace the hard coded locations" am: 47cd789eed | Tianjie Xu | 2018-03-01 | 11 | -27/+139 |
| |\| | |
|
| | * | | Merge "Add a singleton CacheLocation to replace the hard coded locations" | Tianjie Xu | 2018-03-01 | 11 | -27/+139 |
| | |\| |
|
| | | * | Merge "Add a singleton CacheLocation to replace the hard coded locations" | Tianjie Xu | 2018-03-01 | 11 | -27/+139 |
| | | |\ |
|
| | | | * | Add a singleton CacheLocation to replace the hard coded locations | Tianjie Xu | 2018-02-28 | 11 | -27/+139 |
| | | |/ |
|
* | | | | Merge "Fix the behavior of undefined commands in BlockImageVerify" am: ac4818d6af am: 7b9a92c1e2 | Tianjie Xu | 2018-02-28 | 1 | -2/+4 |
|\| | | |
|
| * | | | Merge "Fix the behavior of undefined commands in BlockImageVerify" am: ac4818d6af | Tianjie Xu | 2018-02-28 | 1 | -2/+4 |
| |\| | |
|
| | * | | Merge "Fix the behavior of undefined commands in BlockImageVerify" | Tianjie Xu | 2018-02-28 | 1 | -2/+4 |
| | |\| |
|
| | | * | Merge "Fix the behavior of undefined commands in BlockImageVerify" | Tianjie Xu | 2018-02-28 | 1 | -2/+4 |
| | | |\ |
|
| | | | * | Fix the behavior of undefined commands in BlockImageVerify | Tianjie Xu | 2018-02-28 | 1 | -2/+4 |
* | | | | | Merge "Remove the assumption of target chunk size in imgdiff" am: cc3446a7f7 am: a306d7bc55 | Tianjie Xu | 2018-02-23 | 3 | -20/+131 |
|\| | | | |
|
| * | | | | Merge "Remove the assumption of target chunk size in imgdiff" am: cc3446a7f7 | Tianjie Xu | 2018-02-23 | 3 | -20/+131 |
| |\| | | |
|
| | * | | | Merge "Remove the assumption of target chunk size in imgdiff" | Tianjie Xu | 2018-02-23 | 3 | -20/+131 |
| | |\| | |
|
| | | * | | Merge "Remove the assumption of target chunk size in imgdiff" | Treehugger Robot | 2018-02-23 | 3 | -20/+131 |
| | | |\ \ |
|
| | | | * | | Remove the assumption of target chunk size in imgdiff | Tianjie Xu | 2018-02-23 | 3 | -20/+131 |
| | | | |/ |
|
* | | | | | Merge "Replace vfork() with fork()." am: 21b381622d am: 44f2cb2d67 | George Burgess IV | 2018-02-23 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | Merge "Replace vfork() with fork()." am: 21b381622d | George Burgess IV | 2018-02-23 | 1 | -1/+1 |
| |\| | | |
|
| | * | | | Merge "Replace vfork() with fork()." | George Burgess IV | 2018-02-23 | 1 | -1/+1 |
| | |\| | |
|
| | | * | | Merge "Replace vfork() with fork()." | Treehugger Robot | 2018-02-23 | 1 | -1/+1 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | Replace vfork() with fork(). | George Burgess IV | 2018-02-23 | 1 | -1/+1 |
* | | | | | Import translations. DO NOT MERGE | Bill Yi | 2018-02-22 | 2 | -0/+18 |
* | | | | | Merge "Set LOCAL_SDK_VERSION where possible." am: bf52b7e00b am: cd06b1696d | hansson | 2018-02-21 | 1 | -0/+1 |
|\| | | | |
|
| * | | | | Merge "Set LOCAL_SDK_VERSION where possible." am: bf52b7e00b | hansson | 2018-02-21 | 1 | -0/+1 |
| |\| | | |
|
| | * | | | Merge "Set LOCAL_SDK_VERSION where possible." | hansson | 2018-02-21 | 1 | -0/+1 |
| | |\| | |
|
| | | * | | Merge "Set LOCAL_SDK_VERSION where possible." | hansson | 2018-02-21 | 1 | -0/+1 |
| | | |\ \ |
|
| | | | * | | Set LOCAL_SDK_VERSION where possible. | Anton Hansson | 2018-02-21 | 1 | -0/+1 |
| | | |/ / |
|
* | | | | | Merge "Disable building libapplypatch on mac" am: c1e1d7e711 am: 2754916f01 | Tianjie Xu | 2018-02-18 | 2 | -0/+12 |
|\| | | | |
|
| * | | | | Merge "Disable building libapplypatch on mac" am: c1e1d7e711 | Tianjie Xu | 2018-02-18 | 2 | -0/+12 |
| |\| | | |
|
| | * | | | Merge "Disable building libapplypatch on mac" | Tianjie Xu | 2018-02-18 | 2 | -0/+12 |
| | |\| | |
|
| | | * | | Merge "Disable building libapplypatch on mac" | Treehugger Robot | 2018-02-18 | 2 | -0/+12 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | Disable building libapplypatch on mac | Tianjie Xu | 2018-02-18 | 2 | -0/+12 |
| | | |/ |
|
* | | | | Merge "Skip the cache size check on host" am: 31bcd7c002 am: fb8496e3aa | Tianjie Xu | 2018-02-17 | 4 | -3/+12 |
|\| | | |
|
| * | | | Merge "Skip the cache size check on host" am: 31bcd7c002 | Tianjie Xu | 2018-02-17 | 4 | -3/+12 |
| |\| | |
|
| | * | | Merge "Skip the cache size check on host" | Tianjie Xu | 2018-02-17 | 4 | -3/+12 |
| | |\| |
|
| | | * | Merge "Skip the cache size check on host" | Tianjie Xu | 2018-02-17 | 4 | -3/+12 |
| | | |\ |
|
| | | | * | Skip the cache size check on host | Tianjie Xu | 2018-02-13 | 4 | -3/+12 |
* | | | | | Merge "recovery: Porting screensave mode for new platform." am: 15e376d792 am: 470b4fef7f | Tao Bao | 2018-02-16 | 2 | -6/+19 |
|\| | | | |
|
| * | | | | Merge "recovery: Porting screensave mode for new platform." am: 15e376d792 | Tao Bao | 2018-02-16 | 2 | -6/+19 |
| |\| | | |
|
| | * | | | Merge "recovery: Porting screensave mode for new platform." | Tao Bao | 2018-02-16 | 2 | -6/+19 |
| | |\| | |
|
| | | * | | Merge "recovery: Porting screensave mode for new platform." | Tao Bao | 2018-02-16 | 2 | -6/+19 |
| | | |\ \ |
|
| | | | * | | recovery: Porting screensave mode for new platform. | katao | 2017-12-14 | 2 | -6/+19 |
* | | | | | | Merge "Reorder the functions in updater/install.cpp" am: 9818283da7 am: 576d2754ee | Tianjie Xu | 2018-02-13 | 1 | -239/+244 |
|\| | | | | |
|
| * | | | | | Merge "Reorder the functions in updater/install.cpp" am: 9818283da7 | Tianjie Xu | 2018-02-13 | 1 | -239/+244 |
| |\| | | | |
|
| | * | | | | Merge "Reorder the functions in updater/install.cpp" | Tianjie Xu | 2018-02-13 | 1 | -239/+244 |
| | |\| | | |
|
| | | * | | | Merge "Reorder the functions in updater/install.cpp" | Tianjie Xu | 2018-02-13 | 1 | -239/+244 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Reorder the functions in updater/install.cpp | Tianjie Xu | 2018-02-12 | 1 | -239/+244 |
| | | |/ / |
|
* | | | | | Merge "Log the last command to cache" am: 6a3646fc03 am: 6d78bb5236 | Tianjie Xu | 2018-02-08 | 3 | -9/+392 |
|\| | | | |
|
| * | | | | Merge "Log the last command to cache" am: 6a3646fc03 | Tianjie Xu | 2018-02-08 | 3 | -9/+392 |
| |\| | | |
|
| | * | | | Merge "Log the last command to cache" | Tianjie Xu | 2018-02-08 | 3 | -9/+392 |
| | |\| | |
|
| | | * | | Merge "Log the last command to cache" | Tianjie Xu | 2018-02-08 | 3 | -9/+392 |
| | | |\ \ |
|
| | | | * | | Log the last command to cache | Tianjie Xu | 2018-02-07 | 3 | -9/+392 |
* | | | | | | Merge "Document instructions for using adb under recovery." am: 7ee7e27400 am: 41186e13b7 | Tao Bao | 2018-02-08 | 1 | -0/+91 |
|\| | | | | |
|
| * | | | | | Merge "Document instructions for using adb under recovery." am: 7ee7e27400 | Tao Bao | 2018-02-08 | 1 | -0/+91 |
| |\| | | | |
|
| | * | | | | Merge "Document instructions for using adb under recovery." | Tao Bao | 2018-02-08 | 1 | -0/+91 |
| | |\| | | |
|
| | | * | | | Merge "Document instructions for using adb under recovery." | Treehugger Robot | 2018-02-08 | 1 | -0/+91 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Document instructions for using adb under recovery. | Tao Bao | 2018-02-08 | 1 | -0/+91 |
| | | |/ / |
|
* | | | | | Merge "Avoid overwrite of the error message in AbortFn" am: bded087f7d am: 20af3722d8 | Tianjie Xu | 2018-01-30 | 3 | -23/+26 |
|\| | | | |
|
| * | | | | Merge "Avoid overwrite of the error message in AbortFn" am: bded087f7d | Tianjie Xu | 2018-01-30 | 3 | -23/+26 |
| |\| | | |
|
| | * | | | Merge "Avoid overwrite of the error message in AbortFn" | Tianjie Xu | 2018-01-30 | 3 | -23/+26 |
| | |\| | |
|
| | | * | | Merge "Avoid overwrite of the error message in AbortFn" | Tianjie Xu | 2018-01-30 | 3 | -23/+26 |
| | | |\ \ |
|
| | | | * | | Avoid overwrite of the error message in AbortFn | Tianjie Xu | 2018-01-29 | 3 | -23/+26 |
* | | | | | | Merge "Add update_channel field to bootloader_message_ab." am: 63eb1a4444 am: 7441ee7aff | Sen Jiang | 2018-01-26 | 1 | -1/+5 |
|\| | | | | |
|
| * | | | | | Merge "Add update_channel field to bootloader_message_ab." am: 63eb1a4444 | Sen Jiang | 2018-01-26 | 1 | -1/+5 |
| |\| | | | |
|
| | * | | | | Merge "Add update_channel field to bootloader_message_ab." | Sen Jiang | 2018-01-26 | 1 | -1/+5 |
| | |\| | | |
|
| | | * | | | Merge "Add update_channel field to bootloader_message_ab." | Sen Jiang | 2018-01-26 | 1 | -1/+5 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Add update_channel field to bootloader_message_ab. | Sen Jiang | 2018-01-23 | 1 | -1/+5 |
| | | |/ / |
|
* | | | | | Statically link with libhealthstoragedefault | Hridya Valsaraju | 2018-01-12 | 1 | -0/+1 |
* | | | | | Merge "StartsWith allows a std::string prefix now." am: 80ccac2fff am: bd870377b4 | Elliott Hughes | 2017-12-21 | 2 | -2/+2 |
|\| | | | |
|
| * | | | | Merge "StartsWith allows a std::string prefix now." am: 80ccac2fff | Elliott Hughes | 2017-12-21 | 2 | -2/+2 |
| |\| | | |
|
| | * | | | Merge "StartsWith allows a std::string prefix now." | Elliott Hughes | 2017-12-21 | 2 | -2/+2 |
| | |\| | |
|
| | | * | | Merge "StartsWith allows a std::string prefix now." | Treehugger Robot | 2017-12-21 | 2 | -2/+2 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | StartsWith allows a std::string prefix now. | Elliott Hughes | 2017-12-20 | 2 | -2/+2 |
| | | |/ |
|
* | | | | Merge "Let update_verifier work on non-AB update devices" am: 3fe230a1e4 am: 4b7ed5a71b | Isaac Chen | 2017-12-14 | 1 | -0/+9 |
|\| | | |
|
| * | | | Merge "Let update_verifier work on non-AB update devices" am: 3fe230a1e4 | Isaac Chen | 2017-12-14 | 1 | -0/+9 |
| |\| | |
|
| | * | | Merge "Let update_verifier work on non-AB update devices" | Isaac Chen | 2017-12-14 | 1 | -0/+9 |
| | |\| |
|
| | | * | Merge "Let update_verifier work on non-AB update devices" | Isaac Chen | 2017-12-14 | 1 | -0/+9 |
| | | |\ |
|
| | | | * | Let update_verifier work on non-AB update devices | Isaac Chen | 2017-12-14 | 1 | -0/+9 |
| | | |/ |
|
* | | | | Merge "applypatch: Remove the 'st' field from FileContents." am: 9203e77e7d am: 710712f235 | Tao Bao | 2017-12-09 | 2 | -17/+3 |
|\| | | |
|
| * | | | Merge "applypatch: Remove the 'st' field from FileContents." am: 9203e77e7d | Tao Bao | 2017-12-09 | 2 | -17/+3 |
| |\| | |
|
| | * | | Merge "applypatch: Remove the 'st' field from FileContents." | Tao Bao | 2017-12-09 | 2 | -17/+3 |
| | |\| |
|
| | | * | Merge "applypatch: Remove the 'st' field from FileContents." | Tao Bao | 2017-12-09 | 2 | -17/+3 |
| | | |\ |
|
| | | | * | applypatch: Remove the 'st' field from FileContents. | Tao Bao | 2017-12-07 | 2 | -17/+3 |
* | | | | | Merge "add sload.f2fs for recovery format" am: 4eaf7a157d am: 3d4359d3ae | Jaegeuk Kim | 2017-12-08 | 3 | -7/+23 |
|\| | | | |
|
| * | | | | Merge "add sload.f2fs for recovery format" am: 4eaf7a157d | Jaegeuk Kim | 2017-12-08 | 3 | -7/+23 |
| |\| | | |
|
| | * | | | Merge "add sload.f2fs for recovery format" | Jaegeuk Kim | 2017-12-08 | 3 | -7/+23 |
| | |\| | |
|
| | | * | | Merge "add sload.f2fs for recovery format" | Jaegeuk Kim | 2017-12-08 | 3 | -7/+23 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | add sload.f2fs for recovery format | Jaegeuk Kim | 2017-12-05 | 3 | -7/+23 |
* | | | | | Merge "Add a /bin symlink for consistency." am: ed369101ba am: 13b751ed84 | Elliott Hughes | 2017-12-08 | 1 | -0/+1 |
|\| | | | |
|
| * | | | | Merge "Add a /bin symlink for consistency." am: ed369101ba | Elliott Hughes | 2017-12-07 | 1 | -0/+1 |
| |\| | | |
|
| | * | | | Merge "Add a /bin symlink for consistency." | Elliott Hughes | 2017-12-07 | 1 | -0/+1 |
| | |\| | |
|
| | | * | | Merge "Add a /bin symlink for consistency." | Elliott Hughes | 2017-12-07 | 1 | -0/+1 |
| | |/| | |
|
| | | * | | Add a /bin symlink for consistency. | Elliott Hughes | 2017-12-06 | 1 | -0/+1 |
* | | | | | Merge "Detect interrupted update due to power off" am: d8fadfb606 am: d9caba2bbe | Tianjie Xu | 2017-12-01 | 2 | -269/+302 |
|\| | | | |
|
| * | | | | Merge "Detect interrupted update due to power off" am: d8fadfb606 | Tianjie Xu | 2017-12-01 | 2 | -269/+302 |
| |\| | | |
|
| | * | | | Merge "Detect interrupted update due to power off" | Tianjie Xu | 2017-12-01 | 2 | -269/+302 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | * | | Merge "Detect interrupted update due to power off" | Treehugger Robot | 2017-12-01 | 2 | -269/+302 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | Detect interrupted update due to power off | Tianjie Xu | 2017-12-01 | 2 | -269/+302 |
| | | |/ |
|
* | | | | Merge "is_battery_ok use health 2.0 HAL" | Yifan Hong | 2017-11-20 | 2 | -53/+84 |
|\ \ \ \ |
|
| * | | | | is_battery_ok use health 2.0 HAL | Yifan Hong | 2017-11-14 | 2 | -53/+84 |
* | | | | | Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c am: 25e27f48db | Jin Qian | 2017-11-20 | 1 | -4/+7 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c | Jin Qian | 2017-11-20 | 1 | -4/+7 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Merge "root: Fix an issue when volume length from fs_mgr is negative." | Jin Qian | 2017-11-20 | 1 | -4/+7 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | * | | Merge "root: Fix an issue when volume length from fs_mgr is negative." | Treehugger Robot | 2017-11-20 | 1 | -4/+7 |
| | | |\ \ |
|
| | | | * | | root: Fix an issue when volume length from fs_mgr is negative. | Jin Qian | 2017-11-19 | 1 | -4/+7 |
* | | | | | | Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922 am: 086202e30d | Tianjie Xu | 2017-11-17 | 1 | -0/+1 |
|\| | | | | |
|
| * | | | | | Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922 | Tianjie Xu | 2017-11-17 | 1 | -0/+1 |
| |\| | | | |
|
| | * | | | | Merge "Add libbrotli as a dependency when building applypatch binary" | Tianjie Xu | 2017-11-17 | 1 | -0/+1 |
| | |\| | | |
|
| | | * | | | Merge "Add libbrotli as a dependency when building applypatch binary" | Tianjie Xu | 2017-11-17 | 1 | -0/+1 |
| | | |\ \ \ |
|
| | | | * | | | Add libbrotli as a dependency when building applypatch binary | Tianjie Xu | 2017-11-03 | 1 | -0/+1 |
* | | | | | | | Merge "Switch imgdiff to libbase logging" am: fd9c25e636 am: 47c8c290ec | Tianjie Xu | 2017-11-17 | 2 | -97/+109 |
|\| | | | | | |
|
| * | | | | | | Merge "Switch imgdiff to libbase logging" am: fd9c25e636 | Tianjie Xu | 2017-11-17 | 2 | -97/+109 |
| |\| | | | | |
|
| | * | | | | | Merge "Switch imgdiff to libbase logging" | Tianjie Xu | 2017-11-17 | 2 | -97/+109 |
| | |\| | | | |
|
| | | * | | | | Merge "Switch imgdiff to libbase logging" | Tianjie Xu | 2017-11-17 | 2 | -97/+109 |
| | | |\ \ \ \ |
|
| | | | * | | | | Switch imgdiff to libbase logging | Tianjie Xu | 2017-11-16 | 2 | -97/+109 |
* | | | | | | | | Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 am: 345f350540 | Tao Bao | 2017-11-16 | 1 | -3/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 | Tao Bao | 2017-11-16 | 1 | -3/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minadbd: Remove two warning options." | Tao Bao | 2017-11-16 | 1 | -3/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minadbd: Remove two warning options." | Tao Bao | 2017-11-15 | 1 | -3/+1 |
| | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | | * | | | | minadbd: Remove two warning options. | Tao Bao | 2017-11-15 | 1 | -3/+1 |
| | | |/ / / / |
|
* | | | | | / | Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd am: c418bfeae2 | Jaegeuk Kim | 2017-11-14 | 2 | -5/+13 |
|\| | | | | |
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd | Jaegeuk Kim | 2017-11-14 | 2 | -5/+13 |
| |\| | | | |
|
| | * | | | | Merge "recovery: format f2fs with encrypt/quota" | Jaegeuk Kim | 2017-11-14 | 2 | -5/+13 |
| | |\| | | |
|
| | | * | | | Merge "recovery: format f2fs with encrypt/quota" | Treehugger Robot | 2017-11-14 | 2 | -5/+13 |
| | | |\ \ \ |
|
| | | | * | | | recovery: format f2fs with encrypt/quota | Jaegeuk Kim | 2017-11-13 | 2 | -5/+13 |
| | | |/ / / |
|
* | | | | | | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03 am: e2296b7a25 | Tao Bao | 2017-11-11 | 5 | -47/+49 |
|\| | | | | |
|
| * | | | | | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03 | Tao Bao | 2017-11-11 | 5 | -47/+49 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." | Tao Bao | 2017-11-11 | 5 | -47/+49 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." | Tao Bao | 2017-11-11 | 5 | -47/+49 |
| | | |\ \ \ |
|
| | | | * | | | applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch. | Tao Bao | 2017-11-10 | 5 | -47/+49 |
* | | | | | | | Merge "Include bspatch.h from bsdiff/" am: 29cd3215ec am: e73bca40dc | Alex Deymo | 2017-11-10 | 1 | -1/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "Include bspatch.h from bsdiff/" am: 29cd3215ec | Alex Deymo | 2017-11-10 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "Include bspatch.h from bsdiff/" | Alex Deymo | 2017-11-10 | 1 | -1/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "Include bspatch.h from bsdiff/" | Alex Deymo | 2017-11-10 | 1 | -1/+1 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Include bspatch.h from bsdiff/ | Alex Deymo | 2017-11-08 | 1 | -1/+1 |
| | | | | |/
| | | | |/| |
|
* | | | | | | Merge "uncrypt: Move to Soong." am: 992bccfef4 am: e6250057b8 | Tao Bao | 2017-11-10 | 4 | -32/+40 |
|\| | | | | |
|
| * | | | | | Merge "uncrypt: Move to Soong." am: 992bccfef4 | Tao Bao | 2017-11-10 | 4 | -32/+40 |
| |\| | | | |
|
| | * | | | | Merge "uncrypt: Move to Soong." | Tao Bao | 2017-11-10 | 4 | -32/+40 |
| | |\| | | |
|
| | | * | | | Merge "uncrypt: Move to Soong." | Tao Bao | 2017-11-10 | 4 | -32/+40 |
| | | |\ \ \ |
|
| | | | * | | | uncrypt: Move to Soong. | Tao Bao | 2017-11-09 | 4 | -32/+40 |
| | | |/ / / |
|
* | | | | | | Merge "Load-balancing update_verifier worker threads." am: f1e70b93f1 am: 1d8cb3659a | Tao Bao | 2017-11-09 | 5 | -27/+154 |
|\| | | | | |
|
| * | | | | | Merge "Load-balancing update_verifier worker threads." am: f1e70b93f1 | Tao Bao | 2017-11-09 | 5 | -27/+154 |
| |\| | | | |
|
| | * | | | | Merge "Load-balancing update_verifier worker threads." | Tao Bao | 2017-11-09 | 5 | -27/+154 |
| | |\| | | |
|
| | | * | | | Merge "Load-balancing update_verifier worker threads." | Treehugger Robot | 2017-11-09 | 5 | -27/+154 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Load-balancing update_verifier worker threads. | Tao Bao | 2017-11-09 | 5 | -27/+154 |
| | | |/ / |
|
* | | | | | Merge "otautil: Remove the aborts in RangeSet::Parse()." am: 16b8b8fd1c am: 236a7261cb | Tao Bao | 2017-11-08 | 4 | -55/+170 |
|\| | | | |
|
| * | | | | Merge "otautil: Remove the aborts in RangeSet::Parse()." am: 16b8b8fd1c | Tao Bao | 2017-11-08 | 4 | -55/+170 |
| |\| | | |
|
| | * | | | Merge "otautil: Remove the aborts in RangeSet::Parse()." | Tao Bao | 2017-11-08 | 4 | -55/+170 |
| | |\| | |
|
| | | * | | Merge "otautil: Remove the aborts in RangeSet::Parse()." | Tao Bao | 2017-11-08 | 4 | -55/+170 |
| | | |\ \ |
|
| | | | * | | otautil: Remove the aborts in RangeSet::Parse(). | Tao Bao | 2017-11-07 | 4 | -55/+170 |
* | | | | | | Merge "Switch to bionic gtest in bootable/recovery" am: bf41f2aa23 am: c1ab2bb535 | Tianjie Xu | 2017-11-06 | 10 | -275/+188 |
|\| | | | | |
|
| * | | | | | Merge "Switch to bionic gtest in bootable/recovery" am: bf41f2aa23 | Tianjie Xu | 2017-11-06 | 10 | -275/+188 |
| |\| | | | |
|
| | * | | | | Merge "Switch to bionic gtest in bootable/recovery" | Tianjie Xu | 2017-11-06 | 10 | -275/+188 |
| | |\| | | |
|
| | | * | | | Merge "Switch to bionic gtest in bootable/recovery" | Tianjie Xu | 2017-11-06 | 10 | -275/+188 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Switch to bionic gtest in bootable/recovery | Tianjie Xu | 2017-11-03 | 10 | -275/+188 |
| | | | |/ |
|
* | | | | | Merge "Clean up fuse_sideload and add a testcase." am: 73dca3e983 am: 6d61e2123b | Tao Bao | 2017-11-04 | 7 | -387/+409 |
|\| | | | |
|
| * | | | | Merge "Clean up fuse_sideload and add a testcase." am: 73dca3e983 | Tao Bao | 2017-11-04 | 7 | -387/+409 |
| |\| | | |
|
| | * | | | Merge "Clean up fuse_sideload and add a testcase." | Tao Bao | 2017-11-04 | 7 | -387/+409 |
| | |\| | |
|
| | | * | | Merge "Clean up fuse_sideload and add a testcase." | Tao Bao | 2017-11-04 | 7 | -387/+409 |
| | | |\ \ |
|
| | | | * | | Clean up fuse_sideload and add a testcase. | Tao Bao | 2017-11-04 | 7 | -387/+409 |
* | | | | | | Merge "recovery: remove make_ext4fs from updater" am: 3f06512714 am: 59b20d6565 | Jin Qian | 2017-11-04 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | Merge "recovery: remove make_ext4fs from updater" am: 3f06512714 | Jin Qian | 2017-11-04 | 1 | -9/+2 |
| |\| | | | |
|
| | * | | | | Merge "recovery: remove make_ext4fs from updater" | Jin Qian | 2017-11-04 | 1 | -9/+2 |
| | |\| | | |
|
| | | * | | | Merge "recovery: remove make_ext4fs from updater" | Treehugger Robot | 2017-11-04 | 1 | -9/+2 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | recovery: remove make_ext4fs from updater | Jin Qian | 2017-11-03 | 1 | -9/+2 |
* | | | | | | Merge "recovery: fix library dependency" am: 0da645fefa am: 4d079261e5 | Jin Qian | 2017-11-03 | 1 | -2/+2 |
|\| | | | | |
|
| * | | | | | Merge "recovery: fix library dependency" am: 0da645fefa | Jin Qian | 2017-11-03 | 1 | -2/+2 |
| |\| | | | |
|
| | * | | | | Merge "recovery: fix library dependency" | Jin Qian | 2017-11-03 | 1 | -2/+2 |
| | |\| | | |
|
| | | * | | | Merge "recovery: fix library dependency" | Treehugger Robot | 2017-11-03 | 1 | -2/+2 |
| | | |\| | |
|
| | | | * | | recovery: fix library dependency | Jin Qian | 2017-11-03 | 1 | -2/+2 |
| | | |/ / |
|
* | | | | | Merge "tests: Clean up the files in TemporaryDir." am: 2cf44d08cf am: fc8066feed | Tao Bao | 2017-11-03 | 1 | -5/+9 |
|\| | | | |
|
| * | | | | Merge "tests: Clean up the files in TemporaryDir." am: 2cf44d08cf | Tao Bao | 2017-11-03 | 1 | -5/+9 |
| |\| | | |
|
| | * | | | Merge "tests: Clean up the files in TemporaryDir." | Tao Bao | 2017-11-03 | 1 | -5/+9 |
| | |\| | |
|
| | | * | | Merge "tests: Clean up the files in TemporaryDir." | Treehugger Robot | 2017-11-03 | 1 | -5/+9 |
| | | |\ \ |
|
| | | | * | | tests: Clean up the files in TemporaryDir. | Tao Bao | 2017-11-02 | 1 | -5/+9 |
* | | | | | | Merge "Add a repohook to clang-format changes." am: 439263cb83 am: f3e2017309 | Tao Bao | 2017-11-03 | 1 | -0/+6 |
|\| | | | | |
|
| * | | | | | Merge "Add a repohook to clang-format changes." am: 439263cb83 | Tao Bao | 2017-11-03 | 1 | -0/+6 |
| |\| | | | |
|
| | * | | | | Merge "Add a repohook to clang-format changes." | Tao Bao | 2017-11-03 | 1 | -0/+6 |
| | |\| | | |
|
| | | * | | | Merge "Add a repohook to clang-format changes." | Tao Bao | 2017-11-03 | 1 | -0/+6 |
| | | |\ \ \
| | | | |_|/
| | | |/| | |
|
| | | | * | | Add a repohook to clang-format changes. | Tao Bao | 2017-11-03 | 1 | -0/+6 |
| | | |/ / |
|
* | | | | | Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-master am: 04a8b2b532 | Xin Li | 2017-11-03 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-master | Xin Li | 2017-11-03 | 0 | -0/+0 |
| |\| | | |
|
| | * | | | Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from | Xin Li | 2017-11-02 | 0 | -0/+0 |
| | |\ \ \ |
|
* | | \ \ \ | Merge "recovery: remove make_ext4fs from updater" | TreeHugger Robot | 2017-11-02 | 1 | -9/+2 |
|\ \ \ \ \ \ |
|
| * | | | | | | recovery: remove make_ext4fs from updater | Jin Qian | 2017-11-02 | 1 | -9/+2 |
* | | | | | | | Merge "Add libbrotli as a dependency for libbsdiff" am: 43f194c8bc am: 57e16e4f77 | Tianjie Xu | 2017-11-02 | 2 | -0/+2 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Merge "Add libbrotli as a dependency for libbsdiff" am: 43f194c8bc | Tianjie Xu | 2017-11-02 | 2 | -0/+2 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Add libbrotli as a dependency for libbsdiff" | Tianjie Xu | 2017-11-02 | 2 | -0/+2 |
| | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | | |
|
| | | * | | | | Merge "Add libbrotli as a dependency for libbsdiff" | Tianjie Xu | 2017-11-02 | 2 | -0/+2 |
| | | |\ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | | | * | | | Add libbrotli as a dependency for libbsdiff | Tianjie Xu | 2017-11-01 | 2 | -0/+2 |
* | | | | | | | update_verifier: Fix the wrong computation with group_range_count. am: 559a6d1d2a | Tao Bao | 2017-11-02 | 0 | -0/+0 |
|\| | | | | |
| |_|_|_|/ /
|/| | | | | |
|
| * | | | | | update_verifier: Fix the wrong computation with group_range_count. | Tao Bao | 2017-11-02 | 0 | -0/+0 |
| |\ \ \ \ \ |
|
| | * | | | | | update_verifier: Fix the wrong computation with group_range_count. | Tao Bao | 2017-10-30 | 1 | -3/+5 |
* | | | | | | | Merge "Fix the size mismatch in imgdiff" am: dec77a454e am: ff7c186f66 | Tianjie Xu | 2017-11-01 | 4 | -53/+36 |
|\| | | | | | |
|
| * | | | | | | Merge "Fix the size mismatch in imgdiff" am: dec77a454e | Tianjie Xu | 2017-11-01 | 4 | -53/+36 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Fix the size mismatch in imgdiff" | Tianjie Xu | 2017-11-01 | 4 | -53/+36 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "Fix the size mismatch in imgdiff" | Tianjie Xu | 2017-11-01 | 4 | -53/+36 |
| | | |\ \ \ \ |
|
| | | | * | | | | Fix the size mismatch in imgdiff | Tianjie Xu | 2017-11-01 | 4 | -53/+36 |
| | | | | |/ /
| | | | |/| | |
|
* | | | | | | | Merge "update_verifier: Fix the wrong computation with group_range_count." am: 011af6e1a9 am: 78fa902920 | Tao Bao | 2017-10-30 | 1 | -3/+5 |
|\| | | | | | |
|
| * | | | | | | Merge "update_verifier: Fix the wrong computation with group_range_count." am: 011af6e1a9 | Tao Bao | 2017-10-30 | 1 | -3/+5 |
| |\| | | | | |
|
| | * | | | | | Merge "update_verifier: Fix the wrong computation with group_range_count." | Tao Bao | 2017-10-30 | 1 | -3/+5 |
| | |\| | | | |
|
| | | * | | | | Merge "update_verifier: Fix the wrong computation with group_range_count." | Treehugger Robot | 2017-10-30 | 1 | -3/+5 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | update_verifier: Fix the wrong computation with group_range_count. | Tao Bao | 2017-10-29 | 1 | -3/+5 |
| | | |/ / / |
|
* | | | | | | Merge "tests: Take the ownership of the FD when calling fdopen." am: 166479b259 am: 450918158d | Tao Bao | 2017-10-27 | 2 | -29/+29 |
|\| | | | | |
|
| * | | | | | Merge "tests: Take the ownership of the FD when calling fdopen." am: 166479b259 | Tao Bao | 2017-10-27 | 2 | -29/+29 |
| |\| | | | |
|
| | * | | | | Merge "tests: Take the ownership of the FD when calling fdopen." | Tao Bao | 2017-10-27 | 2 | -29/+29 |
| | |\| | | |
|
| | | * | | | Merge "tests: Take the ownership of the FD when calling fdopen." | Treehugger Robot | 2017-10-26 | 2 | -29/+29 |
| | | |\ \ \ |
|
| | | | * | | | tests: Take the ownership of the FD when calling fdopen. | Tao Bao | 2017-10-26 | 2 | -29/+29 |
| | | |/ / / |
|
* | | | | | | Merge "applypatch: Fix a memory leak in ApplyImagePatch()." am: 1bc0117755 am: dcc1fa1ce8 | Tao Bao | 2017-10-25 | 1 | -17/+22 |
|\| | | | | |
|
| * | | | | | Merge "applypatch: Fix a memory leak in ApplyImagePatch()." am: 1bc0117755 | Tao Bao | 2017-10-25 | 1 | -17/+22 |
| |\| | | | |
|
| | * | | | | Merge "applypatch: Fix a memory leak in ApplyImagePatch()." | Tao Bao | 2017-10-25 | 1 | -17/+22 |
| | |\| | | |
|
| | | * | | | Merge "applypatch: Fix a memory leak in ApplyImagePatch()." | Treehugger Robot | 2017-10-24 | 1 | -17/+22 |
| | |/| | | |
|
| | | * | | | applypatch: Fix a memory leak in ApplyImagePatch(). | Tao Bao | 2017-10-24 | 1 | -17/+22 |
* | | | | | | Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer." am: 3d24b7bca6 am: d8ecad7896 | Alex Deymo | 2017-10-24 | 3 | -8/+11 |
|\| | | | | |
|
| * | | | | | Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer." am: 3d24b7bca6 | Alex Deymo | 2017-10-24 | 3 | -8/+11 |
| |\| | | | |
|
| | * | | | | Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer." | Alex Deymo | 2017-10-24 | 3 | -8/+11 |
| | |\ \ \ \ |
|
| | | * \ \ \ | Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer." | Treehugger Robot | 2017-10-24 | 3 | -8/+11 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer. | Alex Deymo | 2017-10-24 | 3 | -8/+11 |
* | | | | | | | Merge "libdrm_platform is now libdrm" am: d830858952 am: 3b4e2ebf2c | Dan Willemsen | 2017-10-23 | 1 | -1/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "libdrm_platform is now libdrm" am: d830858952 | Dan Willemsen | 2017-10-23 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "libdrm_platform is now libdrm" | Dan Willemsen | 2017-10-23 | 1 | -1/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "libdrm_platform is now libdrm" | Treehugger Robot | 2017-10-23 | 1 | -1/+1 |
| | | |\ \ \ \ |
|
| | | | * | | | | libdrm_platform is now libdrm | Dan Willemsen | 2017-10-20 | 1 | -1/+1 |
* | | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" am: ec9ac55949 am: 0bda7a02c2 am: 988b21ec05 -s ours | Dan Willemsen | 2017-10-21 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" am: ec9ac55949 am: 0bda7a02c2 | Dan Willemsen | 2017-10-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" am: ec9ac55949 | Dan Willemsen | 2017-10-21 | 1 | -1/+1 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" | Dan Willemsen | 2017-10-21 | 1 | -1/+1 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" | Dan Willemsen | 2017-10-21 | 1 | -1/+1 |
| | | | |\| | | | |
|
| | | | | * | | | | Build libminui with BOARD_VNDK_VERSION | Jiyong Park | 2017-10-20 | 1 | -1/+1 |
* | | | | | | | | | Merge "Finish the new data receiver when update fails" am: 9831ef389b am: 85fca1fc57 am: 4609778204 | Tianjie Xu | 2017-10-21 | 2 | -103/+174 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Finish the new data receiver when update fails" am: 9831ef389b am: 85fca1fc57 | Tianjie Xu | 2017-10-21 | 2 | -103/+174 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Finish the new data receiver when update fails" am: 9831ef389b | Tianjie Xu | 2017-10-20 | 2 | -103/+174 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Finish the new data receiver when update fails" | Tianjie Xu | 2017-10-20 | 2 | -103/+174 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Finish the new data receiver when update fails" | Tianjie Xu | 2017-10-20 | 2 | -103/+174 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | Finish the new data receiver when update fails | Tianjie Xu | 2017-10-20 | 2 | -103/+174 |
| | | | |/ / / / |
|
* | | | | | | | | Import translations. DO NOT MERGE am: 9bc56553dd -s ours am: 63405d5d1c -s ours | Bill Yi | 2017-10-20 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Import translations. DO NOT MERGE am: 9bc56553dd -s ours | Bill Yi | 2017-10-20 | 0 | -0/+0 |
| |\| | | | | |
| | |_|_|_|_|/
| |/| | | | | |
|
| | * | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-10-20 | 0 | -0/+0 |
| | |\| | | | |
|
| | | * | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-10-20 | 4 | -9/+9 |
* | | | | | | | Merge "rotate_logs: Clean up the header includes." am: 30ec005104 am: c8eba4a036 am: 41763a5dbb | Tao Bao | 2017-10-18 | 2 | -78/+64 |
|\| | | | | | |
|
| * | | | | | | Merge "rotate_logs: Clean up the header includes." am: 30ec005104 am: c8eba4a036 | Tao Bao | 2017-10-18 | 2 | -78/+64 |
| |\| | | | | |
|
| | * | | | | | Merge "rotate_logs: Clean up the header includes." am: 30ec005104 | Tao Bao | 2017-10-18 | 2 | -78/+64 |
| | |\| | | | |
|
| | | * | | | | Merge "rotate_logs: Clean up the header includes." | Tao Bao | 2017-10-18 | 2 | -78/+64 |
| | | |\| | | |
|
| | | | * | | | Merge "rotate_logs: Clean up the header includes." | Tao Bao | 2017-10-18 | 2 | -78/+64 |
| | | | |\ \ \ |
|
| | | | | * | | | rotate_logs: Clean up the header includes. | Tao Bao | 2017-10-18 | 2 | -78/+64 |
| | | | |/ / / |
|
* | | | | | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8 am: f63dbde3ef am: 6f4f528419 | Tao Bao | 2017-10-17 | 6 | -151/+220 |
|\| | | | | | |
|
| * | | | | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8 am: f63dbde3ef | Tao Bao | 2017-10-17 | 6 | -151/+220 |
| |\| | | | | |
|
| | * | | | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8 | Tao Bao | 2017-10-17 | 6 | -151/+220 |
| | |\| | | | |
|
| | | * | | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp." | Tao Bao | 2017-10-17 | 6 | -151/+220 |
| | | |\| | | |
|
| | | | * | | | Merge "otautil: Move RangeSet implementation into rangeset.cpp." | Tao Bao | 2017-10-17 | 6 | -151/+220 |
| | | | |\ \ \ |
|
| | | | | * | | | otautil: Move RangeSet implementation into rangeset.cpp. | Tao Bao | 2017-10-16 | 6 | -151/+220 |
| | | | |/ / / |
|
* | | | | | | | Merge "Fix owner email address." am: b4a8c6abd9 am: 97d9ae086a am: bb971cce89 | Chih-hung Hsieh | 2017-10-12 | 1 | -1/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "Fix owner email address." am: b4a8c6abd9 am: 97d9ae086a | Chih-hung Hsieh | 2017-10-12 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "Fix owner email address." am: b4a8c6abd9 | Chih-hung Hsieh | 2017-10-12 | 1 | -1/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "Fix owner email address." | Chih-hung Hsieh | 2017-10-12 | 1 | -1/+1 |
| | | |\| | | |
|
| | | | * | | | Merge "Fix owner email address." | Chih-hung Hsieh | 2017-10-12 | 1 | -1/+1 |
| | | | |\ \ \ |
|
| | | | | * | | | Fix owner email address. | Chih-Hung Hsieh | 2017-10-12 | 1 | -1/+1 |
| | | | |/ / / |
|
* | | | | | | | Merge "applypatch: Move to Soong." am: b058c5c481 am: 7722d8255c am: cc11f66cfd | Tao Bao | 2017-10-12 | 4 | -197/+196 |
|\| | | | | | |
|
| * | | | | | | Merge "applypatch: Move to Soong." am: b058c5c481 am: 7722d8255c | Tao Bao | 2017-10-12 | 4 | -197/+196 |
| |\| | | | | |
|
| | * | | | | | Merge "applypatch: Move to Soong." am: b058c5c481 | Tao Bao | 2017-10-12 | 4 | -197/+196 |
| | |\| | | | |
|
| | | * | | | | Merge "applypatch: Move to Soong." | Tao Bao | 2017-10-12 | 4 | -197/+196 |
| | | |\| | | |
|
| | | | * | | | Merge "applypatch: Move to Soong." | Tao Bao | 2017-10-12 | 4 | -197/+196 |
| | | | |\ \ \ |
|
| | | | | * | | | applypatch: Move to Soong. | Tao Bao | 2017-10-12 | 4 | -197/+196 |
* | | | | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff am: 92964b3b94 am: a7b8be564a | Tao Bao | 2017-10-12 | 2 | -39/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff am: 92964b3b94 | Tao Bao | 2017-10-12 | 2 | -39/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff | Tao Bao | 2017-10-12 | 2 | -39/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." | Tao Bao | 2017-10-12 | 2 | -39/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." | Tao Bao | 2017-10-12 | 2 | -39/+0 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | applypatch: Remove the Makefile for building imgdiff in Chrome OS. | Tao Bao | 2017-10-12 | 2 | -39/+0 |
* | | | | | | | | | Merge "Drop -Wno-unused-parameter." am: a0e9742796 am: 6cadc73dea am: 44ddef71dc | Tao Bao | 2017-10-12 | 10 | -49/+62 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Drop -Wno-unused-parameter." am: a0e9742796 am: 6cadc73dea | Tao Bao | 2017-10-12 | 10 | -49/+62 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Drop -Wno-unused-parameter." am: a0e9742796 | Tao Bao | 2017-10-12 | 10 | -49/+62 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Drop -Wno-unused-parameter." | Tao Bao | 2017-10-12 | 10 | -49/+62 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Drop -Wno-unused-parameter." | Tao Bao | 2017-10-12 | 10 | -49/+62 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Drop -Wno-unused-parameter. | Tao Bao | 2017-10-12 | 10 | -49/+62 |
* | | | | | | | | | | Merge "Add missing includes." am: 3c4e270123 am: b23cfd43da am: 57caa90f74 | Dan Albert | 2017-10-12 | 1 | -0/+1 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Add missing includes." am: 3c4e270123 am: b23cfd43da | Dan Albert | 2017-10-12 | 1 | -0/+1 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Add missing includes." am: 3c4e270123 | Dan Albert | 2017-10-12 | 1 | -0/+1 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Add missing includes." | Dan Albert | 2017-10-12 | 1 | -0/+1 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Add missing includes." | Treehugger Robot | 2017-10-12 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | | * | | | | | Add missing includes. | Dan Albert | 2017-10-11 | 1 | -0/+1 |
* | | | | | | | | | | Merge "otafault: Add the missing #include <string>." am: 489155c44b am: 9e232f9f2a am: a27f973999 | Tao Bao | 2017-10-12 | 1 | -0/+1 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "otafault: Add the missing #include <string>." am: 489155c44b am: 9e232f9f2a | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "otafault: Add the missing #include <string>." am: 489155c44b | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "otafault: Add the missing #include <string>." | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "otafault: Add the missing #include <string>." | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | otafault: Add the missing #include <string>. | Tao Bao | 2017-10-11 | 1 | -0/+1 |
* | | | | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." am: 1bf842471c am: 7861ec16a0 am: a2fb941a32 | Tao Bao | 2017-10-12 | 1 | -0/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." am: 1bf842471c am: 7861ec16a0 | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." am: 1bf842471c | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \
| | | | | |_|_|_|/ / /
| | | | |/| | | | | | |
|
| | | | | * | | | | | | otautil: #include <errno.h> for TEMP_FAILURE_RETRY. | Tao Bao | 2017-10-11 | 1 | -0/+1 |
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
* | | | | | | | | | | Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7e am: 491880ed2f am: e353274491 | Tao Bao | 2017-10-12 | 1 | -2/+2 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7e am: 491880ed2f | Tao Bao | 2017-10-11 | 1 | -2/+2 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7e | Tao Bao | 2017-10-11 | 1 | -2/+2 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "applypatch: Use shared lib for libbz." | Tao Bao | 2017-10-11 | 1 | -2/+2 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "applypatch: Use shared lib for libbz." | Tao Bao | 2017-10-11 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | | * | | | | | applypatch: Use shared lib for libbz. | Tao Bao | 2017-10-11 | 1 | -2/+2 |
| | | | |/ / / / / |
|
* | | | | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604 am: a3e032c549 am: 9bfdc55472 | Tao Bao | 2017-10-11 | 1 | -5/+3 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604 am: a3e032c549 | Tao Bao | 2017-10-11 | 1 | -5/+3 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604 | Tao Bao | 2017-10-11 | 1 | -5/+3 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." | Tao Bao | 2017-10-11 | 1 | -5/+3 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." | Tao Bao | 2017-10-11 | 1 | -5/+3 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive. | Tao Bao | 2017-10-11 | 1 | -6/+3 |
| | | | | | |/ / /
| | | | | |/| | | |
|
* | | | | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2 am: 28f6938862 am: 684f239b4b | Tao Bao | 2017-10-11 | 15 | -40/+42 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2 am: 28f6938862 | Tao Bao | 2017-10-11 | 15 | -40/+42 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2 | Tao Bao | 2017-10-11 | 15 | -40/+42 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Move rangeset.h and print_sha1.h into otautil." | Tao Bao | 2017-10-11 | 15 | -40/+42 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Move rangeset.h and print_sha1.h into otautil." | Tao Bao | 2017-10-11 | 15 | -40/+42 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | Move rangeset.h and print_sha1.h into otautil. | Tao Bao | 2017-10-11 | 15 | -40/+42 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "otautil: Fix mac build." am: eb8a064066 am: bc131ef1bd am: 814f05d853 | Tao Bao | 2017-10-10 | 2 | -3/+4 |
|\| | | | | | | |
|
| * | | | | | | | Merge "otautil: Fix mac build." am: eb8a064066 am: bc131ef1bd | Tao Bao | 2017-10-10 | 2 | -3/+4 |
| |\| | | | | | |
|
| | * | | | | | | Merge "otautil: Fix mac build." am: eb8a064066 | Tao Bao | 2017-10-10 | 2 | -3/+4 |
| | |\| | | | | |
|
| | | * | | | | | Merge "otautil: Fix mac build." | Tao Bao | 2017-10-10 | 2 | -3/+4 |
| | | |\| | | | |
|
| | | | * | | | | Merge "otautil: Fix mac build." | Tao Bao | 2017-10-10 | 2 | -3/+4 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | otautil: Fix mac build. | Tao Bao | 2017-10-10 | 2 | -3/+4 |
| | | | |/ / / / |
|
* | | | | | | | | Merge changes from topic "libedify-header" am: abade5af15 am: 28e8a2c43a am: eaf3e895fe | Tao Bao | 2017-10-10 | 19 | -67/+64 |
|\| | | | | | | |
|
| * | | | | | | | Merge changes from topic "libedify-header" am: abade5af15 am: 28e8a2c43a | Tao Bao | 2017-10-10 | 19 | -67/+64 |
| |\| | | | | | |
|
| | * | | | | | | Merge changes from topic "libedify-header" am: abade5af15 | Tao Bao | 2017-10-10 | 19 | -67/+64 |
| | |\| | | | | |
|
| | | * | | | | | Merge changes from topic "libedify-header" | Tao Bao | 2017-10-10 | 19 | -67/+64 |
| | | |\| | | | |
|
| | | | * | | | | Merge changes from topic "libedify-header" | Tao Bao | 2017-10-10 | 19 | -67/+64 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | edify: Export the header and move to Soong. | Tao Bao | 2017-10-09 | 9 | -57/+50 |
| | | | | * | | | Revert "Revert "Move error_code.h into otautil."" | Tao Bao | 2017-10-09 | 14 | -13/+17 |
| | | | |/ / / |
|
* | | | | | | | Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e am: b7c0ce4201 am: b53d8c6062 | Tao Bao | 2017-10-10 | 5 | -2/+24 |
|\| | | | | | |
|
| * | | | | | | Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e am: b7c0ce4201 | Tao Bao | 2017-10-09 | 5 | -2/+24 |
| |\| | | | | |
|
| | * | | | | | Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e | Tao Bao | 2017-10-09 | 5 | -2/+24 |
| | |\| | | | |
|
| | | * | | | | Merge "applypatch: Forward declare struct Value." | Tao Bao | 2017-10-09 | 5 | -2/+24 |
| | | |\| | | |
|
| | | | * | | | Merge "applypatch: Forward declare struct Value." | Tao Bao | 2017-10-09 | 5 | -2/+24 |
| | | | |\ \ \ |
|
| | | | | * | | | applypatch: Forward declare struct Value. | Tao Bao | 2017-10-09 | 5 | -2/+24 |
| | | | |/ / / |
|
* | | | | | | | Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1 am: e196918f54 am: 3bc65953ab | Tao Bao | 2017-10-06 | 4 | -26/+28 |
|\| | | | | | |
|
| * | | | | | | Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1 am: e196918f54 | Tao Bao | 2017-10-06 | 4 | -26/+28 |
| |\| | | | | |
|
| | * | | | | | Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1 | Tao Bao | 2017-10-06 | 4 | -26/+28 |
| | |\| | | | |
|
| | | * | | | | Merge "Don't include "error_code.h" in edify/expr.h." | Tao Bao | 2017-10-06 | 4 | -26/+28 |
| | | |\| | | |
|
| | | | * | | | Merge "Don't include "error_code.h" in edify/expr.h." | Tao Bao | 2017-10-06 | 4 | -26/+28 |
| | | | |\ \ \ |
|
| | | | | * | | | Don't include "error_code.h" in edify/expr.h. | Tao Bao | 2017-10-05 | 4 | -26/+28 |
* | | | | | | | | Merge "vr_ui: drawing changes" am: 9a874a4e5f am: 3b3f2f5711 am: 0a5e39f180 | Tao Bao | 2017-10-06 | 4 | -30/+97 |
|\| | | | | | | |
|
| * | | | | | | | Merge "vr_ui: drawing changes" am: 9a874a4e5f am: 3b3f2f5711 | Tao Bao | 2017-10-06 | 4 | -30/+97 |
| |\| | | | | | |
|
| | * | | | | | | Merge "vr_ui: drawing changes" am: 9a874a4e5f | Tao Bao | 2017-10-06 | 4 | -30/+97 |
| | |\| | | | | |
|
| | | * | | | | | Merge "vr_ui: drawing changes" | Tao Bao | 2017-10-06 | 4 | -30/+97 |
| | | |\| | | | |
|
| | | | * | | | | Merge "vr_ui: drawing changes" | Tao Bao | 2017-10-06 | 4 | -30/+97 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | vr_ui: drawing changes | Luke Song | 2017-10-05 | 4 | -30/+97 |
| | | | |/ / / |
|
* | | | | | | | Merge "graphics: add rotation logic" am: 9baa19012a am: 284df0abcd am: ab19506094 | Tao Bao | 2017-10-05 | 3 | -221/+280 |
|\| | | | | | |
|
| * | | | | | | Merge "graphics: add rotation logic" am: 9baa19012a am: 284df0abcd | Tao Bao | 2017-10-05 | 3 | -221/+280 |
| |\| | | | | |
|
| | * | | | | | Merge "graphics: add rotation logic" am: 9baa19012a | Tao Bao | 2017-10-05 | 3 | -221/+280 |
| | |\| | | | |
|
| | | * | | | | Merge "graphics: add rotation logic" | Tao Bao | 2017-10-05 | 3 | -221/+280 |
| | | |\| | | |
|
| | | | * | | | Merge "graphics: add rotation logic" | Tao Bao | 2017-10-05 | 3 | -221/+280 |
| | | | |\ \ \ |
|
| | | | | * | | | graphics: add rotation logic | Luke Song | 2017-09-28 | 3 | -221/+280 |
* | | | | | | | | Merge "Revert "Move error_code.h into otautil."" am: b23d29642d am: b87edb00dc am: 4f63cc5e09 | Tao Bao | 2017-10-05 | 12 | -19/+11 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Revert "Move error_code.h into otautil."" am: b23d29642d am: b87edb00dc | Tao Bao | 2017-10-05 | 12 | -19/+11 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Revert "Move error_code.h into otautil."" am: b23d29642d | Tao Bao | 2017-10-05 | 12 | -19/+11 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Revert "Move error_code.h into otautil."" | Tao Bao | 2017-10-05 | 12 | -19/+11 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Revert "Move error_code.h into otautil."" | Tao Bao | 2017-10-05 | 12 | -19/+11 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Revert "Move error_code.h into otautil." | Tao Bao | 2017-10-05 | 12 | -19/+11 |
* | | | | | | | | | Merge "Move error_code.h into otautil." am: 916e155bab am: 73831e0636 am: 63876d765a | Tao Bao | 2017-10-05 | 12 | -11/+19 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Move error_code.h into otautil." am: 916e155bab am: 73831e0636 | Tao Bao | 2017-10-05 | 12 | -11/+19 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Move error_code.h into otautil." am: 916e155bab | Tao Bao | 2017-10-05 | 12 | -11/+19 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Move error_code.h into otautil." | Tao Bao | 2017-10-05 | 12 | -11/+19 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Move error_code.h into otautil." | Tao Bao | 2017-10-05 | 12 | -11/+19 |
| | | | |\| | | | |
|
| | | | | * | | | | Move error_code.h into otautil. | Tao Bao | 2017-10-04 | 12 | -11/+19 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "edify: Remove edify_parser." am: 281d4eefb1 am: dfbe70b79d am: 159db1dd49 | Tao Bao | 2017-10-04 | 2 | -99/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "edify: Remove edify_parser." am: 281d4eefb1 am: dfbe70b79d | Tao Bao | 2017-10-04 | 2 | -99/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "edify: Remove edify_parser." am: 281d4eefb1 | Tao Bao | 2017-10-04 | 2 | -99/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "edify: Remove edify_parser." | Tao Bao | 2017-10-04 | 2 | -99/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "edify: Remove edify_parser." | Tao Bao | 2017-10-04 | 2 | -99/+0 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | edify: Remove edify_parser. | Tao Bao | 2017-10-03 | 2 | -99/+0 |
* | | | | | | | | Merge "otautil: Export headers." am: 2cedab7af9 am: b50d7cf9c9 am: d284e36fc6 | Tao Bao | 2017-10-04 | 8 | -4/+9 |
|\| | | | | | | |
|
| * | | | | | | | Merge "otautil: Export headers." am: 2cedab7af9 am: b50d7cf9c9 | Tao Bao | 2017-10-04 | 8 | -4/+9 |
| |\| | | | | | |
|
| | * | | | | | | Merge "otautil: Export headers." am: 2cedab7af9 | Tao Bao | 2017-10-04 | 8 | -4/+9 |
| | |\| | | | | |
|
| | | * | | | | | Merge "otautil: Export headers." | Tao Bao | 2017-10-04 | 8 | -4/+9 |
| | | |\| | | | |
|
| | | | * | | | | Merge "otautil: Export headers." | Treehugger Robot | 2017-10-04 | 8 | -4/+9 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | otautil: Export headers. | Tao Bao | 2017-10-03 | 8 | -4/+9 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "screen_ui: stage marker positioning" am: 16817312a6 am: c6e12b5f43 am: dca0a20063 | Luke Song | 2017-10-04 | 1 | -1/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "screen_ui: stage marker positioning" am: 16817312a6 am: c6e12b5f43 | Luke Song | 2017-10-04 | 1 | -1/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "screen_ui: stage marker positioning" am: 16817312a6 | Luke Song | 2017-10-04 | 1 | -1/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "screen_ui: stage marker positioning" | Luke Song | 2017-10-04 | 1 | -1/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "screen_ui: stage marker positioning" | Treehugger Robot | 2017-10-04 | 1 | -1/+1 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | screen_ui: stage marker positioning | Luke Song | 2017-09-29 | 1 | -1/+1 |
| | | | | |/ / |
|
* | | | | | | | Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264 am: 8b8c7eb442 am: 24801a3438 | Tao Bao | 2017-10-02 | 4 | -5/+11 |
|\| | | | | | |
|
| * | | | | | | Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264 am: 8b8c7eb442 | Tao Bao | 2017-10-02 | 4 | -5/+11 |
| |\| | | | | |
|
| | * | | | | | Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264 | Tao Bao | 2017-10-02 | 4 | -5/+11 |
| | |\| | | | |
|
| | | * | | | | Merge "roots: Fix an issue with volume_for_path()." | Tao Bao | 2017-10-02 | 4 | -5/+11 |
| | | |\| | | |
|
| | | | * | | | Merge "roots: Fix an issue with volume_for_path()." | Tao Bao | 2017-10-02 | 4 | -5/+11 |
| | | | |\ \ \ |
|
| | | | | * | | | roots: Fix an issue with volume_for_path(). | Tao Bao | 2017-10-02 | 4 | -5/+11 |
* | | | | | | | | Merge "Use -Werror in bootable/recovery" am: 88aa128e22 am: b5437e3e1b am: e4be0899b2 | Chih-Hung Hsieh | 2017-10-02 | 1 | -1/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Use -Werror in bootable/recovery" am: 88aa128e22 am: b5437e3e1b | Chih-Hung Hsieh | 2017-10-02 | 1 | -1/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Use -Werror in bootable/recovery" am: 88aa128e22 | Chih-Hung Hsieh | 2017-10-02 | 1 | -1/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Use -Werror in bootable/recovery" | Chih-Hung Hsieh | 2017-10-02 | 1 | -1/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Use -Werror in bootable/recovery" | Treehugger Robot | 2017-10-02 | 1 | -1/+1 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | Use -Werror in bootable/recovery | Chih-Hung Hsieh | 2017-10-02 | 1 | -1/+1 |
* | | | | | | | | Merge "roots: Remove #include "common.h"." am: e8ee697364 am: 0fa08924c6 am: 61ec157f7d | Tao Bao | 2017-10-02 | 1 | -2/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "roots: Remove #include "common.h"." am: e8ee697364 am: 0fa08924c6 | Tao Bao | 2017-10-02 | 1 | -2/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "roots: Remove #include "common.h"." am: e8ee697364 | Tao Bao | 2017-10-02 | 1 | -2/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "roots: Remove #include "common.h"." | Tao Bao | 2017-10-02 | 1 | -2/+2 |
| | | |\| | | | |
|
| | | | * | | | | Merge "roots: Remove #include "common.h"." | Tao Bao | 2017-10-02 | 1 | -2/+2 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | roots: Remove #include "common.h". | Tao Bao | 2017-09-29 | 1 | -2/+2 |
* | | | | | | | | | Merge "otafault: Move to soong." am: 475794a9af am: 2812e5d16b am: 3af1827bb5 | Tao Bao | 2017-09-30 | 4 | -54/+61 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "otafault: Move to soong." am: 475794a9af am: 2812e5d16b | Tao Bao | 2017-09-30 | 4 | -54/+61 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "otafault: Move to soong." am: 475794a9af | Tao Bao | 2017-09-29 | 4 | -54/+61 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "otafault: Move to soong." | Tao Bao | 2017-09-29 | 4 | -54/+61 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "otafault: Move to soong." | Tao Bao | 2017-09-29 | 4 | -54/+61 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | otafault: Move to soong. | Tao Bao | 2017-09-29 | 4 | -54/+61 |
* | | | | | | | | | | Merge "otafault: Move headers under otafault/." am: 4289deaf82 am: 0018b93b27 am: 540c16307a | Tao Bao | 2017-09-30 | 10 | -14/+15 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "otafault: Move headers under otafault/." am: 4289deaf82 am: 0018b93b27 | Tao Bao | 2017-09-30 | 10 | -14/+15 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "otafault: Move headers under otafault/." am: 4289deaf82 | Tao Bao | 2017-09-29 | 10 | -14/+15 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "otafault: Move headers under otafault/." | Tao Bao | 2017-09-29 | 10 | -14/+15 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "otafault: Move headers under otafault/." | Tao Bao | 2017-09-29 | 10 | -14/+15 |
| | | | |\| | | | |
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | otafault: Move headers under otafault/. | Tao Bao | 2017-09-29 | 10 | -14/+15 |
* | | | | | | | | | Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416 am: 408ee90b58 | Tianjie Xu | 2017-09-30 | 1 | -286/+279 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416 | Tianjie Xu | 2017-09-30 | 1 | -286/+279 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 | Tianjie Xu | 2017-09-29 | 1 | -286/+279 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Move the png open and destroy functions into a class" | Tianjie Xu | 2017-09-29 | 1 | -286/+279 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Move the png open and destroy functions into a class" | Tianjie Xu | 2017-09-29 | 1 | -286/+279 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | Move the png open and destroy functions into a class | Tianjie Xu | 2017-09-29 | 1 | -286/+279 |
* | | | | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e am: 8277230a98 am: d76a2e4c14 | Tao Bao | 2017-09-29 | 3 | -4/+6 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e am: 8277230a98 | Tao Bao | 2017-09-29 | 3 | -4/+6 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e | Tao Bao | 2017-09-29 | 3 | -4/+6 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." | Tao Bao | 2017-09-29 | 3 | -4/+6 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." | Tao Bao | 2017-09-29 | 3 | -4/+6 |
| | | | |\ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES. | Tao Bao | 2017-09-29 | 3 | -4/+6 |
* | | | | | | | | | Merge "otafault: Clean up header inclusion." am: d9373cf621 am: ffc171c56d am: f541841037 | Tao Bao | 2017-09-29 | 6 | -20/+18 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "otafault: Clean up header inclusion." am: d9373cf621 am: ffc171c56d | Tao Bao | 2017-09-29 | 6 | -20/+18 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "otafault: Clean up header inclusion." am: d9373cf621 | Tao Bao | 2017-09-29 | 6 | -20/+18 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "otafault: Clean up header inclusion." | Tao Bao | 2017-09-29 | 6 | -20/+18 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "otafault: Clean up header inclusion." | Tao Bao | 2017-09-29 | 6 | -20/+18 |
| | | | |\| | | | |
|
| | | | | * | | | | otafault: Clean up header inclusion. | Tao Bao | 2017-09-29 | 6 | -20/+18 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "Integer overflow observed while formatting volume" am: 846f307c6f am: 4a20e8b68f am: 5f9defe3f2 | Abhishek Arpure | 2017-09-29 | 1 | -5/+12 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Integer overflow observed while formatting volume" am: 846f307c6f am: 4a20e8b68f | Abhishek Arpure | 2017-09-29 | 1 | -5/+12 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Integer overflow observed while formatting volume" am: 846f307c6f | Abhishek Arpure | 2017-09-29 | 1 | -5/+12 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Integer overflow observed while formatting volume" | Abhishek Arpure | 2017-09-29 | 1 | -5/+12 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Integer overflow observed while formatting volume" | Treehugger Robot | 2017-09-29 | 1 | -5/+12 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | Integer overflow observed while formatting volume | Abhishek Arpure | 2017-09-12 | 1 | -5/+12 |
* | | | | | | | | Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655 am: fdbe272dc0 am: 3421fa1815 | Tao Bao | 2017-09-29 | 1 | -1/+20 |
|\| | | | | | | |
|
| * | | | | | | | Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655 am: fdbe272dc0 | Tao Bao | 2017-09-29 | 1 | -1/+20 |
| |\| | | | | | |
|
| | * | | | | | | Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655 | Tao Bao | 2017-09-29 | 1 | -1/+20 |
| | |\| | | | | |
|
| | | * | | | | | Merge "roots: volume_for_path() parses and tries prefixes." | Tao Bao | 2017-09-29 | 1 | -1/+20 |
| | | |\| | | | |
|
| | | | * | | | | Merge "roots: volume_for_path() parses and tries prefixes." | Tao Bao | 2017-09-28 | 1 | -1/+20 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | roots: volume_for_path() parses and tries prefixes. | Tao Bao | 2017-09-27 | 1 | -1/+20 |
| | | | |/ / / |
|
* | | | | | | | Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca am: 8874d3c309 am: 5e969aa10d | Tianjie Xu | 2017-09-27 | 7 | -21/+153 |
|\| | | | | | |
|
| * | | | | | | Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca am: 8874d3c309 | Tianjie Xu | 2017-09-27 | 7 | -21/+153 |
| |\| | | | | |
|
| | * | | | | | Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca | Tianjie Xu | 2017-09-27 | 7 | -21/+153 |
| | |\| | | | |
|
| | | * | | | | Merge "Add a new option in recovery menu to test the background texts" | Tianjie Xu | 2017-09-27 | 7 | -21/+153 |
| | | |\| | | |
|
| | | | * | | | Merge "Add a new option in recovery menu to test the background texts" | Tianjie Xu | 2017-09-27 | 7 | -21/+153 |
| | | | |\ \ \ |
|
| | | | | * | | | Add a new option in recovery menu to test the background texts | Tianjie Xu | 2017-09-27 | 7 | -21/+153 |
| | | | |/ / / |
|
* | | | | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac am: fccf3bc0cf am: 88fd6aff38 | Tao Bao | 2017-09-27 | 1 | -1/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac am: fccf3bc0cf | Tao Bao | 2017-09-27 | 1 | -1/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac | Tao Bao | 2017-09-27 | 1 | -1/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter." | Tao Bao | 2017-09-27 | 1 | -1/+0 |
| | | |\| | | |
|
| | | | * | | | Merge "clang-format: Remove the override of PenaltyExcessCharacter." | Tao Bao | 2017-09-27 | 1 | -1/+0 |
| | | | |\ \ \ |
|
| | | | | * | | | clang-format: Remove the override of PenaltyExcessCharacter. | Tao Bao | 2017-09-27 | 1 | -1/+0 |
* | | | | | | | | Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841 am: eb5e194012 am: 448af2aa77 | Tianjie Xu | 2017-09-27 | 3 | -69/+174 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841 am: eb5e194012 | Tianjie Xu | 2017-09-27 | 3 | -69/+174 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841 | Tianjie Xu | 2017-09-27 | 3 | -69/+174 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Output split information for imgdiff when handling large apks" | Tianjie Xu | 2017-09-27 | 3 | -69/+174 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Output split information for imgdiff when handling large apks" | Tianjie Xu | 2017-09-27 | 3 | -69/+174 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Output split information for imgdiff when handling large apks | Tianjie Xu | 2017-09-21 | 3 | -69/+174 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "update the recovery background image with new translation" am: c0123e0c3a am: 6a5204ac8d am: 9425dba5b3 | Tianjie Xu | 2017-09-22 | 25 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "update the recovery background image with new translation" am: c0123e0c3a am: 6a5204ac8d | Tianjie Xu | 2017-09-22 | 25 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "update the recovery background image with new translation" am: c0123e0c3a | Tianjie Xu | 2017-09-22 | 25 | -0/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "update the recovery background image with new translation" | Tianjie Xu | 2017-09-22 | 25 | -0/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "update the recovery background image with new translation" | Tianjie Xu | 2017-09-22 | 25 | -0/+0 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | update the recovery background image with new translation | Tianjie Xu | 2017-09-20 | 25 | -0/+0 |
| | | | |/ / / |
|
* | | | | | | | Merge "recovery: reduce overall boot time" am: a815d3fb59 am: 9da4179ee6 am: 4b8bbb95ab | Mark Salyzyn | 2017-09-19 | 2 | -2/+2 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: reduce overall boot time" am: a815d3fb59 am: 9da4179ee6 | Mark Salyzyn | 2017-09-19 | 2 | -2/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: reduce overall boot time" am: a815d3fb59 | Mark Salyzyn | 2017-09-19 | 2 | -2/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: reduce overall boot time" | Mark Salyzyn | 2017-09-19 | 2 | -2/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: reduce overall boot time" | Treehugger Robot | 2017-09-19 | 2 | -2/+2 |
| | | | |\ \ \ |
|
| | | | | * | | | recovery: reduce overall boot time | Mark Salyzyn | 2017-09-18 | 2 | -2/+2 |
| | | | |/ / / |
|
* | | | | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307 am: 2cb1fb45c0 am: ed50c1817f | Tianjie Xu | 2017-09-17 | 1 | -6/+9 |
|\| | | | | | |
|
| * | | | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307 am: 2cb1fb45c0 | Tianjie Xu | 2017-09-17 | 1 | -6/+9 |
| |\| | | | | |
|
| | * | | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307 | Tianjie Xu | 2017-09-17 | 1 | -6/+9 |
| | |\| | | | |
|
| | | * | | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff" | Tianjie Xu | 2017-09-17 | 1 | -6/+9 |
| | | |\| | | |
|
| | | | * | | | Merge "Fix the dangling pointer when setting up arguments of imgdiff" | Tianjie Xu | 2017-09-17 | 1 | -6/+9 |
| | | | |\ \ \ |
|
| | | | | * | | | Fix the dangling pointer when setting up arguments of imgdiff | Tianjie Xu | 2017-09-13 | 1 | -6/+9 |
* | | | | | | | | Import translations. DO NOT MERGE am: c9b0416842 -s ours | Bill Yi | 2017-09-16 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-09-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | * | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-09-16 | 1 | -3/+3 |
* | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b am: ad878d5494 am: 34e7d45fb3 | Tao Bao | 2017-09-14 | 3 | -4/+9 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b am: ad878d5494 | Tao Bao | 2017-09-14 | 3 | -4/+9 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b | Tao Bao | 2017-09-13 | 3 | -4/+9 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Remove EXPAND/STRINGIFY macros." | Tao Bao | 2017-09-13 | 3 | -4/+9 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "Remove EXPAND/STRINGIFY macros." | Tao Bao | 2017-09-13 | 3 | -4/+9 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | Remove EXPAND/STRINGIFY macros. | Tao Bao | 2017-09-13 | 3 | -4/+9 |
| | | | |/ / / |
|
* | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-09-13 | 1 | -2/+2 |
* | | | | | | | Merge "Close cmd_pipe properly after updater test finishes" am: 64307daf5b am: a11601da9b am: d83c0a8715 | Tianjie Xu | 2017-09-12 | 1 | -8/+14 |
|\| | | | | | |
|
| * | | | | | | Merge "Close cmd_pipe properly after updater test finishes" am: 64307daf5b am: a11601da9b | Tianjie Xu | 2017-09-12 | 1 | -8/+14 |
| |\| | | | | |
|
| | * | | | | | Merge "Close cmd_pipe properly after updater test finishes" am: 64307daf5b | Tianjie Xu | 2017-09-12 | 1 | -8/+14 |
| | |\| | | | |
|
| | | * | | | | Merge "Close cmd_pipe properly after updater test finishes" | Tianjie Xu | 2017-09-12 | 1 | -8/+14 |
| | | |\| | | |
|
| | | | * | | | Merge "Close cmd_pipe properly after updater test finishes" | Tianjie Xu | 2017-09-12 | 1 | -8/+14 |
| | | | |\ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | * | | Close cmd_pipe properly after updater test finishes | Tianjie Xu | 2017-09-11 | 1 | -8/+14 |
* | | | | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class." am: fc570c317b am: 166188c2c6 am: 547d5fd559 | Tao Bao | 2017-09-12 | 4 | -35/+38 |
|\| | | | | | |
|
| * | | | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class." am: fc570c317b am: 166188c2c6 | Tao Bao | 2017-09-12 | 4 | -35/+38 |
| |\| | | | | |
|
| | * | | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class." am: fc570c317b | Tao Bao | 2017-09-12 | 4 | -35/+38 |
| | |\| | | | |
|
| | | * | | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class." | Tao Bao | 2017-09-11 | 4 | -35/+38 |
| | | |\| | | |
|
| | | | * | | | Merge "ui: Move locale and friends into ScreenRecoveryUI class." | Tao Bao | 2017-09-11 | 4 | -35/+38 |
| | | | |\ \ \ |
|
| | | | | * | | | ui: Move locale and friends into ScreenRecoveryUI class. | Tao Bao | 2017-09-11 | 4 | -35/+38 |
| | | | |/ / / |
|
* | | | | | | | Merge "ui: Remove text_top_." am: 568644197f am: d96ce15139 am: cce9b2c96a | Tao Bao | 2017-09-11 | 3 | -12/+4 |
|\| | | | | | |
|
| * | | | | | | Merge "ui: Remove text_top_." am: 568644197f am: d96ce15139 | Tao Bao | 2017-09-11 | 3 | -12/+4 |
| |\| | | | | |
|
| | * | | | | | Merge "ui: Remove text_top_." am: 568644197f | Tao Bao | 2017-09-11 | 3 | -12/+4 |
| | |\| | | | |
|
| | | * | | | | Merge "ui: Remove text_top_." | Tao Bao | 2017-09-11 | 3 | -12/+4 |
| | | |\| | | |
|
| | | | * | | | Merge "ui: Remove text_top_." | Tao Bao | 2017-09-11 | 3 | -12/+4 |
| | | | |\ \ \ |
|
| | | | | * | | | ui: Remove text_top_. | Tao Bao | 2017-09-09 | 3 | -12/+4 |
| | | | | |/ / |
|
* | | | | | | | Merge "ui: Refactor the declaration orders." am: 79a23b30d2 am: cb94b611cf am: bd9ef0ad1a | Tao Bao | 2017-09-11 | 3 | -76/+103 |
|\| | | | | | |
|
| * | | | | | | Merge "ui: Refactor the declaration orders." am: 79a23b30d2 am: cb94b611cf | Tao Bao | 2017-09-11 | 3 | -76/+103 |
| |\| | | | | |
|
| | * | | | | | Merge "ui: Refactor the declaration orders." am: 79a23b30d2 | Tao Bao | 2017-09-11 | 3 | -76/+103 |
| | |\| | | | |
|
| | | * | | | | Merge "ui: Refactor the declaration orders." | Tao Bao | 2017-09-11 | 3 | -76/+103 |
| | | |\| | | |
|
| | | | * | | | Merge "ui: Refactor the declaration orders." | Tao Bao | 2017-09-11 | 3 | -76/+103 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | ui: Refactor the declaration orders. | Tao Bao | 2017-09-10 | 3 | -76/+103 |
| | | | |/ / |
|
* | | | | | | ui: Manage menu_ with std::vector. am: 17fa5c7cab | Tao Bao | 2017-09-09 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | ui: Manage menu_ with std::vector. | Tao Bao | 2017-09-09 | 0 | -0/+0 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | ui: Manage menu_ with std::vector. | Tao Bao | 2017-09-09 | 3 | -17/+15 |
* | | | | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." am: fa4f014063 am: 5f5ccacef7 am: 53bb5ff137 | Tao Bao | 2017-09-09 | 2 | -122/+1 |
|\| | | | | |
|
| * | | | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." am: fa4f014063 am: 5f5ccacef7 | Tao Bao | 2017-09-08 | 2 | -122/+1 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." am: fa4f014063 | Tao Bao | 2017-09-08 | 2 | -122/+1 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." | Tao Bao | 2017-09-08 | 2 | -122/+1 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." | Tao Bao | 2017-09-08 | 2 | -122/+1 |
| | | | |\ \ |
|
| | | | | * | | wear_ui: Remove Print()/ShowFile()/PutChar(). | Tao Bao | 2017-09-08 | 2 | -122/+1 |
* | | | | | | | Merge "ui: Manage menu_ with std::vector." am: f51bb0f2d6 am: 4e3e42bed8 am: 77425c5e15 | Tao Bao | 2017-09-09 | 3 | -17/+15 |
|\| | | | | | |
|
| * | | | | | | Merge "ui: Manage menu_ with std::vector." am: f51bb0f2d6 am: 4e3e42bed8 | Tao Bao | 2017-09-08 | 3 | -17/+15 |
| |\| | | | | |
|
| | * | | | | | Merge "ui: Manage menu_ with std::vector." am: f51bb0f2d6 | Tao Bao | 2017-09-08 | 3 | -17/+15 |
| | |\| | | | |
|
| | | * | | | | Merge "ui: Manage menu_ with std::vector." | Tao Bao | 2017-09-08 | 3 | -17/+15 |
| | | |\| | | |
|
| | | | * | | | Merge "ui: Manage menu_ with std::vector." | Tao Bao | 2017-09-08 | 3 | -17/+15 |
| | | | |\ \ \ |
|
| | | | | * | | | ui: Manage menu_ with std::vector. | Tao Bao | 2017-09-08 | 3 | -17/+15 |
| | | | | |/ / |
|
* | | | | | | | Merge "Improve imgdiff for large zip files" am: 9f48641784 am: e24e90f403 am: b2dac70423 | Tianjie Xu | 2017-09-08 | 3 | -24/+814 |
|\| | | | | | |
|
| * | | | | | | Merge "Improve imgdiff for large zip files" am: 9f48641784 am: e24e90f403 | Tianjie Xu | 2017-09-08 | 3 | -24/+814 |
| |\| | | | | |
|
| | * | | | | | Merge "Improve imgdiff for large zip files" am: 9f48641784 | Tianjie Xu | 2017-09-08 | 3 | -24/+814 |
| | |\| | | | |
|
| | | * | | | | Merge "Improve imgdiff for large zip files" | Tianjie Xu | 2017-09-08 | 3 | -24/+814 |
| | | |\| | | |
|
| | | | * | | | Merge "Improve imgdiff for large zip files" | Tianjie Xu | 2017-09-08 | 3 | -24/+814 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Improve imgdiff for large zip files | Tianjie Xu | 2017-09-06 | 3 | -24/+814 |
* | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-09-06 | 1 | -1/+1 |
* | | | | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." am: 8c753f6253 am: 0cada4da99 am: 0f7d56fe81 | Tao Bao | 2017-09-02 | 2 | -36/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." am: 8c753f6253 am: 0cada4da99 | Tao Bao | 2017-09-02 | 2 | -36/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." am: 8c753f6253 | Tao Bao | 2017-09-02 | 2 | -36/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." | Tao Bao | 2017-09-02 | 2 | -36/+1 |
| | | |\| | | |
|
| | | | * | | | Merge "wear_ui: Remove PrintOnScreenOnly() and PrintV()." | Tao Bao | 2017-09-02 | 2 | -36/+1 |
| | | | |\ \ \ |
|
| | | | | * | | | wear_ui: Remove PrintOnScreenOnly() and PrintV(). | Tao Bao | 2017-09-01 | 2 | -36/+1 |
| | | | |/ / / |
|
* | | | | | | | Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 am: 3650e7c19b am: b457e24fac | Tao Bao | 2017-09-01 | 2 | -40/+8 |
|\| | | | | | |
|
| * | | | | | | Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 am: 3650e7c19b | Tao Bao | 2017-09-01 | 2 | -40/+8 |
| |\| | | | | |
|
| | * | | | | | Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 | Tao Bao | 2017-09-01 | 2 | -40/+8 |
| | |\| | | | |
|
| | | * | | | | Merge "wear_ui: Remove backgroundIcon." | Tao Bao | 2017-09-01 | 2 | -40/+8 |
| | | |\| | | |
|
| | | | * | | | Merge "wear_ui: Remove backgroundIcon." | Tao Bao | 2017-09-01 | 2 | -40/+8 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | wear_ui: Remove backgroundIcon. | Tao Bao | 2017-08-31 | 2 | -40/+8 |
* | | | | | | | Merge "Turn on -Wall for libedify" am: deb5de0bc1 am: 365059c61b am: 36983d8dd0 | Tianjie Xu | 2017-08-31 | 2 | -2/+4 |
|\| | | | | | |
|
| * | | | | | | Merge "Turn on -Wall for libedify" am: deb5de0bc1 am: 365059c61b | Tianjie Xu | 2017-08-31 | 2 | -2/+4 |
| |\| | | | | |
|
| | * | | | | | Merge "Turn on -Wall for libedify" am: deb5de0bc1 | Tianjie Xu | 2017-08-31 | 2 | -2/+4 |
| | |\| | | | |
|
| | | * | | | | Merge "Turn on -Wall for libedify" | Tianjie Xu | 2017-08-31 | 2 | -2/+4 |
| | | |\| | | |
|
| | | | * | | | Merge "Turn on -Wall for libedify" | Tianjie Xu | 2017-08-31 | 2 | -2/+4 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Turn on -Wall for libedify | Tianjie Xu | 2017-08-31 | 2 | -2/+4 |
| | | | |/ / |
|
* | | | | | | Import translations. DO NOT MERGE am: c16d222593 -s ours | Bill Yi | 2017-08-30 | 0 | -0/+0 |
|\| | | | | |
|
| * | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-30 | 0 | -0/+0 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-29 | 3 | -4/+4 |
* | | | | | | Merge "Import translations. DO NOT MERGE" | TreeHugger Robot | 2017-08-29 | 2 | -2/+2 |
|\ \ \ \ \ \ |
|
| * | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-27 | 2 | -2/+2 |
* | | | | | | | Merge "Turn on -Wall for recovery modules" am: 11f68b6b69 am: 44d0b008c6 am: 447da69c14 | Tianjie Xu | 2017-08-29 | 12 | -35/+34 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Merge "Turn on -Wall for recovery modules" am: 11f68b6b69 am: 44d0b008c6 | Tianjie Xu | 2017-08-29 | 12 | -35/+34 |
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | * | | | | | Merge "Turn on -Wall for recovery modules" am: 11f68b6b69 | Tianjie Xu | 2017-08-29 | 12 | -35/+34 |
| | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | | |
|
| | | * | | | | Merge "Turn on -Wall for recovery modules" | Tianjie Xu | 2017-08-29 | 12 | -35/+34 |
| | | |\ \ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | * | | | Merge "Turn on -Wall for recovery modules" | Tianjie Xu | 2017-08-29 | 12 | -35/+34 |
| | | | |\ \ \ |
|
| | | | | * | | | Turn on -Wall for recovery modules | Tianjie Xu | 2017-08-29 | 12 | -35/+34 |
* | | | | | | | | Merge "Add libasyncio." am: d179c923d8 am: d21fb1ece0 am: 4dc141e6ba | Jerry Zhang | 2017-08-29 | 1 | -0/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add libasyncio." am: d179c923d8 am: d21fb1ece0 | Jerry Zhang | 2017-08-29 | 1 | -0/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add libasyncio." am: d179c923d8 | Jerry Zhang | 2017-08-29 | 1 | -0/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add libasyncio." | Jerry Zhang | 2017-08-29 | 1 | -0/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Add libasyncio." | Treehugger Robot | 2017-08-29 | 1 | -0/+1 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | Add libasyncio. | Jerry Zhang | 2017-07-18 | 1 | -0/+1 |
* | | | | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0 am: d92baf5988 am: 35d36d1fa6 | Tao Bao | 2017-08-28 | 2 | -24/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0 am: d92baf5988 | Tao Bao | 2017-08-28 | 2 | -24/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0 | Tao Bao | 2017-08-28 | 2 | -24/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." | Tao Bao | 2017-08-28 | 2 | -24/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." | Tao Bao | 2017-08-28 | 2 | -24/+1 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_. | Tao Bao | 2017-08-26 | 2 | -24/+1 |
* | | | | | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f am: f351a576ce am: 813120749d | Tao Bao | 2017-08-28 | 2 | -9/+1 |
|\| | | | | | | |
| |_|_|_|_|_|/ /
|/| | | | | | | |
|
| * | | | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f am: f351a576ce | Tao Bao | 2017-08-28 | 2 | -9/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f | Tao Bao | 2017-08-28 | 2 | -9/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'." | Tao Bao | 2017-08-28 | 2 | -9/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "wear_ui: Remove dead 'self' and 'progress_t'." | Tao Bao | 2017-08-28 | 2 | -9/+1 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | wear_ui: Remove dead 'self' and 'progress_t'. | Tao Bao | 2017-08-26 | 2 | -9/+1 |
| | | | |/ / / |
|
* | | | | | | | Merge "Add missing report of error code under recovery" am: 571855b0e6 am: 736be2f93e am: f134f0e5c0 | Tianjie Xu | 2017-08-25 | 2 | -0/+6 |
|\| | | | | | |
|
| * | | | | | | Merge "Add missing report of error code under recovery" am: 571855b0e6 am: 736be2f93e | Tianjie Xu | 2017-08-25 | 2 | -0/+6 |
| |\| | | | | |
|
| | * | | | | | Merge "Add missing report of error code under recovery" am: 571855b0e6 | Tianjie Xu | 2017-08-25 | 2 | -0/+6 |
| | |\| | | | |
|
| | | * | | | | Merge "Add missing report of error code under recovery" | Tianjie Xu | 2017-08-25 | 2 | -0/+6 |
| | |/| | | |
| | | |/ / / |
|
| | | * | | | Merge "Add missing report of error code under recovery" | Tianjie Xu | 2017-08-25 | 2 | -0/+6 |
| | | |\ \ \ |
|
| | | | * | | | Add missing report of error code under recovery | Tianjie Xu | 2017-08-23 | 2 | -0/+6 |
* | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-24 | 2 | -2/+2 |
* | | | | | | | Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5 am: 968ebdeefd am: 7379a5290d | Tianjie Xu | 2017-08-23 | 2 | -18/+73 |
|\| | | | | | |
|
| * | | | | | | Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5 am: 968ebdeefd | Tianjie Xu | 2017-08-23 | 2 | -18/+73 |
| |\| | | | | |
|
| | * | | | | | Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5 | Tianjie Xu | 2017-08-23 | 2 | -18/+73 |
| | |\ \ \ \ \ |
|
| | | * \ \ \ \ | Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 | Tianjie Xu | 2017-08-23 | 2 | -18/+73 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Merge "Allow comparison against multi serial nums for A/B package" | Tianjie Xu | 2017-08-23 | 2 | -18/+73 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "Allow comparison against multi serial nums for A/B package" | Tianjie Xu | 2017-08-23 | 2 | -18/+73 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | Allow comparison against multi serial nums for A/B package | Tianjie Xu | 2017-08-22 | 2 | -18/+73 |
| | | | | | |/ / / |
|
* | | | | | | | | | Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2b am: cdc6fcaa47 am: 0d0b6a0d2a | Tao Bao | 2017-08-22 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2b am: cdc6fcaa47 | Tao Bao | 2017-08-22 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2b | Tao Bao | 2017-08-22 | 8 | -255/+73 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a | Tao Bao | 2017-08-22 | 8 | -255/+73 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge changes I5d7a6baa,Id0fb2d4e | Tao Bao | 2017-08-22 | 8 | -255/+73 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge changes I5d7a6baa,Id0fb2d4e | Tao Bao | 2017-08-22 | 8 | -255/+73 |
| | | | |/| | | | |
|
| | | | | * | | | | wear_ui: Expose menu_unusable_rows via Makefile var. | Tao Bao | 2017-08-11 | 3 | -4/+11 |
| | | | | * | | | | Allow customizing WearRecoveryUI via Makefile variables. | Tao Bao | 2017-08-10 | 8 | -253/+64 |
* | | | | | | | | | Merge changes from topic "bug-64307776" into oc-mr1-dev am: 2e1b3a418e | Tao Bao | 2017-08-22 | 8 | -255/+73 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge changes from topic "bug-64307776" into oc-mr1-dev | Tao Bao | 2017-08-22 | 8 | -255/+73 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | * | | | | | | | Merge changes from topic "bug-64307776" into oc-mr1-dev | Tao Bao | 2017-08-22 | 8 | -255/+73 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | wear_ui: Expose menu_unusable_rows via Makefile var. | Tao Bao | 2017-08-13 | 3 | -4/+11 |
| | | * | | | | | | | Allow customizing WearRecoveryUI via Makefile variables. | Tao Bao | 2017-08-13 | 8 | -253/+64 |
* | | | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09 am: f5e3cadeca am: fc569d1516 | Tianjie Xu | 2017-08-19 | 6 | -278/+325 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09 am: f5e3cadeca | Tianjie Xu | 2017-08-19 | 6 | -278/+325 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09 | Tianjie Xu | 2017-08-19 | 6 | -278/+325 |
| | |\ \ \ \ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 | Tianjie Xu | 2017-08-19 | 6 | -278/+325 |
| | | |\ \ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" | Tianjie Xu | 2017-08-19 | 6 | -278/+325 |
| | | | |\ \ \ \ \ \
| | | | | | |_|_|/ /
| | | | | |/| | | | |
|
| | | | | * | | | | | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" | Tianjie Xu | 2017-08-19 | 6 | -278/+325 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | Move Image/ImageChunk/PatchChunk declaration into header files | Tianjie Xu | 2017-08-19 | 6 | -278/+325 |
| | | | | |/ / / / / |
|
* | | | | | | | | | | Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a am: 8c9c22a3a9 am: 14b3f5e5cc | Tianjie Xu | 2017-08-17 | 1 | -0/+6 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a am: 8c9c22a3a9 | Tianjie Xu | 2017-08-17 | 1 | -0/+6 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a | Tianjie Xu | 2017-08-17 | 1 | -0/+6 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "update_verifier now logs to kmesg" am: f7ad94313d | Tianjie Xu | 2017-08-17 | 1 | -0/+6 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "update_verifier now logs to kmesg" | Tianjie Xu | 2017-08-17 | 1 | -0/+6 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "update_verifier now logs to kmesg" | Tianjie Xu | 2017-08-17 | 1 | -0/+6 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | update_verifier now logs to kmesg | Tianjie Xu | 2017-08-15 | 1 | -0/+6 |
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" | TreeHugger Robot | 2017-08-17 | 16 | -0/+144 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-17 | 16 | -0/+144 |
* | | | | | | | | | | | | screen_ui: Fix a case that may truncate the last char. am: 2cf6fe2ced | Tao Bao | 2017-08-17 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|
| * | | | | | | | | | | | screen_ui: Fix a case that may truncate the last char. | Tao Bao | 2017-08-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | screen_ui: Fix a case that may truncate the last char. | Tao Bao | 2017-08-17 | 1 | -1/+2 |
* | | | | | | | | | | | | screen_ui: Word-wrap menu headers. am: ee6fefd2f2 -s ours | Tao Bao | 2017-08-17 | 0 | -0/+0 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | screen_ui: Word-wrap menu headers. | Tao Bao | 2017-08-17 | 0 | -0/+0 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | screen_ui: Word-wrap menu headers. | Tao Bao | 2017-08-16 | 3 | -5/+37 |
* | | | | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e am: 228a2f2a37 am: 7f7d9b2f37 | Tao Bao | 2017-08-17 | 1 | -1/+2 |
|\| | | | | | | | | | |
| |_|/ / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e am: 228a2f2a37 | Tao Bao | 2017-08-17 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e | Tao Bao | 2017-08-17 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd | Tao Bao | 2017-08-17 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." | Tao Bao | 2017-08-17 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \
| | | | | | |/ / / / /
| | | | | |/| | | | | |
|
| | | | | * | | | | | | Merge "screen_ui: Fix a case that may truncate the last char." | Tao Bao | 2017-08-17 | 1 | -1/+2 |
| | | | | |\ \ \ \ \ \ |
|
| | | | | | * | | | | | | screen_ui: Fix a case that may truncate the last char. | Tao Bao | 2017-08-16 | 1 | -1/+2 |
| | | | | |/ / / / / / |
|
* | | | | | | | | | | | Import translations. DO NOT MERGE am: 20fa1a92cc -s ours | Bill Yi | 2017-08-16 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-16 | 2 | -2/+11 |
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
* | | | | | | | | | | Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9 am: ae0af37111 am: f1397b597a | Tao Bao | 2017-08-16 | 3 | -5/+37 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9 am: ae0af37111 | Tao Bao | 2017-08-16 | 3 | -5/+37 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9 | Tao Bao | 2017-08-16 | 3 | -5/+37 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "screen_ui: Word-wrap menu headers." am: 162b92323b | Tao Bao | 2017-08-16 | 3 | -5/+37 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "screen_ui: Word-wrap menu headers." | Tao Bao | 2017-08-16 | 3 | -5/+37 |
| | | | |\ \ \ \ \ \
| | | | | | |/ / / /
| | | | | |/| | | | |
|
| | | | | * | | | | | Merge "screen_ui: Word-wrap menu headers." | Tao Bao | 2017-08-16 | 3 | -5/+37 |
| | | | | |\ \ \ \ \
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
| | | | | | * | | | | screen_ui: Word-wrap menu headers. | Tao Bao | 2017-08-16 | 3 | -5/+37 |
| | | | | | | |/ /
| | | | | | |/| | |
|
* | | | | | | | | | Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8 am: 96b490acec am: bfd3123a6a | Tianjie Xu | 2017-08-14 | 1 | -236/+292 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8 am: 96b490acec | Tianjie Xu | 2017-08-14 | 1 | -236/+292 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8 | Tianjie Xu | 2017-08-14 | 1 | -236/+292 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 | Tianjie Xu | 2017-08-14 | 1 | -236/+292 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Add a new PatchChunk class in imgdiff" | Tianjie Xu | 2017-08-14 | 1 | -236/+292 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "Add a new PatchChunk class in imgdiff" | Tianjie Xu | 2017-08-14 | 1 | -236/+292 |
| | | | | |\ \ \ \
| | | | | | |/ / /
| | | | | |/| | | |
|
| | | | | | * | | | Add a new PatchChunk class in imgdiff | Tianjie Xu | 2017-08-13 | 1 | -236/+292 |
* | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-12 | 15 | -128/+2 |
* | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76 am: db9ec51c39 | David Zeuthen | 2017-08-10 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76 | David Zeuthen | 2017-08-10 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. | David Zeuthen | 2017-08-10 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ |
|
* | | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76 am: 9cf2e9798f | David Zeuthen | 2017-08-10 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76 | David Zeuthen | 2017-08-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ /
| | |/| | | | | | | |
|
| | * | | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. | David Zeuthen | 2017-08-10 | 1 | -4/+17 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. | David Zeuthen | 2017-08-09 | 1 | -4/+17 |
* | | | | | | | | | | Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4 am: 5156e24ccf am: 37b9d108a9 | Tao Bao | 2017-08-10 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4 am: 5156e24ccf | Tao Bao | 2017-08-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4 | Tao Bao | 2017-08-10 | 1 | -31/+51 |
| | |\ \ \ \ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 | Tao Bao | 2017-08-10 | 1 | -31/+51 |
| | | |\ \ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "update_verifier: verify blocks in parallel" | Tao Bao | 2017-08-10 | 1 | -31/+51 |
| | | | |\ \ \ \ \ \
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
| | | | | * | | | | | Merge "update_verifier: verify blocks in parallel" | Tao Bao | 2017-08-10 | 1 | -31/+51 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | update_verifier: verify blocks in parallel | Wei Wang | 2017-08-10 | 1 | -31/+51 |
| | | | | |/ / / / / |
|
* | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeee am: 46c13f3f05 am: 6f1c38c9ad | Tao Bao | 2017-08-10 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeee am: 46c13f3f05 | Tao Bao | 2017-08-10 | 0 | -0/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeee | Tao Bao | 2017-08-10 | 1 | -1/+2 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad | Tao Bao | 2017-08-10 | 1 | -1/+2 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "tests: Add the missing dependency on libhidlbase." | Tao Bao | 2017-08-10 | 1 | -1/+2 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "tests: Add the missing dependency on libhidlbase." | Tao Bao | 2017-08-10 | 1 | -1/+2 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | tests: Add the missing dependency on libhidlbase. | Tao Bao | 2017-08-10 | 1 | -1/+2 |
| | | | | |/ / / / / |
|
* | | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-dev am: 1f4229ff95 | Wei Wang | 2017-08-10 | 1 | -1/+2 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-dev | Wei Wang | 2017-08-10 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-dev | Wei Wang | 2017-08-10 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | tests: Add the missing dependency on libhidlbase. | Tao Bao | 2017-08-10 | 1 | -1/+2 |
* | | | | | | | | | | | update_verifier: verify blocks in parallel am: bd9664b5a0 | Wei Wang | 2017-08-10 | 1 | -31/+51 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | update_verifier: verify blocks in parallel | Wei Wang | 2017-08-10 | 1 | -31/+51 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | update_verifier: verify blocks in parallel | Wei Wang | 2017-08-09 | 1 | -31/+51 |
* | | | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534 am: bb8d04cd3c am: f2a8eba23c am: ade231287b | David Zeuthen | 2017-08-08 | 1 | -4/+17 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534 am: bb8d04cd3c am: f2a8eba23c | David Zeuthen | 2017-08-08 | 1 | -4/+17 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534 am: bb8d04cd3c | David Zeuthen | 2017-08-08 | 1 | -4/+17 |
| | |\ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." am: 399ce66534 | David Zeuthen | 2017-08-08 | 1 | -4/+17 |
| | | |\ \ \ \ \ \ \ \
| | | | | |_|/ / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." | David Zeuthen | 2017-08-08 | 1 | -4/+17 |
| | | | |\ \ \ \ \ \ \
| | | | | | |_|/ / / /
| | | | | |/| | | | | |
|
| | | | | * | | | | | | Merge "update_verifier: Support androidboot.veritymode being empty or 'disabled'." | Treehugger Robot | 2017-08-08 | 1 | -4/+17 |
| | | | | |\ \ \ \ \ \ |
|
| | | | | | * | | | | | | update_verifier: Support androidboot.veritymode being empty or 'disabled'. | David Zeuthen | 2017-08-08 | 1 | -4/+17 |
| | | | | |/ / / / / / |
|
* | | | | | | | | | | | Import translations. DO NOT MERGE am: 5c2bc51bf2 -s ours | Bill Yi | 2017-08-06 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-08-06 | 1 | -0/+9 |
* | | | | | | | | | | | ui: Check for bootreason=recovery_ui. am: 937e884ca1 | Tao Bao | 2017-08-04 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | ui: Check for bootreason=recovery_ui. | Tao Bao | 2017-08-04 | 0 | -0/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | ui: Check for bootreason=recovery_ui. | Tao Bao | 2017-08-03 | 2 | -0/+21 |
| | | |_|_|_|/ / / /
| | |/| | | | | | | |
|
* | | | | | | | | | | Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 am: 7c0b8a4322 am: 7f5b514411 am: 99f78994cb | Tao Bao | 2017-08-04 | 2 | -0/+21 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 am: 7c0b8a4322 am: 7f5b514411 | Tao Bao | 2017-08-04 | 2 | -0/+21 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 am: 7c0b8a4322 | Tao Bao | 2017-08-04 | 2 | -0/+21 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 | Tao Bao | 2017-08-04 | 2 | -0/+21 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "ui: Check for bootreason=recovery_ui." | Tao Bao | 2017-08-03 | 2 | -0/+21 |
| | | | |\ \ \ \ \ \
| | | | | | |/ / / /
| | | | | |/| | | | |
|
| | | | | * | | | | | Merge "ui: Check for bootreason=recovery_ui." | Tao Bao | 2017-08-03 | 2 | -0/+21 |
| | | | | |\ \ \ \ \
| | | | | | |_|_|/ /
| | | | | |/| | | | |
|
| | | | | | * | | | | ui: Check for bootreason=recovery_ui. | Tao Bao | 2017-08-03 | 2 | -0/+21 |
| | | | | |/ / / / |
|
* | | | | | | | | | ui: Move the support for touch inputs into RecoveryUI. am: af9f8b4d97 | Tao Bao | 2017-08-03 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | ui: Move the support for touch inputs into RecoveryUI. | Tao Bao | 2017-08-03 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | * | | | | | | | ui: Move the support for touch inputs into RecoveryUI. | Tao Bao | 2017-08-03 | 5 | -16/+209 |
* | | | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." am: faa5b1f773 am: 5daa000068 am: 14d829b02c am: 30886cb817 | Tao Bao | 2017-08-03 | 5 | -16/+209 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." am: faa5b1f773 am: 5daa000068 am: 14d829b02c | Tao Bao | 2017-08-03 | 5 | -16/+209 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." am: faa5b1f773 am: 5daa000068 | Tao Bao | 2017-08-03 | 5 | -16/+209 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." am: faa5b1f773 | Tao Bao | 2017-08-03 | 5 | -16/+209 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." | Tao Bao | 2017-08-03 | 5 | -16/+209 |
| | | | |\ \ \ \ \
| | | | | | |/ / /
| | | | | |/| | | |
|
| | | | | * | | | | Merge "ui: Move the support for touch inputs into RecoveryUI." | Tao Bao | 2017-08-03 | 5 | -16/+209 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | ui: Move the support for touch inputs into RecoveryUI. | Tao Bao | 2017-08-02 | 5 | -16/+209 |
* | | | | | | | | | | Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b am: e500bc3e15 am: 12cd28fb9c | Tianjie Xu | 2017-08-03 | 2 | -393/+569 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b am: e500bc3e15 | Tianjie Xu | 2017-08-03 | 2 | -393/+569 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b | Tianjie Xu | 2017-08-03 | 2 | -393/+569 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Refactor the imgdiff" am: f411f3dcfb | Tianjie Xu | 2017-08-03 | 2 | -393/+569 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Refactor the imgdiff" | Tianjie Xu | 2017-08-03 | 2 | -393/+569 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "Refactor the imgdiff" | Tianjie Xu | 2017-08-03 | 2 | -393/+569 |
| | | | | |\ \ \ \ \
| | | | | | |/ / / /
| | | | | |/| | | | |
|
| | | | | | * | | | | Refactor the imgdiff | Tianjie Xu | 2017-08-02 | 2 | -393/+569 |
| | | | | |/ / / / |
|
* | | | | | | | | | Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310 am: a09376ed90 am: 8b09001e47 | Tianjie Xu | 2017-08-01 | 2 | -1/+162 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310 am: a09376ed90 | Tianjie Xu | 2017-08-01 | 2 | -1/+162 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Add implemention of SortedRangeSet" am: 64cba55fbc am: fbd4b10310 | Tianjie Xu | 2017-08-01 | 2 | -1/+162 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Add implemention of SortedRangeSet" am: 64cba55fbc | Tianjie Xu | 2017-08-01 | 2 | -1/+162 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Add implemention of SortedRangeSet" | Tianjie Xu | 2017-08-01 | 2 | -1/+162 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "Add implemention of SortedRangeSet" | Tianjie Xu | 2017-08-01 | 2 | -1/+162 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | Add implemention of SortedRangeSet | Tianjie Xu | 2017-08-01 | 2 | -1/+162 |
* | | | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63c am: 0863373376 am: 06db7363b0 | Tao Bao | 2017-07-31 | 4 | -177/+119 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63c am: 0863373376 | Tao Bao | 2017-07-31 | 4 | -177/+119 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63c | Tao Bao | 2017-07-31 | 4 | -177/+119 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b | Tao Bao | 2017-07-31 | 4 | -177/+119 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "otautil: Clean up dirCreateHierarchy()." | Tao Bao | 2017-07-31 | 4 | -177/+119 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "otautil: Clean up dirCreateHierarchy()." | Treehugger Robot | 2017-07-31 | 4 | -177/+119 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | otautil: Clean up dirCreateHierarchy(). | Tao Bao | 2017-07-27 | 4 | -177/+119 |
| | | | | | |/ / / / |
|
* | | | | | | | | | | Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229 am: a86d24829b am: ce47e3792f | Tianjie Xu | 2017-07-27 | 2 | -6/+8 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229 am: a86d24829b | Tianjie Xu | 2017-07-27 | 2 | -6/+8 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229 | Tianjie Xu | 2017-07-27 | 2 | -6/+8 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 | Tianjie Xu | 2017-07-27 | 2 | -6/+8 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Add more specific error codes for uncrypt failures" | Tianjie Xu | 2017-07-27 | 2 | -6/+8 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "Add more specific error codes for uncrypt failures" | Tianjie Xu | 2017-07-27 | 2 | -6/+8 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | Add more specific error codes for uncrypt failures | Tianjie Xu | 2017-07-27 | 2 | -6/+8 |
| | | | | | |/ / / / |
|
* | | | | | | | | | | Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1 am: f93a103587 am: 264caac23d | Tao Bao | 2017-07-27 | 1 | -129/+121 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1 am: f93a103587 | Tao Bao | 2017-07-27 | 1 | -129/+121 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1 | Tao Bao | 2017-07-27 | 1 | -129/+121 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d | Tao Bao | 2017-07-27 | 1 | -129/+121 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "roots.cpp: Clean up format_volume()." | Tao Bao | 2017-07-27 | 1 | -129/+121 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "roots.cpp: Clean up format_volume()." | Tao Bao | 2017-07-27 | 1 | -129/+121 |
| | | | | |\ \ \ \ \
| | | | | | |/ / / /
| | | | | |/| | | | |
|
| | | | | | * | | | | roots.cpp: Clean up format_volume(). | Tao Bao | 2017-07-26 | 1 | -129/+121 |
| | | | | |/ / / / |
|
* | | | | | | | | | recovery: handle security footer before passing size to mke2fs am: 5e47d5161a -s ours am: 3475faf5ea -s ours | Jin Qian | 2017-07-26 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | recovery: handle security footer before passing size to mke2fs am: 5e47d5161a -s ours | Jin Qian | 2017-07-26 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | recovery: handle security footer before passing size to mke2fs | Jin Qian | 2017-07-26 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \
| | | | |_|_|_|/ /
| | | |/| | | | | |
|
* | | | | | | | | | recovery: handle security footer before passing size to mke2fs am: 5e47d5161a am: e2d31361ef -s ours | Jin Qian | 2017-07-26 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | recovery: handle security footer before passing size to mke2fs am: 5e47d5161a | Jin Qian | 2017-07-26 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | * | | | | | | | recovery: handle security footer before passing size to mke2fs | Jin Qian | 2017-07-26 | 1 | -11/+28 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | recovery: handle security footer before passing size to mke2fs | Jin Qian | 2017-07-25 | 1 | -11/+28 |
* | | | | | | | | | recovery: Fix the flickering when turning on text mode. am: fda6ee7d61 | Tao Bao | 2017-07-26 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | recovery: Fix the flickering when turning on text mode. | Tao Bao | 2017-07-26 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | recovery: Fix the flickering when turning on text mode. | Tao Bao | 2017-07-25 | 1 | -9/+8 |
* | | | | | | | | | Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7 am: 1bc6334312 am: b0e8a507ac | Tao Bao | 2017-07-26 | 4 | -6/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7 am: 1bc6334312 | Tao Bao | 2017-07-26 | 4 | -6/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7 | Tao Bao | 2017-07-26 | 4 | -6/+0 |
| | |\ \ \ \ \ \ \
| | | | |_|/ / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Remove LOCAL_CLANG" am: 231c627a55 | Tao Bao | 2017-07-26 | 4 | -6/+0 |
| | | |\ \ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Remove LOCAL_CLANG" | Tao Bao | 2017-07-25 | 4 | -6/+0 |
| | | | |\ \ \ \ \
| | | | | | |_|/ /
| | | | | |/| | | |
|
| | | | | * | | | | Merge "Remove LOCAL_CLANG" | Tao Bao | 2017-07-25 | 4 | -6/+0 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | Remove LOCAL_CLANG | Lennart Wieboldt | 2017-07-25 | 4 | -6/+0 |
* | | | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 am: 2b95e0d0aa am: 6e99b91fd0 | Jin Qian | 2017-07-25 | 1 | -11/+28 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 am: 2b95e0d0aa | Jin Qian | 2017-07-25 | 1 | -11/+28 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 am: 786177f7e6 | Jin Qian | 2017-07-25 | 1 | -11/+28 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" am: 539ed9acb1 | Jin Qian | 2017-07-25 | 1 | -11/+28 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "recovery: handle security footer before passing size to mke2fs" | Jin Qian | 2017-07-25 | 1 | -11/+28 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "recovery: handle security footer before passing size to mke2fs" | Treehugger Robot | 2017-07-25 | 1 | -11/+28 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | recovery: handle security footer before passing size to mke2fs | Jin Qian | 2017-07-25 | 1 | -11/+28 |
* | | | | | | | | | | | Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d am: 28cf022931 am: ed4abe576b | Tao Bao | 2017-07-25 | 1 | -28/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d am: 28cf022931 | Tao Bao | 2017-07-25 | 1 | -28/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge "updater: Remove dead make_parents()." am: f5396eb8b2 am: ac634e3c9d | Tao Bao | 2017-07-25 | 1 | -28/+0 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "updater: Remove dead make_parents()." am: f5396eb8b2 | Tao Bao | 2017-07-25 | 1 | -28/+0 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Merge "updater: Remove dead make_parents()." | Tao Bao | 2017-07-25 | 1 | -28/+0 |
| | | | |\| | | | | | |
|
| | | | | * | | | | | | Merge "updater: Remove dead make_parents()." | Treehugger Robot | 2017-07-25 | 1 | -28/+0 |
| | | | | |\ \ \ \ \ \ |
|
| | | | | | * | | | | | | updater: Remove dead make_parents(). | Tao Bao | 2017-07-25 | 1 | -28/+0 |
| | | | | | |/ / / / / |
|
* | | | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 am: a40c15717d am: df9252faf7 | Tao Bao | 2017-07-25 | 1 | -9/+8 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 am: a40c15717d | Tao Bao | 2017-07-25 | 1 | -9/+8 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 | Tao Bao | 2017-07-25 | 1 | -9/+8 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 | Tao Bao | 2017-07-25 | 1 | -9/+8 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Merge "recovery: Fix the flickering when turning on text mode." | Tao Bao | 2017-07-25 | 1 | -9/+8 |
| | | | |\| | | | | | |
|
| | | | | * | | | | | | Merge "recovery: Fix the flickering when turning on text mode." | Treehugger Robot | 2017-07-25 | 1 | -9/+8 |
| | | | | |\ \ \ \ \ \
| | | | | | |/ / / / /
| | | | | |/| | | | | |
|
| | | | | | * | | | | | recovery: Fix the flickering when turning on text mode. | Tao Bao | 2017-07-25 | 1 | -9/+8 |
| | | | | |/ / / / / |
|
* | | | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 am: 633aeba594 am: 9c62f67863 | Tao Bao | 2017-07-25 | 3 | -101/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 am: 633aeba594 | Tao Bao | 2017-07-25 | 3 | -101/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 | Tao Bao | 2017-07-25 | 3 | -101/+0 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 | Tao Bao | 2017-07-25 | 3 | -101/+0 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." | Tao Bao | 2017-07-25 | 3 | -101/+0 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "otautil: Delete dirUnlinkHierarchy()." | Tao Bao | 2017-07-25 | 3 | -101/+0 |
| | | | | |\ \ \ \ \
| | | | | | |/ / / /
| | | | | |/| | | | |
|
| | | | | | * | | | | otautil: Delete dirUnlinkHierarchy(). | Tao Bao | 2017-07-25 | 3 | -101/+0 |
| | | | | |/ / / / |
|
* | | | | | | | | | Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36 am: bba1e66f74 am: 11e6d8ee85 | Tao Bao | 2017-07-25 | 1 | -101/+93 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36 am: bba1e66f74 | Tao Bao | 2017-07-25 | 1 | -101/+93 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36 | Tao Bao | 2017-07-25 | 1 | -101/+93 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "roots.cpp: Reformatting the file." am: ac70ffcc85 | Tao Bao | 2017-07-25 | 1 | -101/+93 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "roots.cpp: Reformatting the file." | Tao Bao | 2017-07-25 | 1 | -101/+93 |
| | | | |\| | | | |
|
| | | | | * | | | | Merge "roots.cpp: Reformatting the file." | Treehugger Robot | 2017-07-25 | 1 | -101/+93 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | roots.cpp: Reformatting the file. | Tao Bao | 2017-07-25 | 1 | -101/+93 |
| | | | | |/ / / / |
|
* | | | | | | | | | tests: Add a test to cover legacy care_map.txt handling. am: 5cee24f4f1 | Tao Bao | 2017-07-25 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | tests: Add a test to cover legacy care_map.txt handling. | Tao Bao | 2017-07-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | * | | | | | | | tests: Add a test to cover legacy care_map.txt handling. | Tao Bao | 2017-07-24 | 1 | -0/+13 |
* | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev am: 71b8103bf1 | Tao Bao | 2017-07-24 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev | Tao Bao | 2017-07-24 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev | TreeHugger Robot | 2017-07-24 | 1 | -29/+42 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | update_verifier: Handle legacy care_map.txt gracefully. | Tao Bao | 2017-07-24 | 1 | -29/+42 |
* | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-dev am: 92aef7fa88 | Tianjie Xu | 2017-07-24 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-dev | Tianjie Xu | 2017-07-24 | 0 | -0/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-dev | Tianjie Xu | 2017-07-24 | 2 | -98/+96 |
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | | * | | | | | | | Fix a case when brotli writer fails to write last few blocks of data | Tianjie Xu | 2017-07-22 | 2 | -98/+96 |
* | | | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331 am: 0148a6f9ab am: 2357b0c745 | Tao Bao | 2017-07-24 | 1 | -0/+13 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331 am: 0148a6f9ab | Tao Bao | 2017-07-24 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331 | Tao Bao | 2017-07-24 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c | Tao Bao | 2017-07-24 | 1 | -0/+13 |
| | | |\ \ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." | Tao Bao | 2017-07-24 | 1 | -0/+13 |
| | | | |\ \ \ \ \ \
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
| | | | | * | | | | | Merge "tests: Add a test to cover legacy care_map.txt handling." | Tao Bao | 2017-07-24 | 1 | -0/+13 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | tests: Add a test to cover legacy care_map.txt handling. | Tao Bao | 2017-07-24 | 1 | -0/+13 |
| | | | | |/ / / / / |
|
* | | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c am: 1d923f5e54 am: c580e491ca | Tao Bao | 2017-07-24 | 1 | -29/+42 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c am: 1d923f5e54 | Tao Bao | 2017-07-24 | 1 | -29/+42 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c | Tao Bao | 2017-07-24 | 1 | -29/+42 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 | Tao Bao | 2017-07-24 | 1 | -29/+42 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." | Tao Bao | 2017-07-24 | 1 | -29/+42 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "update_verifier: Handle legacy care_map.txt gracefully." | Tao Bao | 2017-07-24 | 1 | -29/+42 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | update_verifier: Handle legacy care_map.txt gracefully. | Tao Bao | 2017-07-22 | 1 | -29/+42 |
* | | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca am: fd63239621 am: 0be4c0e261 | Tao Bao | 2017-07-23 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca am: fd63239621 | Tao Bao | 2017-07-23 | 0 | -0/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca | Tao Bao | 2017-07-23 | 2 | -5/+2 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be | Tao Bao | 2017-07-23 | 2 | -5/+2 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Merge "Remove the obsolete reference to /file_contexts." | Tao Bao | 2017-07-23 | 2 | -5/+2 |
| | | | |\| | | | | | |
|
| | | | | * | | | | | | Merge "Remove the obsolete reference to /file_contexts." | Treehugger Robot | 2017-07-23 | 2 | -5/+2 |
| | | | | |\ \ \ \ \ \
| | | | | | |/ / / / /
| | | | | |/| | | | | |
|
| | | | | | * | | | | | Remove the obsolete reference to /file_contexts. | Tao Bao | 2017-07-23 | 2 | -5/+2 |
| | | | | |/ / / / / |
|
* | | | | | | | | | | Avoid crashing recovery with unwritable /cache. am: 329fe83509 | Tao Bao | 2017-07-22 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Avoid crashing recovery with unwritable /cache. | Tao Bao | 2017-07-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Avoid crashing recovery with unwritable /cache. | Tao Bao | 2017-07-22 | 1 | -25/+23 |
* | | | | | | | | | | Build libminui with BOARD_VNDK_VERSION am: d774ff247e | Jiyong Park | 2017-07-22 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Build libminui with BOARD_VNDK_VERSION | Jiyong Park | 2017-07-22 | 1 | -1/+1 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Build libminui with BOARD_VNDK_VERSION | Jiyong Park | 2017-07-21 | 1 | -1/+1 |
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
* | | | | | | | | | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 am: 4fb2825dc2 am: e62f06246a am: 7d03b8d495 | Tao Bao | 2017-07-22 | 1 | -25/+23 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 am: 4fb2825dc2 am: e62f06246a | Tao Bao | 2017-07-22 | 1 | -25/+23 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 am: 4fb2825dc2 | Tao Bao | 2017-07-22 | 1 | -25/+23 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 | Tao Bao | 2017-07-22 | 1 | -25/+23 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Avoid crashing recovery with unwritable /cache." | Tao Bao | 2017-07-22 | 1 | -25/+23 |
| | | | |\ \ \ \ \
| | | | | | |/ / /
| | | | | |/| | | |
|
| | | | | * | | | | Merge "Avoid crashing recovery with unwritable /cache." | Treehugger Robot | 2017-07-22 | 1 | -25/+23 |
| | | | | |\ \ \ \ |
|
| | | | | | * | | | | Avoid crashing recovery with unwritable /cache. | Tao Bao | 2017-07-21 | 1 | -25/+23 |
* | | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 am: 80acaab52f am: 75ff0107c8 am: 512283a751 | Tianjie Xu | 2017-07-22 | 2 | -98/+96 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 am: 80acaab52f am: 75ff0107c8 | Tianjie Xu | 2017-07-22 | 2 | -98/+96 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 am: 80acaab52f | Tianjie Xu | 2017-07-22 | 2 | -98/+96 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" am: e45c8f0057 | Tianjie Xu | 2017-07-21 | 2 | -98/+96 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" | Tianjie Xu | 2017-07-21 | 2 | -98/+96 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Merge "Fix a case when brotli writer fails to write last few blocks of data" | Tianjie Xu | 2017-07-21 | 2 | -98/+96 |
| | | | | |\ \ \ \ \
| | | | | | |/ / / /
| | | | | |/| | | | |
|
| | | | | | * | | | | Fix a case when brotli writer fails to write last few blocks of data | Tianjie Xu | 2017-07-21 | 2 | -98/+96 |
| | | | | | | |_|/
| | | | | | |/| | |
|
* | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742 am: 7cdc58497b am: 6fc893ebca | Jin Qian | 2017-07-22 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742 am: 7cdc58497b | Jin Qian | 2017-07-22 | 0 | -0/+0 |
| |\| | | | | | |
| | |_|_|_|_|/ /
| |/| | | | | | |
|
| | * | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742 | Jin Qian | 2017-07-22 | 0 | -0/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 | Jin Qian | 2017-07-21 | 3 | -11/+86 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: replace make_ext4 with e2fsprogs" | Jin Qian | 2017-07-21 | 3 | -11/+86 |
| | | | |\| | | |
|
| | | | | * | | | Merge "recovery: replace make_ext4 with e2fsprogs" | Treehugger Robot | 2017-07-21 | 3 | -11/+86 |
| | | | | |\ \ \ |
|
| | | | | | * | | | recovery: replace make_ext4 with e2fsprogs | Jin Qian | 2017-07-20 | 3 | -11/+86 |
| | | | | | |/ / |
|
* | | | | | | | | Merge "Build libminui with BOARD_VNDK_VERSION" | TreeHugger Robot | 2017-07-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | Build libminui with BOARD_VNDK_VERSION | Jiyong Park | 2017-07-19 | 1 | -1/+1 |
* | | | | | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 am: 6d8827e0d3 am: 96b5bb9601 | Tianjie Xu | 2017-07-20 | 7 | -116/+115 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| / / / / / /
| |/ / / / / / |
|
| * | | | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 am: 6d8827e0d3 | Tianjie Xu | 2017-07-20 | 7 | -116/+115 |
| |\| | | | | |
|
| | * | | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 | Tianjie Xu | 2017-07-20 | 7 | -116/+115 |
| | |\| | | | |
|
| | | * | | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" | Tianjie Xu | 2017-07-20 | 7 | -116/+115 |
| | | |\| | | |
|
| | | | * | | | Merge "Fix the android-cloexec-* warnings in bootable/recovery" | Tianjie Xu | 2017-07-20 | 7 | -116/+115 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Fix the android-cloexec-* warnings in bootable/recovery | Tianjie Xu | 2017-07-19 | 7 | -116/+115 |
| | | | |/ / |
|
* | | | | | | Merge "Remove the obsolete reference to /file_contexts." | Tao Bao | 2017-07-14 | 2 | -5/+2 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove the obsolete reference to /file_contexts. | Tao Bao | 2017-07-13 | 2 | -5/+2 |
* | | | | | | | Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74 am: c61bbe158e am: 762c42d6f6 | Tao Bao | 2017-07-13 | 1 | -5/+5 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74 am: c61bbe158e | Tao Bao | 2017-07-13 | 1 | -5/+5 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74 | Tao Bao | 2017-07-13 | 1 | -5/+5 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "Fix the missing char when showing recovery logs." | Tao Bao | 2017-07-13 | 1 | -5/+5 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "Fix the missing char when showing recovery logs." | Treehugger Robot | 2017-07-13 | 1 | -5/+5 |
| | | | |\ \ \ |
|
| | | | | * | | | Fix the missing char when showing recovery logs. | Tao Bao | 2017-07-13 | 1 | -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-aosp | Bill Yi | 2017-07-11 | 0 | -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-aosp | Android Build Merger (Role) | 2017-07-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours | Bill Yi | 2017-07-11 | 0 | -0/+0 |
| | |\ \ \ \ \ \
| | | | |_|_|_|/
| | | |/| | | | |
|
| | | * | | | | | Import translations. DO NOT MERGE am: 28b67f8eea -s ours | Bill Yi | 2017-07-11 | 0 | -0/+0 |
| | | |\ \ \ \ \ |
|
* | | | | | | | | | Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours am: 04e1d6ebd9 -s ours | Bill Yi | 2017-07-11 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Import translations. DO NOT MERGE am: 28b67f8eea -s ours am: 9839965b25 -s ours | Bill Yi | 2017-07-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | / / / /
| | | |_|/ / / /
| | |/| | | | | |
|
| | * | | | | | | Import translations. DO NOT MERGE am: 28b67f8eea -s ours | Bill Yi | 2017-07-11 | 0 | -0/+0 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-07-11 | 0 | -0/+0 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-07-10 | 1 | -1/+1 |
* | | | | | | | | | Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2 am: 43bdf6cad6 am: 8375ebee37 | Tianjie Xu | 2017-07-11 | 4 | -32/+212 |
|\| | | | | | | |
| |_|_|_|_|_|_|/
|/| | | | | | | |
|
| * | | | | | | | Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2 am: 43bdf6cad6 | Tianjie Xu | 2017-07-11 | 4 | -32/+212 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add support to decompress brotli compressed new data" am: 918e6ea1b2 | Tianjie Xu | 2017-07-11 | 4 | -32/+212 |
| | |\ \ \ \ \ \
| | | | |_|_|/ /
| | | |/| | | | |
|
| | | * | | | | | Merge "Add support to decompress brotli compressed new data" | Tianjie Xu | 2017-07-11 | 4 | -32/+212 |
| | | |\ \ \ \ \
| | | | | |_|_|/
| | | | |/| | | |
|
| | | | * | | | | Merge "Add support to decompress brotli compressed new data" | Tianjie Xu | 2017-07-11 | 4 | -32/+212 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Add support to decompress brotli compressed new data | Tianjie Xu | 2017-07-08 | 4 | -32/+212 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f am: 233f4b0b4b | Tianjie Xu | 2017-07-07 | 2 | -11/+47 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f | Tianjie Xu | 2017-07-07 | 2 | -11/+47 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 | Tianjie Xu | 2017-07-07 | 2 | -11/+47 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" | Tianjie Xu | 2017-07-07 | 2 | -11/+47 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Fix a rare failure for imgdiff when random data equals gzip header" | Tianjie Xu | 2017-07-07 | 2 | -11/+47 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Fix a rare failure for imgdiff when random data equals gzip header | Tianjie Xu | 2017-07-07 | 2 | -11/+47 |
| | | | |/ / / / |
|
* | | | | | | | | Restructure vr_ui am: c392888df7 -s ours | Luke Song | 2017-07-07 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Restructure vr_ui | Luke Song | 2017-07-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | * | | | | | | Restructure vr_ui | Luke Song | 2017-07-07 | 5 | -32/+13 |
* | | | | | | | | Merge "Introduce VR recovery ui am: edc6b52f00 -s ours am: 6660c97f07" | Android Build Merger (Role) | 2017-07-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Introduce VR recovery ui am: edc6b52f00 -s ours | Luke Song | 2017-07-07 | 0 | -0/+0 |
| |\| | | | | | | |
|
* | | | | | | | | | Introduce VR recovery ui am: edc6b52f00 -s ours | Luke Song | 2017-07-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| / / / / / / /
| |/ / / / / / / |
|
| * | | | | | | | Introduce VR recovery ui | Luke Song | 2017-07-07 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | Introduce VR recovery ui | Luke Song | 2017-07-06 | 6 | -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-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp | Jin Qian | 2017-07-06 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp | Android Build Merger (Role) | 2017-07-06 | 0 | -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-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 | Jin Qian | 2017-07-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev | Jin Qian | 2017-07-06 | 3 | -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-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | / / / / / / /
| | |_|/ / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 | Jin Qian | 2017-07-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
* | | | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 | Jin Qian | 2017-07-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| / / / / / / / /
| |/ / / / / / / / |
|
| * | | | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev | Jin Qian | 2017-07-06 | 3 | -11/+86 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| / / / / / /
| | |/ / / / / / |
|
| | * | | | | | | Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev | TreeHugger Robot | 2017-07-06 | 3 | -11/+86 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | recovery: replace make_ext4 with e2fsprogs | Jin Qian | 2017-06-27 | 3 | -11/+86 |
* | | | | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa am: 7e3b1c00c6 | Tao Bao | 2017-07-02 | 5 | -37/+38 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa | Tao Bao | 2017-07-02 | 5 | -37/+38 |
| |\ \ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c | Tao Bao | 2017-07-02 | 5 | -37/+38 |
| | |\ \ \ \ \ \ \
| | | | |_|/ / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures." | Tao Bao | 2017-07-02 | 5 | -37/+38 |
| | | |\ \ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Update ScreenRecoveryUI::Draw* function signatures." | Treehugger Robot | 2017-07-02 | 5 | -37/+38 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Update ScreenRecoveryUI::Draw* function signatures. | Tao Bao | 2017-07-02 | 5 | -37/+38 |
| | | | |/ / / / / |
|
* | | | | | | | | | screen_ui: Compute the top and bottom gaps. am: f95e686dd0 -s ours | Tao Bao | 2017-06-30 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | screen_ui: Compute the top and bottom gaps. | Tao Bao | 2017-06-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|/ / / /
| | |/| | | | | | |
|
| | * | | | | | | | screen_ui: Compute the top and bottom gaps. | Tao Bao | 2017-06-30 | 1 | -11/+14 |
| | | |_|_|/ / /
| | |/| | | | | |
|
* | | | | | | | | Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef am: 1783254c3f am: 2fbbd488d6 | Tao Bao | 2017-06-30 | 1 | -11/+14 |
|\| | | | | | | |
|
| * | | | | | | | Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef am: 1783254c3f | Tao Bao | 2017-06-30 | 1 | -11/+14 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef | Tao Bao | 2017-06-30 | 1 | -11/+14 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "screen_ui: Compute the top and bottom gaps." | Tao Bao | 2017-06-30 | 1 | -11/+14 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "screen_ui: Compute the top and bottom gaps." | Tao Bao | 2017-06-30 | 1 | -11/+14 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | screen_ui: Compute the top and bottom gaps. | Tao Bao | 2017-06-29 | 1 | -11/+14 |
* | | | | | | | | | Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858f am: c3437622cc | Tao Bao | 2017-06-29 | 2 | -13/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858f | Tao Bao | 2017-06-29 | 2 | -13/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 | Tao Bao | 2017-06-29 | 2 | -13/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "wear_ui: Remove dead/duplicate codes." | Tao Bao | 2017-06-29 | 2 | -13/+0 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "wear_ui: Remove dead/duplicate codes." | Tao Bao | 2017-06-29 | 2 | -13/+0 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | wear_ui: Remove dead/duplicate codes. | Tao Bao | 2017-06-29 | 2 | -13/+0 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cb am: 8b4c7e7567 | Elliott Hughes | 2017-06-28 | 1 | -1/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cb | Elliott Hughes | 2017-06-28 | 1 | -1/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add missing libziparchive dependency." am: f9fe6a705d | Elliott Hughes | 2017-06-28 | 1 | -1/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add missing libziparchive dependency." | Elliott Hughes | 2017-06-28 | 1 | -1/+2 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Add missing libziparchive dependency." | Treehugger Robot | 2017-06-28 | 1 | -1/+2 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Add missing libziparchive dependency. | Elliott Hughes | 2017-06-28 | 1 | -1/+2 |
* | | | | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 am: 2e20c11828 am: 57191920e8 | Tao Bao | 2017-06-28 | 5 | -66/+58 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 am: 2e20c11828 | Tao Bao | 2017-06-28 | 5 | -66/+58 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 | Tao Bao | 2017-06-28 | 5 | -66/+58 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Add override specifier and member constness to RecoveryUI classes." | Tao Bao | 2017-06-28 | 5 | -66/+58 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Add override specifier and member constness to RecoveryUI classes." | Tao Bao | 2017-06-28 | 5 | -66/+58 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Add override specifier and member constness to RecoveryUI classes. | Tao Bao | 2017-06-24 | 5 | -66/+58 |
* | | | | | | | | | | Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8a am: a6aa96f3fd | Tao Bao | 2017-06-27 | 7 | -1099/+1100 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8a | Tao Bao | 2017-06-27 | 7 | -1099/+1100 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 | Tao Bao | 2017-06-27 | 7 | -1099/+1100 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Formatting RecoveryUI related files." | Tao Bao | 2017-06-27 | 7 | -1099/+1100 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Formatting RecoveryUI related files." | Treehugger Robot | 2017-06-27 | 7 | -1099/+1100 |
| | | | |\| | | | | |
|
| | | | | * | | | | | Formatting RecoveryUI related files. | Tao Bao | 2017-06-24 | 7 | -1099/+1100 |
* | | | | | | | | | | Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 am: 170aa1c923 am: 09b438052e | Tianjie Xu | 2017-06-27 | 1 | -13/+9 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 am: 170aa1c923 | Tianjie Xu | 2017-06-27 | 1 | -13/+9 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 | Tianjie Xu | 2017-06-27 | 1 | -13/+9 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "avoid assuming build number is a 32-bit integer" | Tianjie Xu | 2017-06-26 | 1 | -13/+9 |
| | |/| | | | | | |
| | | |/ / / / / / |
|
| | | * | | | | | | Merge "avoid assuming build number is a 32-bit integer" | Tianjie Xu | 2017-06-26 | 1 | -13/+9 |
| | | |\ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | | * | | | | | avoid assuming build number is a 32-bit integer | Daniel Micay | 2017-06-26 | 1 | -13/+9 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86 am: 799cd0bb5d | Luke Song | 2017-06-24 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86 | Luke Song | 2017-06-24 | 5 | -32/+13 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Restructure vr_ui" am: 20d40ce53a | Luke Song | 2017-06-24 | 5 | -32/+13 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Merge "Restructure vr_ui" | Luke Song | 2017-06-24 | 5 | -32/+13 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Restructure vr_ui" | Treehugger Robot | 2017-06-24 | 5 | -32/+13 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Restructure vr_ui | Luke Song | 2017-06-24 | 5 | -32/+13 |
| | | | |/ / / / / |
|
* | | | | | | | | | Merge "Restructure vr_ui" | Luke Song | 2017-06-24 | 5 | -32/+13 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Restructure vr_ui | Luke Song | 2017-06-23 | 5 | -32/+13 |
* | | | | | | | | | | Use Makefile variables to specify margin settings. am: 855eaffff6 -s ours | Tao Bao | 2017-06-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Use Makefile variables to specify margin settings. | Tao Bao | 2017-06-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Use Makefile variables to specify margin settings. | Tao Bao | 2017-06-23 | 3 | -13/+25 |
* | | | | | | | | | | screen_ui: Allow setting screen margin space. am: 8f7547edfa -s ours | Tao Bao | 2017-06-24 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | screen_ui: Allow setting screen margin space. | Tao Bao | 2017-06-24 | 0 | -0/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | screen_ui: Allow setting screen margin space. | Tao Bao | 2017-06-23 | 2 | -70/+77 |
* | | | | | | | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 am: 2eb2c0b276 | Tao Bao | 2017-06-24 | 0 | -0/+0 |
|\| | | | | | | | |
| |_|/ / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 | Tao Bao | 2017-06-24 | 3 | -71/+90 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge changes Icb6f7466,Ibf6238c9 am: eef231567c | Tao Bao | 2017-06-23 | 3 | -71/+90 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge changes Icb6f7466,Ibf6238c9 | Tao Bao | 2017-06-23 | 3 | -71/+90 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge changes Icb6f7466,Ibf6238c9 | Tao Bao | 2017-06-23 | 3 | -71/+90 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Use Makefile variables to specify margin settings. | Tao Bao | 2017-06-23 | 3 | -13/+25 |
| | | | | * | | | | | screen_ui: Allow setting screen margin space. | Tao Bao | 2017-06-21 | 2 | -71/+78 |
| | | | | | |/ / /
| | | | | |/| | | |
|
* | | | | | | | | | Merge changes from topic 'recovery_ui_taimen' | Tao Bao | 2017-06-23 | 3 | -71/+90 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Use Makefile variables to specify margin settings. | Tao Bao | 2017-06-22 | 3 | -13/+25 |
| * | | | | | | | | | screen_ui: Allow setting screen margin space. | Tao Bao | 2017-06-20 | 2 | -71/+78 |
* | | | | | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5 am: e002d96194 | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5 | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "Remove the obsolete package_extract_dir() test" | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "Remove the obsolete package_extract_dir() test" | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | Remove the obsolete package_extract_dir() test | Tianjie Xu | 2017-06-23 | 1 | -96/+0 |
| | | | | | |/ / / /
| | | | | |/| | | | |
|
* | | | | | | | | | | update_verifier: Support AVB. am: 336cbce252 -s ours | David Zeuthen | 2017-06-23 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | update_verifier: Support AVB. | David Zeuthen | 2017-06-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
| | * | | | | | | | | update_verifier: Support AVB. | David Zeuthen | 2017-06-23 | 4 | -7/+24 |
* | | | | | | | | | | Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49 am: b0c38f1cce | David Zeuthen | 2017-06-22 | 4 | -7/+24 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49 | David Zeuthen | 2017-06-22 | 4 | -7/+24 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "update_verifier: Support AVB." am: e248e434ea | David Zeuthen | 2017-06-22 | 4 | -7/+24 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "update_verifier: Support AVB." | David Zeuthen | 2017-06-22 | 4 | -7/+24 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "update_verifier: Support AVB." | Treehugger Robot | 2017-06-22 | 4 | -7/+24 |
| | | | |\ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | | * | | | | | update_verifier: Support AVB. | David Zeuthen | 2017-05-24 | 4 | -7/+24 |
* | | | | | | | | | | recovery: replace make_ext4 with e2fsprogs | Jin Qian | 2017-06-19 | 3 | -11/+86 |
| |_|_|_|_|_|/ / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a am: 8daabacce5 | Luke Song | 2017-06-17 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a | Luke Song | 2017-06-17 | 6 | -8/+144 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Introduce VR recovery ui" am: 5efe2bca22 | Luke Song | 2017-06-17 | 6 | -8/+144 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Introduce VR recovery ui" | Luke Song | 2017-06-17 | 6 | -8/+144 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Introduce VR recovery ui" | Treehugger Robot | 2017-06-17 | 6 | -8/+144 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Introduce VR recovery ui | Luke Song | 2017-06-17 | 6 | -8/+144 |
| | | | |/ / / / / |
|
* | | | | | | | | | Merge "Introduce VR recovery ui" | Luke Song | 2017-06-16 | 6 | -8/+144 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Introduce VR recovery ui | Luke Song | 2017-06-15 | 6 | -8/+144 |
* | | | | | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6 am: 80eb02dcbf | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6 | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "Add OWNERS in bootable/recovery" | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "Add OWNERS in bootable/recovery" | Chih-hung Hsieh | 2017-06-16 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | Add OWNERS in bootable/recovery | Chih-Hung Hsieh | 2017-06-15 | 1 | -0/+3 |
* | | | | | | | | | | | Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp | Jeff Vander Stoep | 2017-06-16 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp | Android Build Merger (Role) | 2017-06-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Fix "No file_contexts" warning am: e35926e1af | Jeff Vander Stoep | 2017-06-16 | 2 | -9/+6 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|/ / /
| | | |/| | | | | | | | |
|
| | | * | | | | | | | | | Fix "No file_contexts" warning | Jeff Vander Stoep | 2017-06-16 | 2 | -9/+6 |
| | | |\ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|/ /
| | | | |/| | | | | | | |
|
* | | | | | | | | | | | | Fix "No file_contexts" warning am: e35926e1af am: eba11fa574 | Jeff Vander Stoep | 2017-06-16 | 0 | -0/+0 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | Fix "No file_contexts" warning am: e35926e1af | Jeff Vander Stoep | 2017-06-16 | 2 | -9/+6 |
| |\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / /
| |/| | | / / / / / / /
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Fix "No file_contexts" warning | Jeff Vander Stoep | 2017-06-16 | 2 | -9/+6 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Fix "No file_contexts" warning | Jeff Vander Stoep | 2017-06-15 | 2 | -9/+6 |
* | | | | | | | | | | | Fix "No file_contexts" warning | Jeff Vander Stoep | 2017-06-15 | 2 | -9/+6 |
| |_|_|_|_|_|_|/ / /
|/| | | | | | | | | |
|
* | | | | | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827 am: 54138462b4 | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
|\| | | | | | | | |
| |_|_|/ / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827 | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
|/| | | | | | | |
| |/ / / / / / / |
|
| * | | | | | | | Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Fix a race condition for temperature_logger" | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Fix a race condition for temperature_logger" | Tianjie Xu | 2017-06-09 | 1 | -3/+7 |
| | | |\ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | | * | | | | Fix a race condition for temperature_logger | Tianjie Xu | 2017-06-08 | 1 | -3/+7 |
| | | |/ / / / |
|
* | | | | | | | Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb am: 66e53f59b9 | Tianjie Xu | 2017-06-01 | 7 | -439/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb | Tianjie Xu | 2017-05-31 | 7 | -439/+0 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Merge "kill package_extract_dir" am: 99e7216907 | Tianjie Xu | 2017-05-31 | 7 | -439/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "kill package_extract_dir" | Tianjie Xu | 2017-05-31 | 7 | -439/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "kill package_extract_dir" | Tianjie Xu | 2017-05-31 | 7 | -439/+0 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | kill package_extract_dir | Tianjie Xu | 2017-05-24 | 7 | -439/+0 |
| | | | | | |/ /
| | | | | |/| | |
|
* | | | | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a am: 4a2cfffd33 | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Implement a custom deflate sink function for bspatch" | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Implement a custom deflate sink function for bspatch" | Tianjie Xu | 2017-05-27 | 1 | -58/+86 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Implement a custom deflate sink function for bspatch | Tianjie Xu | 2017-05-26 | 1 | -58/+86 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 am: aef046255a | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails | Tianjie Xu | 2017-05-24 | 4 | -4/+12 |
| | | | |/ / / |
|
* | | | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d am: 1562f41348 | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
|\| | | | | | |
|
| * | | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| |\| | | | | |
|
| | * | | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| | |\| | | | |
|
| | | * | | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| | | |\| | | |
|
| | | | * | | | Merge "Print SHA1 of the patch if bsdiff fails with data error" | Tianjie Xu | 2017-05-19 | 4 | -22/+71 |
| | | | |\ \ \ |
|
| | | | | * | | | Print SHA1 of the patch if bsdiff fails with data error | Tianjie Xu | 2017-05-16 | 4 | -22/+71 |
* | | | | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 am: 01bcf118d5 | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
|\| | | | | | | |
|
| * | | | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| |\| | | | | | |
|
| | * | | | | | | Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| | |\| | | | | |
|
| | | * | | | | | Merge "libbootloader_message: convert to Android.bp" | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| | | |\| | | | |
|
| | | | * | | | | Merge "libbootloader_message: convert to Android.bp" | Tom Cherry | 2017-05-18 | 4 | -26/+27 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | libbootloader_message: convert to Android.bp | Tom Cherry | 2017-05-17 | 4 | -26/+27 |
* | | | | | | | | | Fix the input parameter for "set_retry_bootloader_message" am: 539b08cfcf | Tianjie Xu | 2017-05-18 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Fix the input parameter for "set_retry_bootloader_message" | Tianjie Xu | 2017-05-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | * | | | | | | | Fix the input parameter for "set_retry_bootloader_message" | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
* | | | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b am: f1546892e1 | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Fix the input parameter for "set_retry_bootloader_message"" | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | | | |\ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | Fix the input parameter for "set_retry_bootloader_message" | Tianjie Xu | 2017-05-17 | 1 | -13/+13 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c am: 9539cdb3c0 | Tao Bao | 2017-05-13 | 1 | -3/+5 |
|\| | | | | | | |
|
| * | | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0. | Tao Bao | 2017-05-12 | 1 | -3/+5 |
| | | | |/ / / |
|
* | | | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fc am: e89cbd675c | Tao Bao | 2017-05-12 | 1 | -7/+16 |
|\| | | | | | |
|
| * | | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fc | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| |\| | | | | |
|
| | * | | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| | |\| | | | |
|
| | | * | | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| | | |\| | | |
|
| | | | * | | | Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." | Tao Bao | 2017-05-12 | 1 | -7/+16 |
| | | | |\ \ \ |
|
| | | | | * | | | Don't write to /sys/class/android_usb/android0/enable with configfs. | Tao Bao | 2017-05-11 | 1 | -7/+16 |
| | | | |/ / / |
|
* | | | | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1 am: 8c7c38ca7f | Tao Bao | 2017-05-11 | 1 | -19/+22 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1 | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Skip "/" in setup_install_mounts()." | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: Skip "/" in setup_install_mounts()." | Tao Bao | 2017-05-11 | 1 | -19/+22 |
| | | | |\ \ \ |
|
| | | | | * | | | recovery: Skip "/" in setup_install_mounts(). | Tao Bao | 2017-05-10 | 1 | -19/+22 |
| | | | |/ / / |
|
* | | | | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f am: 46938bcf0c am: 09690020fb | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
|\| | | | | | |
|
| * | | | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f am: 46938bcf0c | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
| |\| | | | | |
|
| | * | | | | | Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
| | |\| | | | |
|
| | | * | | | | Merge "otautil: Android.mk -> Android.bp" | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
| | | |\| | | |
|
| | | | * | | | Merge "otautil: Android.mk -> Android.bp" | Treehugger Robot | 2017-05-10 | 4 | -34/+37 |
| | | | |\ \ \ |
|
| | | | | * | | | otautil: Android.mk -> Android.bp | Steven Moreland | 2017-05-10 | 4 | -34/+37 |
* | | | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 am: 1dc25e3e0a am: 1f7e8f6ab6 | Tao Bao | 2017-05-09 | 1 | -3/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 am: 1dc25e3e0a | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: Use libverifier instead of rebuilding the sources." | Tao Bao | 2017-05-09 | 1 | -3/+1 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | recovery: Use libverifier instead of rebuilding the sources. | Tao Bao | 2017-05-08 | 1 | -3/+1 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fc am: f49c57643d | Tao Bao | 2017-05-09 | 3 | -33/+103 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fc | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add a binary path param to update_binary_command()." am: 197304aada | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add a binary path param to update_binary_command()." | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Add a binary path param to update_binary_command()." | Tao Bao | 2017-05-09 | 3 | -33/+103 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | Add a binary path param to update_binary_command(). | Tao Bao | 2017-05-08 | 3 | -33/+103 |
| | | | |/ / / |
|
* | | | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783 am: 5975ee6a46 | Jin Qian | 2017-05-05 | 1 | -3/+3 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783 | Jin Qian | 2017-05-05 | 1 | -3/+3 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca | Jin Qian | 2017-05-05 | 1 | -3/+3 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" | Jin Qian | 2017-05-05 | 1 | -3/+3 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" | Treehugger Robot | 2017-05-05 | 1 | -3/+3 |
| | | | |\ \ \ |
|
| | | | | * | | | recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0 | Jin Qian | 2017-05-05 | 1 | -3/+3 |
* | | | | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 am: e452c25620 am: 4ab07dfcd3 | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 am: e452c25620 | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Update the comment for obsolete symlink handling ." | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Update the comment for obsolete symlink handling ." | Treehugger Robot | 2017-05-04 | 1 | -1/+0 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Update the comment for obsolete symlink handling . | Tianjie Xu | 2017-05-04 | 1 | -1/+0 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 am: 1d33e0815d am: a51e44cef7 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 am: 1d33e0815d | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Revert "Remove EXPAND/STRINGIFY macros."" | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Revert "Remove EXPAND/STRINGIFY macros." | Tao Bao | 2017-05-04 | 3 | -4/+4 |
* | | | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866 am: 6bea344d7e | Tao Bao | 2017-05-04 | 4 | -141/+161 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866 | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "fuse_sideload: Change the minimal block size to 4096." | Tao Bao | 2017-05-04 | 4 | -141/+161 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | fuse_sideload: Change the minimal block size to 4096. | Tao Bao | 2017-05-03 | 4 | -141/+161 |
* | | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073 am: 5f8d2932d0 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Remove EXPAND/STRINGIFY macros." | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Remove EXPAND/STRINGIFY macros." | Tao Bao | 2017-05-04 | 3 | -4/+4 |
| | | | |\ \ \ \ \ \
| | | | | | |/ / / /
| | | | | |/| / / /
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | Remove EXPAND/STRINGIFY macros. | Tao Bao | 2017-05-03 | 3 | -4/+4 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26 am: 7a1c2943ab | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26 | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add a default error code when updater script aborts" am: 89394632b1 | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add a default error code when updater script aborts" | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Add a default error code when updater script aborts" | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Add a default error code when updater script aborts | Tianjie Xu | 2017-05-03 | 2 | -7/+10 |
* | | | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2 am: b3eeb817ab | Tao Bao | 2017-05-03 | 8 | -142/+114 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2 | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Move sysMapFile and sysReleaseMap into MemMapping class." | Tao Bao | 2017-05-03 | 8 | -142/+114 |
| | | | |\ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | Move sysMapFile and sysReleaseMap into MemMapping class. | Tao Bao | 2017-05-02 | 8 | -142/+114 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3 am: c0c4ae1583 am: a0fb95a386 | Tao Bao | 2017-05-02 | 2 | -75/+77 |
|\| | | | | | | |
|
| * | | | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3 am: c0c4ae1583 | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: Change install_package() to take std::string." am: ba365180d3 | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: Change install_package() to take std::string." | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: Change install_package() to take std::string." | Tao Bao | 2017-05-02 | 2 | -75/+77 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | recovery: Change install_package() to take std::string. | Tao Bao | 2017-05-01 | 2 | -75/+77 |
* | | | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481 am: 139a6dd9e2 | Tao Bao | 2017-05-01 | 3 | -101/+96 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481 | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "adb_install: Stop passing RecoveryUI as a parameter." | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | adb_install: Stop passing RecoveryUI as a parameter. | Tao Bao | 2017-05-01 | 3 | -101/+96 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c am: 4cc6889da8 | Tao Bao | 2017-04-29 | 1 | -1/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c | Tao Bao | 2017-04-29 | 1 | -1/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minui: Fix breakage in graphics_adf." am: 54da112277 | Tao Bao | 2017-04-29 | 1 | -1/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minui: Fix breakage in graphics_adf." | Tao Bao | 2017-04-29 | 1 | -1/+2 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minui: Fix breakage in graphics_adf." | Tao Bao | 2017-04-29 | 1 | -1/+2 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | minui: Fix breakage in graphics_adf. | Alistair Strachan | 2017-04-29 | 1 | -1/+2 |
* | | | | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3e am: 711e8b649d | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3e | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Fix potential OOM in update_verifier" am: 5443072c3c | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Fix potential OOM in update_verifier" | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Fix potential OOM in update_verifier" | Tianjie Xu | 2017-04-28 | 1 | -6/+11 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | Fix potential OOM in update_verifier | Tianjie Xu | 2017-04-27 | 1 | -6/+11 |
| | | | | |/ / / |
|
* | | | | | | | | Adding support for quiescent reboot to recovery am: ed9db0fd73 | Dmitri Plotnikov | 2017-04-28 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Adding support for quiescent reboot to recovery | Dmitri Plotnikov | 2017-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| | * | | | | | | Adding support for quiescent reboot to recovery | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
* | | | | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093 am: 533ad31cc1 | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093 | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Adding support for quiescent reboot to recovery" | Dmitri Plotnikov | 2017-04-28 | 4 | -8/+27 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "Adding support for quiescent reboot to recovery" | Treehugger Robot | 2017-04-28 | 4 | -8/+27 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | Adding support for quiescent reboot to recovery | Dmitri Plotnikov | 2017-04-19 | 4 | -8/+27 |
* | | | | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6 am: c7410924a3 | Tao Bao | 2017-04-27 | 6 | -16/+179 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6 | Tao Bao | 2017-04-27 | 6 | -16/+179 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 | Tao Bao | 2017-04-27 | 6 | -16/+179 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Separate libupdate_verifier module and add testcases." | Tao Bao | 2017-04-27 | 6 | -16/+179 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Separate libupdate_verifier module and add testcases." | Tao Bao | 2017-04-27 | 6 | -16/+179 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Separate libupdate_verifier module and add testcases. | Tao Bao | 2017-04-27 | 6 | -16/+179 |
* | | | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 am: 74812187c0 am: 67dc335646 | Tao Bao | 2017-04-27 | 2 | -5/+6 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 am: 74812187c0 | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "libfusesideload: Clean up the CFLAGS for the module." | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | libfusesideload: Clean up the CFLAGS for the module. | Tao Bao | 2017-04-27 | 2 | -5/+6 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61 am: 7ee4b7dd84 | Tao Bao | 2017-04-26 | 2 | -31/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61 | Tao Bao | 2017-04-26 | 2 | -31/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 | Tao Bao | 2017-04-26 | 2 | -31/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." | Tao Bao | 2017-04-26 | 2 | -31/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "applypatch: Remove the obsolete support for "applypatch -s"." | Tao Bao | 2017-04-26 | 2 | -31/+1 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | applypatch: Remove the obsolete support for "applypatch -s". | Tao Bao | 2017-04-26 | 2 | -31/+1 |
* | | | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 am: 282c863524 am: 3dcc24490b | Tao Bao | 2017-04-26 | 1 | -1/+4 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 am: 282c863524 | Tao Bao | 2017-04-26 | 1 | -1/+4 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 | Tao Bao | 2017-04-26 | 1 | -1/+4 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." | Tao Bao | 2017-04-26 | 1 | -1/+4 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." | Tao Bao | 2017-04-26 | 1 | -1/+4 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | applypatch: Add determine the return value of ApplyDiffPatch and | Jinguang Dong | 2017-04-26 | 1 | -1/+4 |
| | | | |/ / / / / |
|
* | | | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 am: f849ff34d4 am: c798cf2531 | Tao Bao | 2017-04-25 | 1 | -9/+11 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 am: f849ff34d4 | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "minadbd: Fix a failing test due to SIGPIPE." | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | minadbd: Fix a failing test due to SIGPIPE. | Tao Bao | 2017-04-25 | 1 | -9/+11 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28 am: 36683d0fc8 | Tao Bao | 2017-04-25 | 2 | -3/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28 | Tao Bao | 2017-04-25 | 2 | -3/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: Remove the include of adb.h." am: dff2276012 | Tao Bao | 2017-04-25 | 2 | -3/+0 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: Remove the include of adb.h." | Tao Bao | 2017-04-25 | 2 | -3/+0 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: Remove the include of adb.h." | Tao Bao | 2017-04-25 | 2 | -3/+0 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | recovery: Remove the include of adb.h. | Tao Bao | 2017-04-24 | 2 | -3/+0 |
| | | | |/ / / / |
|
* | | | | | | | | Add more tests for verify_package_compatibility(). am: b4c0de6c7b -s ours | Tao Bao | 2017-04-25 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Add more tests for verify_package_compatibility(). | Tao Bao | 2017-04-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| | * | | | | | | Add more tests for verify_package_compatibility(). | Tao Bao | 2017-04-24 | 1 | -0/+84 |
* | | | | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87 am: 54f8988cfe | Tao Bao | 2017-04-24 | 1 | -0/+84 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87 | Tao Bao | 2017-04-24 | 1 | -0/+84 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 | Tao Bao | 2017-04-24 | 1 | -0/+84 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Add more tests for verify_package_compatibility()." | Tao Bao | 2017-04-24 | 1 | -0/+84 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "Add more tests for verify_package_compatibility()." | Tao Bao | 2017-04-24 | 1 | -0/+84 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Add more tests for verify_package_compatibility(). | Tao Bao | 2017-04-20 | 1 | -0/+84 |
* | | | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8a am: f4a8d0bba6 | Tao Bao | 2017-04-24 | 1 | -49/+2 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8a | Tao Bao | 2017-04-24 | 1 | -49/+2 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db | Tao Bao | 2017-04-24 | 1 | -49/+2 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "tests: Remove obsolete classes in applypatch_test." | Tao Bao | 2017-04-24 | 1 | -49/+2 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "tests: Remove obsolete classes in applypatch_test." | Tao Bao | 2017-04-24 | 1 | -49/+2 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | tests: Remove obsolete classes in applypatch_test. | Tao Bao | 2017-04-21 | 1 | -49/+2 |
| | | | | |/ / / / |
|
* | | | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d am: 0cf72f0f14 am: c179ac9238 | Tao Bao | 2017-04-24 | 2 | -2/+2 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d am: 0cf72f0f14 | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | librecovery: Remove -Wno-unused-parameter and add -Wall. | Tao Bao | 2017-04-24 | 2 | -2/+2 |
| | | | | |/ / / / |
|
* | | | | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033 am: 0cd8986bc2 | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033 | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Reboot the device on user build after the install fails" am: d6f436849d | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Reboot the device on user build after the install fails" | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Reboot the device on user build after the install fails" | Treehugger Robot | 2017-04-22 | 1 | -4/+12 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Reboot the device on user build after the install fails | Tianjie Xu | 2017-04-22 | 1 | -4/+12 |
| | | | | | |_|/ /
| | | | | |/| | | |
|
* | | | | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7 am: 33a8900d2b | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7 | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Minor clean up to minadbd_services.cpp" | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Minor clean up to minadbd_services.cpp" | Tianjie Xu | 2017-04-20 | 1 | -9/+7 |
| | | | |\ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | Minor clean up to minadbd_services.cpp | Tianjie Xu | 2017-04-19 | 1 | -9/+7 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc am: d7a065eb1c | Tao Bao | 2017-04-20 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc | Tao Bao | 2017-04-20 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Call libvintf to verify package compatibility." am: b0945e1a23 | Tao Bao | 2017-04-20 | 3 | -5/+17 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Call libvintf to verify package compatibility." | Tao Bao | 2017-04-20 | 3 | -5/+17 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Call libvintf to verify package compatibility." | Tao Bao | 2017-04-20 | 3 | -5/+17 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Call libvintf to verify package compatibility. | Tao Bao | 2017-04-20 | 3 | -5/+17 |
* | | | | | | | | | Call libvintf to verify package compatibility. am: da320ac6ab | Tao Bao | 2017-04-20 | 3 | -5/+17 |
|\| | | | | | | | |
|
| * | | | | | | | | Call libvintf to verify package compatibility. | Tao Bao | 2017-04-20 | 3 | -5/+17 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | * | | | | | | | Call libvintf to verify package compatibility. | Tao Bao | 2017-04-19 | 3 | -5/+17 |
* | | | | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0 am: 7b9b77f445 | Tao Bao | 2017-04-19 | 2 | -43/+89 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0 | Tao Bao | 2017-04-19 | 2 | -43/+89 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Add tests for read_metadata_from_package()." am: e888d45950 | Tao Bao | 2017-04-19 | 2 | -43/+89 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Add tests for read_metadata_from_package()." | Tao Bao | 2017-04-19 | 2 | -43/+89 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Add tests for read_metadata_from_package()." | Tao Bao | 2017-04-19 | 2 | -43/+89 |
| | | | |\ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | Add tests for read_metadata_from_package(). | Tao Bao | 2017-04-19 | 2 | -43/+89 |
* | | | | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-dev am: 464c6ba9f8 | Tianjie Xu | 2017-04-19 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-dev | Tianjie Xu | 2017-04-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Add 'system' to update_verifier's gid" into oc-dev | Tianjie Xu | 2017-04-19 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Add 'system' to update_verifier's gid | Tianjie Xu | 2017-04-19 | 1 | -2/+2 |
* | | | | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d am: 6650c0426f | Tao Bao | 2017-04-19 | 1 | -66/+61 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "Minor clean up to install.cpp." am: 08146728c1 | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| | |\ \ \ \ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "Minor clean up to install.cpp." | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| | | |\ \ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "Minor clean up to install.cpp." | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| | | | |\ \ \ \ \ \
| | | | | | |_|/ / /
| | | | | |/| | | | |
|
| | | | | * | | | | | Minor clean up to install.cpp. | Tao Bao | 2017-04-19 | 1 | -66/+61 |
| | | | |/ / / / / |
|
* | | | | | | | | | Merge "Add tests for update_binary_command()." into oc-dev am: a6084f8c9b -s ours | Tao Bao | 2017-04-19 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add tests for update_binary_command()." into oc-dev | Tao Bao | 2017-04-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|/ / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Add tests for update_binary_command()." into oc-dev | Tao Bao | 2017-04-19 | 4 | -82/+199 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Add tests for update_binary_command(). | Tao Bao | 2017-04-19 | 4 | -82/+199 |
* | | | | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7 am: d218dca8f9 | Tao Bao | 2017-04-19 | 4 | -82/+198 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7 | Tao Bao | 2017-04-19 | 4 | -82/+198 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "Add tests for update_binary_command()." am: 44f61b4ce5 | Tao Bao | 2017-04-19 | 4 | -82/+198 |
| | |\ \ \ \ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "Add tests for update_binary_command()." | Tao Bao | 2017-04-19 | 4 | -82/+198 |
| | | |\ \ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "Add tests for update_binary_command()." | Tao Bao | 2017-04-19 | 4 | -82/+198 |
| | | | |\ \ \ \ \ \
| | | | | |_|_|_|/ /
| | | | |/| | | | | |
|
| | | | | * | | | | | Add tests for update_binary_command(). | Tao Bao | 2017-04-18 | 4 | -82/+198 |
* | | | | | | | | | | init.rc: Remove sys.powerctl action am: 37ac94978c | Tom Cherry | 2017-04-18 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | init.rc: Remove sys.powerctl action | Tom Cherry | 2017-04-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | init.rc: Remove sys.powerctl action | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
* | | | | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f am: 4575986069 am: 239d154869 | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f am: 4575986069 | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "Add 'system' to update_verifier's gid" | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "Add 'system' to update_verifier's gid" | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Add 'system' to update_verifier's gid | Tianjie Xu | 2017-04-18 | 1 | -2/+2 |
* | | | | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088 am: 9fcc7c8253 am: 6e575ccd0f | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088 am: 9fcc7c8253 | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "init.rc: Remove sys.powerctl action" am: 9848209088 | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "init.rc: Remove sys.powerctl action" | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "init.rc: Remove sys.powerctl action" | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \
| | | | | |_|_|/ / /
| | | | |/| | | | | |
|
| | | | | * | | | | | init.rc: Remove sys.powerctl action | Tom Cherry | 2017-04-18 | 1 | -3/+0 |
* | | | | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293 am: dc388aab8b am: d87bccd567 | Tao Bao | 2017-04-18 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293 am: dc388aab8b | Tao Bao | 2017-04-18 | 0 | -0/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Fix the double free in verify_package_compatibility()." am: ce91df8293 | Tao Bao | 2017-04-18 | 1 | -1/+0 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Fix the double free in verify_package_compatibility()." | Tao Bao | 2017-04-18 | 1 | -1/+0 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Fix the double free in verify_package_compatibility()." | Tao Bao | 2017-04-18 | 1 | -1/+0 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | Fix the double free in verify_package_compatibility(). | Tao Bao | 2017-04-18 | 1 | -1/+0 |
* | | | | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5 am: 35849591a0 -s ours | Tao Bao | 2017-04-18 | 0 | -0/+0 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5 | Tao Bao | 2017-04-18 | 0 | -0/+0 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge changes from topic 'libvintf' am: c1ca21a32d | Tao Bao | 2017-04-18 | 6 | -5/+164 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge changes from topic 'libvintf' | Tao Bao | 2017-04-18 | 6 | -5/+164 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Merge changes from topic 'libvintf' | Tao Bao | 2017-04-18 | 6 | -5/+164 |
| | | | |\| | | | | | |
|
| | | | | * | | | | | | Add the missing LOCAL_CFLAGS for librecovery. | Tao Bao | 2017-04-18 | 1 | -0/+5 |
| | | | | * | | | | | | Verify the package compatibility with libvintf. | Tao Bao | 2017-04-13 | 6 | -5/+159 |
| | | | | | |/ / / /
| | | | | |/| | | | |
|
* | | | | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 am: 7e031fdfe6 am: fdc5ac8051 | Tao Bao | 2017-04-18 | 2 | -21/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 am: 7e031fdfe6 | Tao Bao | 2017-04-18 | 2 | -21/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 | Tao Bao | 2017-04-18 | 2 | -21/+0 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "libmounts: Remove two dead functions." | Tao Bao | 2017-04-18 | 2 | -21/+0 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "libmounts: Remove two dead functions." | Tao Bao | 2017-04-18 | 2 | -21/+0 |
| | | | |\ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | | * | | | | | libmounts: Remove two dead functions. | Tao Bao | 2017-04-17 | 2 | -21/+0 |
| | | | | |/ / / / |
|
* | | | | | | | | | Fix the double free in verify_package_compatibility(). am: f978278995 | Tao Bao | 2017-04-17 | 1 | -1/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Fix the double free in verify_package_compatibility(). | Tao Bao | 2017-04-17 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | * | | | | | | | Fix the double free in verify_package_compatibility(). | Tao Bao | 2017-04-17 | 1 | -1/+0 |
| | | |_|_|_|/ /
| | |/| | | | | |
|
* | | | | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595 am: 0836159ce1 am: 572b7ba1bc | Josh Gao | 2017-04-14 | 1 | -27/+3 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595 am: 0836159ce1 | Josh Gao | 2017-04-14 | 1 | -27/+3 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "minadbd: switch adb_thread_create to std::thread." am: d3d91e5595 | Josh Gao | 2017-04-14 | 1 | -27/+3 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "minadbd: switch adb_thread_create to std::thread." | Josh Gao | 2017-04-14 | 1 | -27/+3 |
| | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "minadbd: switch adb_thread_create to std::thread." | Josh Gao | 2017-04-14 | 1 | -27/+3 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | minadbd: switch adb_thread_create to std::thread. | Josh Gao | 2017-04-13 | 1 | -27/+3 |
| | | | |/ / / |
|
* | | | | | | | Add the missing LOCAL_CFLAGS for librecovery. am: 25dbe1717e | Tao Bao | 2017-04-13 | 1 | -0/+5 |
|\| | | | | | |
|
| * | | | | | | Add the missing LOCAL_CFLAGS for librecovery. | Tao Bao | 2017-04-13 | 1 | -0/+5 |
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | | |
|
| | * | | | | | Add the missing LOCAL_CFLAGS for librecovery. | Tao Bao | 2017-04-13 | 1 | -0/+5 |
* | | | | | | | Verify the package compatibility with libvintf. am: 62e0bc7586 | Tao Bao | 2017-04-13 | 6 | -5/+159 |
|\| | | | | | |
|
| * | | | | | | Verify the package compatibility with libvintf. | Tao Bao | 2017-04-13 | 6 | -5/+159 |
| |\| | | | | |
|
| | * | | | | | Verify the package compatibility with libvintf. | Tao Bao | 2017-04-12 | 6 | -5/+159 |
* | | | | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 am: 461188865b am: 41bdd91780 | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
|\| | | | | | |
|
| * | | | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 am: 461188865b | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "Protect filename_cache with lock in ota fault" | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Merge "Protect filename_cache with lock in ota fault" | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| | | | |\ \ \ |
|
| | | | | * | | | Protect filename_cache with lock in ota fault | Tianjie Xu | 2017-04-11 | 2 | -3/+22 |
| | | | |/ / / |
|
* | | | | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9 am: 955c5ebece | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
|\| | | | | | |
|
| * | | | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9 | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
| |\| | | | | |
|
| | * | | | | | Merge "Abort the update if there's not enough new data" am: b4b0c49c48 | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
| | |\| | | | |
|
| | | * | | | | Merge "Abort the update if there's not enough new data" | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
| | | |\| | | |
|
| | | | * | | | Merge "Abort the update if there's not enough new data" | Tianjie Xu | 2017-04-10 | 2 | -4/+92 |
| | | | |\ \ \ |
|
| | | | | * | | | Abort the update if there's not enough new data | Tianjie Xu | 2017-04-08 | 2 | -4/+92 |
| | | | |/ / / |
|
* | | | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1 am: f25cd871cc | Tao Bao | 2017-04-05 | 3 | -49/+4 |
|\| | | | | | |
|
| * | | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1 | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| |\| | | | | |
|
| | * | | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| | |\| | | | |
|
| | | * | | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| | | |\| | | |
|
| | | | * | | | Merge "tests: Use get_bootloader_message_blk_device() to find /misc." | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| | | | |\ \ \ |
|
| | | | | * | | | tests: Use get_bootloader_message_blk_device() to find /misc. | Tao Bao | 2017-04-05 | 3 | -49/+4 |
| | | | |/ / / |
|
* | | | | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381 am: c14d0728a7 | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
|\| | | | | | |
|
| * | | | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381 | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
| |\| | | | | |
|
| | * | | | | | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
| | |\| | | | |
|
| | | * | | | | Merge "Boot control HAL based on the A/B headers." | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
| | | |\| | | |
|
| | | | * | | | Merge "Boot control HAL based on the A/B headers." | Alex Deymo | 2017-04-05 | 5 | -0/+448 |
| | | | |\ \ \ |
|
| | | | | * | | | Boot control HAL based on the A/B headers. | Alex Deymo | 2017-04-03 | 5 | -0/+448 |
* | | | | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a am: 7f4e5d55f4 | Tao Bao | 2017-04-05 | 3 | -239/+318 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a | Tao Bao | 2017-04-04 | 3 | -239/+318 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d | Tao Bao | 2017-04-04 | 3 | -239/+318 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Change the internal representation in RangeSet." | Tao Bao | 2017-04-04 | 3 | -239/+318 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Change the internal representation in RangeSet." | Tao Bao | 2017-04-04 | 3 | -239/+318 |
| | | |/| | | | |
|
| | | | * | | | | Change the internal representation in RangeSet. | Tao Bao | 2017-04-03 | 3 | -239/+318 |
| | | | |/ / / |
|
* | | | | | | | Merge "update_verifier: correct group in rc file" into oc-dev am: 5d9fb40ef7 | Tom Cherry | 2017-04-04 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "update_verifier: correct group in rc file" into oc-dev | Tom Cherry | 2017-04-04 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | | |
|
| | * | | | | | Merge "update_verifier: correct group in rc file" into oc-dev | TreeHugger Robot | 2017-04-04 | 2 | -3/+3 |
| | |\ \ \ \ \ |
|
| | | * | | | | | update_verifier: correct group in rc file | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
* | | | | | | | | update_verifier: tweak priority of update_verifier for quick boot am: 98beba314b | Wei Wang | 2017-04-04 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | update_verifier: tweak priority of update_verifier for quick boot | Wei Wang | 2017-04-04 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | update_verifier: tweak priority of update_verifier for quick boot | Wei Wang | 2017-04-04 | 1 | -2/+2 |
| | |/ / / / / |
|
* | | | | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02 am: 2717c28e77 am: bec8264c6f | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
|\| | | | | | |
|
| * | | | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02 am: 2717c28e77 | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge "update_verifier: correct group in rc file" am: 310fa65c02 | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Merge "update_verifier: correct group in rc file" | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
| | | |\ \ \ \ |
|
| | | | * \ \ \ | Merge "update_verifier: correct group in rc file" | Treehugger Robot | 2017-04-04 | 2 | -3/+3 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | update_verifier: correct group in rc file | Tom Cherry | 2017-04-04 | 2 | -3/+3 |
| | | | | | |/ /
| | | | | |/| | |
|
* | | | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d am: 56e9b9cc26 am: 8ed4fd4b69 | Wei Wang | 2017-04-04 | 1 | -2/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d am: 56e9b9cc26 | Wei Wang | 2017-04-04 | 1 | -2/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d | Wei Wang | 2017-04-04 | 1 | -2/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" | Wei Wang | 2017-04-04 | 1 | -2/+2 |
| | | |\| | | | |
|
| | | | * | | | | Merge "update_verifier: tweak priority of update_verifier for quick boot" | Treehugger Robot | 2017-04-04 | 1 | -2/+2 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | update_verifier: tweak priority of update_verifier for quick boot | Wei Wang | 2017-04-03 | 1 | -2/+2 |
| | | | |/ / / |
|
* | | | | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96e am: 0f72cf5403 | Tao Bao | 2017-04-03 | 5 | -468/+0 |
|\| | | | | | |
|
| * | | | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96e | Tao Bao | 2017-04-03 | 5 | -468/+0 |
| |\| | | | | |
|
| | * | | | | | Merge "applypatch: Remove duplicate test files." am: b6609f8895 | Tao Bao | 2017-04-03 | 5 | -468/+0 |
| | |\| | | | |
|
| | | * | | | | Merge "applypatch: Remove duplicate test files." | Tao Bao | 2017-04-03 | 5 | -468/+0 |
| | | |\| | | |
|
| | | | * | | | Merge "applypatch: Remove duplicate test files." | Tao Bao | 2017-04-03 | 5 | -468/+0 |
| | | | |\ \ \ |
|
| | | | | * | | | applypatch: Remove duplicate test files. | Tao Bao | 2017-04-02 | 5 | -468/+0 |
* | | | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 am: a982e53a6e am: 78e277cd42 | Tao Bao | 2017-04-03 | 1 | -160/+157 |
|\| | | | | | | |
|
| * | | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 am: a982e53a6e | Tao Bao | 2017-04-03 | 1 | -160/+157 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 | Tao Bao | 2017-04-03 | 1 | -160/+157 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." | Tao Bao | 2017-04-03 | 1 | -160/+157 |
| | | |\| | | | |
|
| | | | * | | | | Merge "updater: Keep the parsed parameters in std::unique_ptr." | Tao Bao | 2017-04-03 | 1 | -160/+157 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | updater: Keep the parsed parameters in std::unique_ptr. | Tao Bao | 2017-03-31 | 1 | -160/+157 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8 am: 8dcbd1b399 | Tianjie Xu | 2017-04-02 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8 | Tianjie Xu | 2017-04-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| | * | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
* | | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2 am: 253e223799 -s ours | Tianjie Xu | 2017-04-02 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2 | Tianjie Xu | 2017-04-02 | 0 | -0/+0 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe | Tianjie Xu | 2017-04-02 | 1 | -26/+33 |
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479 -s ours am: bdf8a3106c -s ours | Bill Yi | 2017-04-02 | 0 | -0/+0 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479 -s ours | Bill Yi | 2017-04-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | Bill Yi | 2017-04-02 | 0 | -0/+0 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | TreeHugger Robot | 2017-04-02 | 78 | -312/+390 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-04-02 | 78 | -312/+390 |
* | | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8 | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Use regular check for partition name instead of CHECK()" | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
| | | |\ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | / / /
| | | | | |/ / /
| | | | |/| | | |
|
| | | | * | | | | Merge "Use regular check for partition name instead of CHECK()" | Tianjie Xu | 2017-04-02 | 1 | -3/+4 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Use regular check for partition name instead of CHECK() | Tianjie Xu | 2017-04-01 | 1 | -3/+4 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2 | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Update_verifier should read blocks in EIO mode" | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Update_verifier should read blocks in EIO mode" | Tianjie Xu | 2017-04-01 | 1 | -26/+33 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | Update_verifier should read blocks in EIO mode | Tianjie Xu | 2017-03-31 | 1 | -26/+33 |
* | | | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01 am: 3cf1113021 | Tao Bao | 2017-03-31 | 4 | -110/+199 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01 | Tao Bao | 2017-03-31 | 4 | -110/+199 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 | Tao Bao | 2017-03-31 | 4 | -110/+199 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." | Tao Bao | 2017-03-31 | 4 | -110/+199 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Move parse_range() and range_overlaps() into RangeSet." | Tao Bao | 2017-03-31 | 4 | -110/+199 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Move parse_range() and range_overlaps() into RangeSet. | Tao Bao | 2017-03-31 | 4 | -110/+199 |
* | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 am: d8df5485eb | Tianjie Xu | 2017-03-31 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 | Tianjie Xu | 2017-03-31 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc | Tianjie Xu | 2017-03-31 | 4 | -9/+159 |
* | | | | | | | | | recovery: switch to fs_mgr_read_fstab_default() am: 930247241f | Bowgo Tsai | 2017-03-31 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | recovery: switch to fs_mgr_read_fstab_default() | Bowgo Tsai | 2017-03-31 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | recovery: switch to fs_mgr_read_fstab_default() | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
* | | | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 am: 0e728806f3 am: 18cc5b330a | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 am: 0e728806f3 | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" | Bowgo Tsai | 2017-03-31 | 1 | -2/+2 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | Merge "recovery: switch to fs_mgr_read_fstab_default()" | Treehugger Robot | 2017-03-31 | 1 | -2/+2 |
| | | | |\ \ \ \ \
| | | | | |_|/ / /
| | | | |/| | | | |
|
| | | | | * | | | | recovery: switch to fs_mgr_read_fstab_default() | Bowgo Tsai | 2017-03-29 | 1 | -2/+2 |
* | | | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb am: 7ccb4090d1 am: 8538fab040 | Tao Bao | 2017-03-31 | 1 | -164/+146 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb am: 7ccb4090d1 | Tao Bao | 2017-03-31 | 1 | -164/+146 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb | Tao Bao | 2017-03-31 | 1 | -164/+146 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." | Tao Bao | 2017-03-31 | 1 | -164/+146 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "updater: Move RangeSinkWrite into RangeSinkState." | Tao Bao | 2017-03-31 | 1 | -164/+146 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | updater: Move RangeSinkWrite into RangeSinkState. | Tao Bao | 2017-03-29 | 1 | -164/+146 |
| | | | | |/ / / / |
|
* | | | | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac am: 08224f745c am: f39093d968 | Tao Bao | 2017-03-30 | 2 | -9/+10 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac am: 08224f745c | Tao Bao | 2017-03-30 | 2 | -9/+10 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac | Tao Bao | 2017-03-30 | 2 | -9/+10 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "updater: Don't append newline when calling uiPrint()." | Tao Bao | 2017-03-30 | 2 | -9/+10 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "updater: Don't append newline when calling uiPrint()." | Tao Bao | 2017-03-30 | 2 | -9/+10 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | updater: Don't append newline when calling uiPrint(). | Tao Bao | 2017-03-30 | 2 | -9/+10 |
* | | | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781f am: 4d6f904a88 | Tao Bao | 2017-03-30 | 1 | -4/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781f | Tao Bao | 2017-03-30 | 1 | -4/+0 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d | Tao Bao | 2017-03-30 | 1 | -4/+0 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." | Tao Bao | 2017-03-30 | 1 | -4/+0 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." | Treehugger Robot | 2017-03-30 | 1 | -4/+0 |
| | | | |\ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | | * | | | | | tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES. | Tao Bao | 2017-03-30 | 1 | -4/+0 |
| | | | |/ / / / / |
|
* | | | | | | | | | Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5f am: 57bb313b1e | Dan Shi | 2017-03-30 | 4 | -0/+60 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5f | Dan Shi | 2017-03-30 | 4 | -0/+60 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Add test config to minadbd_test" am: df1a585504 | Dan Shi | 2017-03-30 | 4 | -0/+60 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Add test config to minadbd_test" | Dan Shi | 2017-03-30 | 4 | -0/+60 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Add test config to minadbd_test" | Treehugger Robot | 2017-03-30 | 4 | -0/+60 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Add test config to minadbd_test | Dan Shi | 2017-03-29 | 4 | -0/+60 |
* | | | | | | | | | | update_verifier: raise priority and ioprio and start with exec_start am: beaa39bc23 | Tom Cherry | 2017-03-30 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | update_verifier: raise priority and ioprio and start with exec_start | Tom Cherry | 2017-03-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
| | * | | | | | | | | update_verifier: raise priority and ioprio and start with exec_start | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
* | | | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 am: 8fe39a28b0 am: e404f5d9c8 | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 am: 8fe39a28b0 | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "update_verifier: raise priority and ioprio and start with exec_start" | Treehugger Robot | 2017-03-29 | 2 | -0/+13 |
| | | | |\ \ \ \ \ \
| | | | | |_|_|/ / /
| | | | |/| | | | | |
|
| | | | | * | | | | | update_verifier: raise priority and ioprio and start with exec_start | Tom Cherry | 2017-03-29 | 2 | -0/+13 |
| | | | | | |_|/ /
| | | | | |/| | | |
|
* | | | | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198 am: 23fe20fb6e am: cbc90e5c2c | Tao Bao | 2017-03-29 | 2 | -10/+22 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198 am: 23fe20fb6e | Tao Bao | 2017-03-29 | 2 | -10/+22 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Log the error message when failing to mount/umount." am: 850f89f198 | Tao Bao | 2017-03-29 | 2 | -10/+22 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Log the error message when failing to mount/umount." | Tao Bao | 2017-03-29 | 2 | -10/+22 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "Log the error message when failing to mount/umount." | Tao Bao | 2017-03-29 | 2 | -10/+22 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | Log the error message when failing to mount/umount. | Tao Bao | 2017-03-29 | 2 | -10/+22 |
* | | | | | | | | | | Fix the bad merge (duplicate tests). | Tao Bao | 2017-03-29 | 1 | -45/+0 |
* | | | | | | | | | | resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp | Tao Bao | 2017-03-29 | 1 | -0/+45 |
|\| | | | | | | | | |
|
| * | | | | | | | | | resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp | Tao Bao | 2017-03-29 | 3 | -3/+46 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." am: 3f2d35522a | Tao Bao | 2017-03-29 | 3 | -3/+46 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." | Tao Bao | 2017-03-29 | 3 | -3/+46 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." | Tao Bao | 2017-03-29 | 3 | -3/+46 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | tests: Construct two bad packages at runtime for VerifierTest. | Tao Bao | 2017-03-28 | 3 | -3/+46 |
| | | | | | |/ / / /
| | | | | |/| | | | |
|
* | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0 am: 0a599567ce | Tianjie Xu | 2017-03-29 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0 | Tianjie Xu | 2017-03-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 | Tianjie Xu | 2017-03-29 | 30 | -24/+45 |
* | | | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937 am: 62a4e5ca98 | Tao Bao | 2017-03-29 | 1 | -103/+82 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 am: c6df7d2937 | Tao Bao | 2017-03-29 | 1 | -103/+82 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 | Tao Bao | 2017-03-29 | 1 | -103/+82 |
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." | Tao Bao | 2017-03-29 | 1 | -103/+82 |
| | | |\ \ \ \ \ \ \
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | * | | | | | | Merge "tests: Add a test for --wipe_ab into UncryptTest." | Tao Bao | 2017-03-29 | 1 | -103/+82 |
| | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | tests: Add a test for --wipe_ab into UncryptTest. | Tao Bao | 2017-03-28 | 1 | -103/+82 |
* | | | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b am: 05c111b90b am: 6835d52c7e | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b am: 05c111b90b | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Suppress the unused variable warning in parser.yy" | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Merge "Suppress the unused variable warning in parser.yy" | Treehugger Robot | 2017-03-28 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | Suppress the unused variable warning in parser.yy | Tianjie Xu | 2017-03-28 | 1 | -0/+3 |
| | | | | | |_|/ / / /
| | | | | |/| | | | | |
|
* | | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge "Log temperature during OTA update" am: bc2c51a97f | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge "Log temperature during OTA update" | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Merge "Log temperature during OTA update" | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| | | | |\ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | Log temperature during OTA update | Tianjie Xu | 2017-03-28 | 4 | -9/+159 |
| | | | | |/ / / / / / |
|
* | | | | | | | | | | | Merge "tests: Construct two bad packages at runtime for VerifierTest." | Tao Bao | 2017-03-28 | 3 | -3/+46 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | tests: Construct two bad packages at runtime for VerifierTest. | Tao Bao | 2017-03-28 | 3 | -3/+46 |
| | |_|_|_|_|_|/ / / /
| |/| | | | | | | | | |
|
* | | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 am: 5ec12126f0 | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
|\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / /
| |/| | | | | | | | | |
|
| * | | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9 | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
| | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | Merge "Add the missing sr-Latn into png files and rename the png locale header" | Tianjie Xu | 2017-03-28 | 30 | -24/+45 |
| | | | |\ \ \ \ \ \ \
| | | | | |_|_|_|/ / /
| | | | |/| | | | | | |
|
| | | | | * | | | | | | Add the missing sr-Latn into png files and rename the png locale header | Tianjie Xu | 2017-03-25 | 30 | -24/+45 |
* | | | | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523 am: a2015e0d86 | Tao Bao | 2017-03-28 | 7 | -161/+128 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523 | Tao Bao | 2017-03-28 | 7 | -161/+128 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge changes from topic 'sinkfn' am: 34df98ee6d | Tao Bao | 2017-03-28 | 7 | -161/+128 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | Merge changes from topic 'sinkfn' | Tao Bao | 2017-03-28 | 7 | -161/+128 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Merge changes from topic 'sinkfn' | Treehugger Robot | 2017-03-28 | 7 | -231/+190 |
| | | | |\ \ \ \ \ \ \
| | | | | |_|_|_|/ / /
| | | | |/| | | | | | |
|
| | | | | * | | | | | | applypatch: Let Apply{BSDiff,Image}Patch accept std::function. | Tao Bao | 2017-03-28 | 7 | -161/+128 |
* | | | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941 am: 52569ce2ed | Tao Bao | 2017-03-28 | 7 | -89/+81 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 am: d4d9ef3941 | Tao Bao | 2017-03-28 | 7 | -89/+81 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 | Tao Bao | 2017-03-28 | 7 | -89/+81 |
| | |\| | | | | | | | |
|
| | | * | | | | | | | | applypatch: Change the ssize_t length parameters to size_t. | Tao Bao | 2017-03-28 | 7 | -89/+81 |
| | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | applypatch: Change the ssize_t length parameters to size_t. | Tao Bao | 2017-03-28 | 7 | -89/+81 |
| | | | |/ / / / / / |
|
* | | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d am: 21b5268fbd | Tao Bao | 2017-03-28 | 0 | -0/+0 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| |\| | | | | | | |
| | |_|_|_|/ / / /
| |/| | | | | | | |
|
* | | | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d | Tao Bao | 2017-03-28 | 1 | -146/+143 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| / / / / / / /
| |/ / / / / / / |
|
| * | | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Clean up LoadSrcTgtVersion2()." | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| | | |\ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | | * | | | | updater: Clean up LoadSrcTgtVersion2(). | Tao Bao | 2017-03-28 | 1 | -146/+143 |
| | | | | |/ /
| | | | |/| | |
|
* | | | | | | | Merge "tests: Construct signature-boundary.zip at runtime." | Tao Bao | 2017-03-28 | 2 | -2/+18 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | tests: Construct signature-boundary.zip at runtime. | Tao Bao | 2017-03-27 | 2 | -2/+18 |
* | | | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853 am: b0e768e269 | Tao Bao | 2017-03-27 | 1 | -8/+2 |
|\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853 | Tao Bao | 2017-03-27 | 1 | -8/+2 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" | Tao Bao | 2017-03-27 | 1 | -8/+2 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" | Tao Bao | 2017-03-27 | 1 | -8/+2 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Revert "libbootloader_message: use different fstab paths for normal/recovery boot" | Bowgo Tsai | 2017-03-27 | 1 | -8/+2 |
* | | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours am: a97b0712d8 -s ours | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" | Tianjie Xu | 2017-03-27 | 1 | -5/+9 |
| | | |\ \ \ \ \ \
| | | | |_|_|/ / /
| | | |/| | | | | |
|
| | | | * | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache | Tianjie Xu | 2017-03-26 | 1 | -5/+9 |
| | | | | |_|/ /
| | | | |/| | | |
|
* | | | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache am: 340e6762f8 | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
|\| | | | | | |
| |_|_|_|_|/ /
|/| | | | | | |
|
| * | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache | Tianjie Xu | 2017-03-27 | 0 | -0/+0 |
| |\| | | | | |
|
| | * | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache | Tianjie Xu | 2017-03-27 | 1 | -5/+9 |
* | | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp | Tianjie Xu | 2017-03-27 | 1 | -5/+9 |
|\| | | | | | |
|
| * | | | | | | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp | Tianjie Xu | 2017-03-27 | 1 | -5/+9 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Skip logging the warning for uncrypt_status for devices w/o /cache | Tianjie Xu | 2017-03-26 | 1 | -5/+9 |
* | | | | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 am: 351f69e64a | Tao Bao | 2017-03-26 | 2 | -401/+109 |
|\| | | | | | | |
|
| * | | | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 | Tao Bao | 2017-03-26 | 2 | -401/+109 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| / / / / /
| | |/ / / / / |
|
| | * | | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." | Tao Bao | 2017-03-26 | 2 | -401/+109 |
| | |\| | | | |
|
| | | * | | | | Merge "applypatch: Drop the support for patching non-EMMC targets." | Tao Bao | 2017-03-26 | 2 | -401/+109 |
| | | |\ \ \ \ |
|
| | | | * | | | | applypatch: Drop the support for patching non-EMMC targets. | Tao Bao | 2017-03-16 | 2 | -401/+109 |
* | | | | | | | | Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e am: e102ea13ee | Tianjie Xu | 2017-03-26 | 1 | -1/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e | Tianjie Xu | 2017-03-26 | 1 | -1/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Don't fail ReadArgs if length to parse is 0" | Tianjie Xu | 2017-03-26 | 1 | -1/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Don't fail ReadArgs if length to parse is 0" | Tianjie Xu | 2017-03-26 | 1 | -1/+1 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Don't fail ReadArgs if length to parse is 0 | Tianjie Xu | 2017-03-23 | 1 | -1/+1 |
| | | | | |/ / /
| | | | |/| | | |
|
* | | | | | | | | Merge "updater: Remove some redundant arguments." am: 5212a00588 am: 4ae56a3586 | Tao Bao | 2017-03-26 | 1 | -78/+65 |
|\| | | | | | | |
|
| * | | | | | | | Merge "updater: Remove some redundant arguments." am: 5212a00588 | Tao Bao | 2017-03-26 | 1 | -78/+65 |
| |\| | | | | | |
|
| | * | | | | | | Merge "updater: Remove some redundant arguments." | Tao Bao | 2017-03-26 | 1 | -78/+65 |
| | |\| | | | | |
|
| | | * | | | | | Merge "updater: Remove some redundant arguments." | Tao Bao | 2017-03-26 | 1 | -78/+65 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | updater: Remove some redundant arguments. | Tao Bao | 2017-03-24 | 1 | -78/+65 |
* | | | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e am: 85882b0779 | Bowgo Tsai | 2017-03-25 | 1 | -2/+8 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e | Bowgo Tsai | 2017-03-25 | 1 | -2/+8 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" | Bowgo Tsai | 2017-03-25 | 1 | -2/+8 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "libbootloader_message: use different fstab paths for normal/recovery boot" | Treehugger Robot | 2017-03-25 | 1 | -2/+8 |
| | | |\ \ \ \ \ \
| | | | | |_|_|/ /
| | | | |/| | | | |
|
| | | | * | | | | | libbootloader_message: use different fstab paths for normal/recovery boot | Bowgo Tsai | 2017-03-25 | 1 | -2/+8 |
* | | | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c am: 7b82ad12f6 | Tao Bao | 2017-03-25 | 1 | -398/+330 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c | Tao Bao | 2017-03-25 | 1 | -398/+330 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." | Tao Bao | 2017-03-25 | 1 | -398/+330 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "updater: Drop the support for BBOTA v1 and v2." | Tao Bao | 2017-03-25 | 1 | -398/+330 |
| | | |\ \ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | * | | | | | updater: Drop the support for BBOTA v1 and v2. | Tao Bao | 2017-03-24 | 1 | -398/+330 |
| | | | | |/ / /
| | | | |/| | | |
|
* | | | | | | | | Merge "Const modifiers" am: 4efd353d8f am: 92d8772c49 | Tao Bao | 2017-03-24 | 6 | -11/+11 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Const modifiers" am: 4efd353d8f | Tao Bao | 2017-03-24 | 6 | -11/+11 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Const modifiers" | Tao Bao | 2017-03-24 | 6 | -11/+11 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Const modifiers" | Tao Bao | 2017-03-24 | 6 | -11/+11 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Const modifiers | Mikhail Lappo | 2017-03-23 | 6 | -11/+11 |
* | | | | | | | | | Merge "Removed C-style casts" am: 110155a604 am: 6a831e02b6 | Tao Bao | 2017-03-24 | 3 | -3/+3 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Removed C-style casts" am: 110155a604 | Tao Bao | 2017-03-24 | 3 | -3/+3 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Removed C-style casts" | Tao Bao | 2017-03-24 | 3 | -3/+3 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Removed C-style casts" | Tao Bao | 2017-03-24 | 3 | -3/+3 |
| | | |\| | | | | |
|
| | | | * | | | | | Removed C-style casts | Mikhail Lappo | 2017-03-23 | 3 | -3/+3 |
* | | | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6 am: 5da7e41ec8 | Tao Bao | 2017-03-24 | 1 | -37/+35 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6 | Tao Bao | 2017-03-24 | 1 | -37/+35 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." | Tao Bao | 2017-03-24 | 1 | -37/+35 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Fix the wrong parameter when calling read_metadata_from_package()." | Tao Bao | 2017-03-24 | 1 | -37/+35 |
| | | |\ \ \ \ \ \
| | | | |_|_|/ / /
| | | |/| | | | | |
|
| | | | * | | | | | Fix the wrong parameter when calling read_metadata_from_package(). | Tao Bao | 2017-03-24 | 1 | -37/+35 |
| | | | | |/ / /
| | | | |/| | | |
|
* | | | | | | | | Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 am: eddc9a15f9 | Paul Crowley | 2017-03-24 | 1 | -4/+6 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 | Paul Crowley | 2017-03-24 | 1 | -4/+6 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Reword the wipe warning message to be more comprehensible." | Paul Crowley | 2017-03-24 | 1 | -4/+6 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Reword the wipe warning message to be more comprehensible." | Treehugger Robot | 2017-03-24 | 1 | -4/+6 |
| | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | | * | | | | Reword the wipe warning message to be more comprehensible. | Paul Crowley | 2017-03-23 | 1 | -4/+6 |
| | | |/ / / / |
|
* | | | | | | | Merge "Redundant checking of STL container element" am: b56a3c2e3a am: 9e05f26e1a | Tao Bao | 2017-03-23 | 1 | -3/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "Redundant checking of STL container element" am: b56a3c2e3a | Tao Bao | 2017-03-23 | 1 | -3/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "Redundant checking of STL container element" | Tao Bao | 2017-03-23 | 1 | -3/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "Redundant checking of STL container element" | Tao Bao | 2017-03-23 | 1 | -3/+1 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Redundant checking of STL container element | Mikhail Lappo | 2017-03-23 | 1 | -3/+1 |
* | | | | | | | Merge "Checking unsigned variable less than zero" am: 0d264bf088 am: 957f6491f8 | Tao Bao | 2017-03-23 | 1 | -2/+2 |
|\| | | | | | |
|
| * | | | | | | Merge "Checking unsigned variable less than zero" am: 0d264bf088 | Tao Bao | 2017-03-23 | 1 | -2/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "Checking unsigned variable less than zero" | Tao Bao | 2017-03-23 | 1 | -2/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "Checking unsigned variable less than zero" | Tao Bao | 2017-03-23 | 1 | -2/+2 |
| | | |\| | | |
|
| | | | * | | | Checking unsigned variable less than zero | Mikhail Lappo | 2017-03-23 | 1 | -2/+2 |
* | | | | | | | Merge "Fixed scanf modifier" am: 577c668861 am: d414ae465e | Tao Bao | 2017-03-23 | 1 | -1/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "Fixed scanf modifier" am: 577c668861 | Tao Bao | 2017-03-23 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "Fixed scanf modifier" | Tao Bao | 2017-03-23 | 1 | -1/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "Fixed scanf modifier" | Tao Bao | 2017-03-23 | 1 | -1/+1 |
| | | |\| | | |
|
| | | | * | | | Fixed scanf modifier | Mikhail Lappo | 2017-03-23 | 1 | -1/+1 |
* | | | | | | | Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d am: 923d41ccd5 | Tao Bao | 2017-03-23 | 2 | -1/+50 |
|\| | | | | | |
|
| * | | | | | | Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d | Tao Bao | 2017-03-23 | 2 | -1/+50 |
| |\| | | | | |
|
| | * | | | | | Merge "updater: Fix the broken case for apply_patch_check()." | Tao Bao | 2017-03-23 | 2 | -1/+50 |
| | |\| | | | |
|
| | | * | | | | Merge "updater: Fix the broken case for apply_patch_check()." | Tao Bao | 2017-03-23 | 2 | -1/+50 |
| | | |\ \ \ \ |
|
| | | | * | | | | updater: Fix the broken case for apply_patch_check(). | Tao Bao | 2017-03-23 | 2 | -1/+50 |
| | | | |/ / / |
|
* | | | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e am: ca9c1e0965 | Tao Bao | 2017-03-23 | 1 | -2/+3 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e | Tao Bao | 2017-03-23 | 1 | -2/+3 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." | Tao Bao | 2017-03-23 | 1 | -2/+3 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." | Tao Bao | 2017-03-23 | 1 | -2/+3 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | recovery: Replace the hard-coded 1000 with AID_SYSTEM. | Tao Bao | 2017-03-22 | 1 | -2/+3 |
* | | | | | | | Merge "Remove malloc in edify functions" am: 1ea869b0c6 am: 137d85333e | Tianjie Xu | 2017-03-23 | 9 | -257/+331 |
|\| | | | | | |
|
| * | | | | | | Merge "Remove malloc in edify functions" am: 1ea869b0c6 | Tianjie Xu | 2017-03-23 | 9 | -257/+331 |
| |\| | | | | |
|
| | * | | | | | Merge "Remove malloc in edify functions" | Tianjie Xu | 2017-03-23 | 9 | -257/+331 |
| | |\| | | | |
|
| | | * | | | | Merge "Remove malloc in edify functions" | Tianjie Xu | 2017-03-23 | 9 | -257/+331 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Remove malloc in edify functions | Tianjie Xu | 2017-03-22 | 9 | -257/+331 |
| | | |/ / / |
|
* | | | | | | Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a am: deb2a29a42 | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
|\| | | | | |
|
| * | | | | | Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
| |\| | | | |
|
| | * | | | | Merge "Fix the permission of stashed blocks created by updater" | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
| | |\| | | |
|
| | | * | | | Merge "Fix the permission of stashed blocks created by updater" | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
| | | |\ \ \ |
|
| | | | * | | | Fix the permission of stashed blocks created by updater | Tianjie Xu | 2017-03-22 | 1 | -0/+12 |
* | | | | | | | Merge "Refactor asn1_decoder functions into a class." am: ea3d0b923d am: d7846b7303 | Tao Bao | 2017-03-22 | 4 | -410/+361 |
|\| | | | | | |
|
| * | | | | | | Merge "Refactor asn1_decoder functions into a class." am: ea3d0b923d | Tao Bao | 2017-03-22 | 4 | -410/+361 |
| |\| | | | | |
|
| | * | | | | | Merge "Refactor asn1_decoder functions into a class." | Tao Bao | 2017-03-22 | 4 | -410/+361 |
| | |\| | | | |
|
| | | * | | | | Merge "Refactor asn1_decoder functions into a class." | Tao Bao | 2017-03-22 | 4 | -410/+361 |
| | | |\ \ \ \ |
|
| | | | * | | | | Refactor asn1_decoder functions into a class. | Tao Bao | 2017-03-21 | 4 | -410/+361 |
* | | | | | | | | Merge "Fix updater include generation w/installclean" am: 6d0262218a am: c1cb30f842 | Dan Willemsen | 2017-03-22 | 1 | -16/+4 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Fix updater include generation w/installclean" am: 6d0262218a | Dan Willemsen | 2017-03-22 | 1 | -16/+4 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Fix updater include generation w/installclean" | Dan Willemsen | 2017-03-22 | 1 | -16/+4 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Fix updater include generation w/installclean" | Treehugger Robot | 2017-03-22 | 1 | -16/+4 |
| | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | | * | | | | Fix updater include generation w/installclean | Dan Willemsen | 2017-03-22 | 1 | -16/+4 |
* | | | | | | | | Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13 am: 43bd2c8414 | Tao Bao | 2017-03-21 | 6 | -79/+78 |
|\| | | | | | | |
|
| * | | | | | | | Merge "verify_file: Add constness to a few addresses." am: 5b2bf90e13 | Tao Bao | 2017-03-21 | 6 | -79/+78 |
| |\| | | | | | |
|
| | * | | | | | | Merge "verify_file: Add constness to a few addresses." | Tao Bao | 2017-03-21 | 6 | -79/+78 |
| | |\| | | | | |
|
| | | * | | | | | Merge "verify_file: Add constness to a few addresses." | Tao Bao | 2017-03-21 | 6 | -79/+78 |
| | | |\ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | | * | | | | verify_file: Add constness to a few addresses. | Tao Bao | 2017-03-21 | 6 | -79/+78 |
| | | |/ / / / |
|
* | | | | | | | Merge "Add testcases for load_keys()." am: 110102f37e am: 43f5ad6e90 | Tao Bao | 2017-03-20 | 1 | -0/+57 |
|\| | | | | | |
|
| * | | | | | | Merge "Add testcases for load_keys()." am: 110102f37e | Tao Bao | 2017-03-20 | 1 | -0/+57 |
| |\| | | | | |
|
| | * | | | | | Merge "Add testcases for load_keys()." | Tao Bao | 2017-03-20 | 1 | -0/+57 |
| | |\| | | | |
|
| | | * | | | | Merge "Add testcases for load_keys()." | Tao Bao | 2017-03-20 | 1 | -0/+57 |
| | | |\ \ \ \ |
|
| | | | * | | | | Add testcases for load_keys(). | Tao Bao | 2017-03-18 | 1 | -0/+57 |
* | | | | | | | | Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9 am: b2617e882e | Tao Bao | 2017-03-20 | 3 | -8/+2 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9 | Tao Bao | 2017-03-20 | 3 | -8/+2 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Remove the dead #include's in verifier.cpp." | Tao Bao | 2017-03-20 | 3 | -8/+2 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Remove the dead #include's in verifier.cpp." | Tao Bao | 2017-03-20 | 3 | -8/+2 |
| | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | | * | | | | Remove the dead #include's in verifier.cpp. | Tao Bao | 2017-03-18 | 3 | -8/+2 |
| | | |/ / / / |
|
* | | | | | | | resolve merge conflicts of 90d3f20c to stage-aosp-master am: 553c7bd307 | Tao Bao | 2017-03-18 | 0 | -0/+0 |
|\| | | | | | |
|
| * | | | | | | resolve merge conflicts of 90d3f20c to stage-aosp-master | Tao Bao | 2017-03-18 | 4 | -302/+240 |
| |\| | | | | |
|
| | * | | | | | resolve merge conflicts of 90d3f20c to stage-aosp-master | Tao Bao | 2017-03-18 | 4 | -302/+240 |
| | |\| | | | |
|
| | | * | | | | Merge "Drop the dependency on 'ui' in verify_file()." | Tao Bao | 2017-03-18 | 4 | -297/+235 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Drop the dependency on 'ui' in verify_file(). | Tao Bao | 2017-03-17 | 4 | -297/+235 |
* | | | | | | | Merge "Drop the dependency on 'ui' in verify_file()." | Tao Bao | 2017-03-18 | 4 | -303/+241 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Drop the dependency on 'ui' in verify_file(). | Tao Bao | 2017-03-17 | 4 | -303/+241 |
* | | | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46c am: 9accc96dd1 | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
|\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46c | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | * | | | | | Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | Revert "Revert "Print SHA-1 in hex for corrupted blocks"" | Tianjie Xu | 2017-03-17 | 1 | -6/+140 |
* | | | | | | | | | Merge "Add a test to perform block_image_update" am: 881b08ecd2 am: 5c06706d51 | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "Add a test to perform block_image_update" am: 881b08ecd2 | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "Add a test to perform block_image_update" | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "Add a test to perform block_image_update" | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
| | | |\ \ \ \ \ \
| | | | |_|_|/ / /
| | | |/| | | | | |
|
| | | | * | | | | | Add a test to perform block_image_update | Tianjie Xu | 2017-03-17 | 2 | -6/+123 |
| | | | | |_|/ /
| | | | |/| | | |
|
* | | | | | | | | Merge "Add the missing #include of <functional>." am: dd553d280f am: 965021ab8d | Tao Bao | 2017-03-17 | 2 | -0/+3 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Add the missing #include of <functional>." am: dd553d280f | Tao Bao | 2017-03-17 | 2 | -0/+3 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Add the missing #include of <functional>." | Tao Bao | 2017-03-17 | 2 | -0/+3 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Add the missing #include of <functional>." | Tao Bao | 2017-03-17 | 2 | -0/+3 |
| | | |\ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| | | | * | | | | Add the missing #include of <functional>. | Tao Bao | 2017-03-17 | 2 | -0/+3 |
| | | |/ / / / |
|
* | | | | | | | Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5 am: 91f8574061 | Tianjie Xu | 2017-03-17 | 6 | -197/+133 |
|\| | | | | | |
|
| * | | | | | | Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5 | Tianjie Xu | 2017-03-17 | 6 | -197/+133 |
| |\| | | | | |
|
| | * | | | | | Merge "More cleanup to imgdiff & imgpatch" | Tianjie Xu | 2017-03-17 | 6 | -197/+133 |
| | |\| | | | |
|
| | | * | | | | Merge "More cleanup to imgdiff & imgpatch" | Treehugger Robot | 2017-03-17 | 6 | -197/+133 |
| | | |\ \ \ \ |
|
| | | | * | | | | More cleanup to imgdiff & imgpatch | Tianjie Xu | 2017-03-16 | 6 | -197/+133 |
| | | | |/ / / |
|
* | | | | | | | Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612 am: 8209daeff1 | Tao Bao | 2017-03-17 | 1 | -73/+50 |
|\| | | | | | |
|
| * | | | | | | Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612 | Tao Bao | 2017-03-17 | 1 | -73/+50 |
| |\| | | | | |
|
| | * | | | | | Merge "updater: Minor clean up to EnumerateStash()." | Tao Bao | 2017-03-17 | 1 | -73/+50 |
| | |\| | | | |
|
| | | * | | | | Merge "updater: Minor clean up to EnumerateStash()." | Tao Bao | 2017-03-17 | 1 | -73/+50 |
| | | |\ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | updater: Minor clean up to EnumerateStash(). | Tao Bao | 2017-03-16 | 1 | -73/+50 |
| | | |/ / / |
|
* | | | / / | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" am: 06f6227f1d am: 8acce85be8 | Tao Bao | 2017-03-15 | 1 | -140/+3 |
|\| | | | |
| |_|_|/ /
|/| | | | |
|
| * | | | | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" am: 06f6227f1d | Tao Bao | 2017-03-15 | 1 | -140/+3 |
| |\| | | |
|
| | * | | | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" | Tao Bao | 2017-03-15 | 1 | -140/+3 |
| | |\| | |
|
| | | * | | Merge "Revert "Print SHA-1 in hex for corrupted blocks"" | Tao Bao | 2017-03-15 | 1 | -140/+3 |
| | | |\ \ |
|
| | | | * | | Revert "Print SHA-1 in hex for corrupted blocks" | Tao Bao | 2017-03-15 | 1 | -140/+3 |
| | | |/ / |
|
* | | | | | Merge "updater: Remove some obsoleted functions for file-based OTA." am: 342717d148 am: 000f364c19 | Tao Bao | 2017-03-14 | 2 | -475/+0 |
|\| | | | |
|
| * | | | | Merge "updater: Remove some obsoleted functions for file-based OTA." am: 342717d148 | Tao Bao | 2017-03-14 | 2 | -475/+0 |
| |\| | | |
|
| | * | | | Merge "updater: Remove some obsoleted functions for file-based OTA." | Tao Bao | 2017-03-14 | 2 | -475/+0 |
| | |\| | |
|
| | | * | | Merge "updater: Remove some obsoleted functions for file-based OTA." | Tao Bao | 2017-03-14 | 2 | -475/+0 |
| | | |\ \ |
|
| | | | * | | updater: Remove some obsoleted functions for file-based OTA. | Tao Bao | 2017-03-13 | 2 | -475/+0 |
* | | | | | | Merge "Print SHA-1 in hex for corrupted blocks" am: 59383b383c am: 821592aff4 | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
|\| | | | | |
|
| * | | | | | Merge "Print SHA-1 in hex for corrupted blocks" am: 59383b383c | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
| |\| | | | |
|
| | * | | | | Merge "Print SHA-1 in hex for corrupted blocks" | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
| | |\| | | |
|
| | | * | | | Merge "Print SHA-1 in hex for corrupted blocks" | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Print SHA-1 in hex for corrupted blocks | Tianjie Xu | 2017-03-13 | 1 | -3/+140 |
* | | | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." am: a7211b3c16 am: 6c6861d7c5 | Tao Bao | 2017-03-11 | 2 | -0/+9 |
|\| | | | | |
|
| * | | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." am: a7211b3c16 | Tao Bao | 2017-03-11 | 2 | -0/+9 |
| |\| | | | |
|
| | * | | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." | Tao Bao | 2017-03-11 | 2 | -0/+9 |
| | |\| | | |
|
| | | * | | | Merge "update_verifier: Set the success flag if dm-verity is not enabled." | Tao Bao | 2017-03-11 | 2 | -0/+9 |
| | | |\ \ \ |
|
| | | | * | | | update_verifier: Set the success flag if dm-verity is not enabled. | Tao Bao | 2017-03-11 | 2 | -0/+9 |
| | | |/ / / |
|
* | | | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 am: 1a23257214 | Bowgo Tsai | 2017-03-10 | 4 | -44/+13 |
|\| | | | | |
|
| * | | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 | Bowgo Tsai | 2017-03-10 | 4 | -44/+13 |
| |\| | | | |
|
| | * | | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" | Bowgo Tsai | 2017-03-10 | 4 | -44/+13 |
| | |\| | | |
|
| | | * | | | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" | Treehugger Robot | 2017-03-10 | 4 | -44/+13 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs | Bowgo Tsai | 2017-03-10 | 4 | -44/+13 |
| | | |/ / |
|
* | | | | | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e am: 316610763b | Tao Bao | 2017-03-08 | 1 | -99/+94 |
|\| | | | |
|
| * | | | | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e | Tao Bao | 2017-03-08 | 1 | -99/+94 |
| |\| | | |
|
| | * | | | Merge "recovery: Fix the FIXME in get_menu_selection()." | Tao Bao | 2017-03-08 | 1 | -99/+94 |
| | |\| | |
|
| | | * | | Merge "recovery: Fix the FIXME in get_menu_selection()." | Tao Bao | 2017-03-08 | 1 | -99/+94 |
| | | |\ \ |
|
| | | | * | | recovery: Fix the FIXME in get_menu_selection(). | Tao Bao | 2017-03-08 | 1 | -99/+94 |
* | | | | | | Merge "recovery: Move a few int to bool." am: cbb2bcf541 am: b97f06a5dd | Tao Bao | 2017-03-08 | 3 | -147/+142 |
|\| | | | | |
|
| * | | | | | Merge "recovery: Move a few int to bool." am: cbb2bcf541 | Tao Bao | 2017-03-08 | 3 | -147/+142 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Move a few int to bool." | Tao Bao | 2017-03-08 | 3 | -147/+142 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Move a few int to bool." | Tao Bao | 2017-03-08 | 3 | -147/+142 |
| | | |\| | |
|
| | | | * | | recovery: Move a few int to bool. | Tao Bao | 2017-03-08 | 3 | -147/+142 |
| | | |/ / |
|
* | | | | | Merge "recovery: Add the missing #include." am: b7f56f9b91 am: d988b56999 | Tao Bao | 2017-03-07 | 1 | -0/+2 |
|\| | | | |
|
| * | | | | Merge "recovery: Add the missing #include." am: b7f56f9b91 | Tao Bao | 2017-03-07 | 1 | -0/+2 |
| |\| | | |
|
| | * | | | Merge "recovery: Add the missing #include." | Tao Bao | 2017-03-07 | 1 | -0/+2 |
| | |\| | |
|
| | | * | | Merge "recovery: Add the missing #include." | Tao Bao | 2017-03-07 | 1 | -0/+2 |
| | | |\ \ |
|
| | | | * | | recovery: Add the missing #include. | Tao Bao | 2017-03-07 | 1 | -0/+2 |
| | | |/ / |
|
* | | | | | Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90 am: ecf5467a82 | Tao Bao | 2017-03-07 | 2 | -14/+5 |
|\| | | | |
|
| * | | | | Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90 | Tao Bao | 2017-03-07 | 2 | -14/+5 |
| |\| | | |
|
| | * | | | Merge "recovery: Drop the "--stages" / '-g' argument." | Tao Bao | 2017-03-07 | 2 | -14/+5 |
| | |\| | |
|
| | | * | | Merge "recovery: Drop the "--stages" / '-g' argument." | Tao Bao | 2017-03-07 | 2 | -14/+5 |
| | | |\ \ |
|
| | | | * | | recovery: Drop the "--stages" / '-g' argument. | Tao Bao | 2017-03-07 | 2 | -14/+5 |
* | | | | | | Merge "recovery: Add SetStage() into 'Run graphics test'." am: 1a575f8d5f am: e303128144 | Tao Bao | 2017-03-07 | 1 | -25/+37 |
|\| | | | | |
|
| * | | | | | Merge "recovery: Add SetStage() into 'Run graphics test'." am: 1a575f8d5f | Tao Bao | 2017-03-07 | 1 | -25/+37 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Add SetStage() into 'Run graphics test'." | Tao Bao | 2017-03-07 | 1 | -25/+37 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Add SetStage() into 'Run graphics test'." | Tao Bao | 2017-03-07 | 1 | -25/+37 |
| | | |\ \ \ |
|
| | | | * | | | recovery: Add SetStage() into 'Run graphics test'. | Tao Bao | 2017-03-07 | 1 | -25/+37 |
| | | | |/ / |
|
* | | | | | | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1c am: 4a2bde2d26 | Tao Bao | 2017-03-07 | 1 | -51/+35 |
|\| | | | | |
|
| * | | | | | Merge "recovery: Minor clean up to choose_recovery_file()." am: 73d21d1c1c | Tao Bao | 2017-03-07 | 1 | -51/+35 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Minor clean up to choose_recovery_file()." | Tao Bao | 2017-03-07 | 1 | -51/+35 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Minor clean up to choose_recovery_file()." | Tao Bao | 2017-03-07 | 1 | -51/+35 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | recovery: Minor clean up to choose_recovery_file(). | Tao Bao | 2017-03-07 | 1 | -51/+35 |
| | | |/ / |
|
* | | | | | Merge "Refractor the code for imgdiff" am: a2e7a07031 am: 68571e27d8 | Tianjie Xu | 2017-03-07 | 4 | -618/+653 |
|\| | | | |
|
| * | | | | Merge "Refractor the code for imgdiff" am: a2e7a07031 | Tianjie Xu | 2017-03-07 | 4 | -618/+653 |
| |\| | | |
|
| | * | | | Merge "Refractor the code for imgdiff" | Tianjie Xu | 2017-03-07 | 4 | -618/+653 |
| | |\| | |
|
| | | * | | Merge "Refractor the code for imgdiff" | Treehugger Robot | 2017-03-07 | 4 | -618/+653 |
| | | |\ \ |
|
| | | | * | | Refractor the code for imgdiff | Tianjie Xu | 2017-03-07 | 4 | -618/+653 |
* | | | | | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab am: 536989892c | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
|\| | | | | |
|
| * | | | | | Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
| |\| | | | |
|
| | * | | | | Merge "Fix an error on bootloadermessager test teardown" | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
| | |\| | | |
|
| | | * | | | Merge "Fix an error on bootloadermessager test teardown" | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
| | | |\ \ \ |
|
| | | | * | | | Fix an error on bootloadermessager test teardown | Tianjie Xu | 2017-03-03 | 1 | -2/+4 |
| | | | |/ / |
|
* | | | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4f am: 3d605c54e3 | Wei Wang | 2017-03-03 | 2 | -0/+22 |
|\| | | | | |
|
| * | | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4f | Wei Wang | 2017-03-03 | 2 | -0/+22 |
| |\| | | | |
|
| | * | | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" | Wei Wang | 2017-03-03 | 2 | -0/+22 |
| | |\| | | |
|
| | | * | | | Merge "Recovery Test: add SideloadTest to test FUSE support on target" | Treehugger Robot | 2017-03-03 | 2 | -0/+22 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | Recovery Test: add SideloadTest to test FUSE support on target | Wei Wang | 2017-03-03 | 2 | -0/+22 |
| | | |/ / |
|
* | | | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468eda am: 5cce91a95a | Tianjie Xu | 2017-03-01 | 3 | -3/+111 |
|\| | | | |
|
| * | | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" am: 0f26468eda | Tianjie Xu | 2017-03-01 | 3 | -3/+111 |
| |\| | | |
|
| | * | | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" | Tianjie Xu | 2017-03-01 | 3 | -3/+111 |
| | |\| | |
|
| | | * | | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" | Treehugger Robot | 2017-03-01 | 3 | -3/+111 |
| | | |\ \ |
|
| | | | * | | Skip BootloaderMessageTest, UncryptTest for devices without /misc | Tianjie Xu | 2017-03-01 | 3 | -3/+111 |
* | | | | | | Merge "recovery: Remember the last log position." am: d549616b24 am: 6691dacf56 | Tao Bao | 2017-03-01 | 1 | -1/+2 |
|\| | | | | |
|
| * | | | | | Merge "recovery: Remember the last log position." am: d549616b24 | Tao Bao | 2017-03-01 | 1 | -1/+2 |
| |\| | | | |
|
| | * | | | | Merge "recovery: Remember the last log position." | Tao Bao | 2017-03-01 | 1 | -1/+2 |
| | |\| | | |
|
| | | * | | | Merge "recovery: Remember the last log position." | Tao Bao | 2017-03-01 | 1 | -1/+2 |
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | * | | recovery: Remember the last log position. | Tao Bao | 2017-03-01 | 1 | -1/+2 |
| | | |/ / |
|
* | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-02-28 | 1 | -1/+1 |
* | | | | | Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503a am: 7c77883b06 | Tao Bao | 2017-02-24 | 1 | -1/+0 |
|\| | | | |
|
| * | | | | Merge "recovery: Don't show "No /cache partition found" on screen." am: 021304503a | Tao Bao | 2017-02-24 | 1 | -1/+0 |
| |\| | | |
|
| | * | | | Merge "recovery: Don't show "No /cache partition found" on screen." | Tao Bao | 2017-02-24 | 1 | -1/+0 |
| | |\| | |
|
| | | * | | Merge "recovery: Don't show "No /cache partition found" on screen." | Treehugger Robot | 2017-02-24 | 1 | -1/+0 |
| | | |\ \ |
|
| | | | * | | recovery: Don't show "No /cache partition found" on screen. | Tao Bao | 2017-02-24 | 1 | -1/+0 |
* | | | | | | Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56 am: cdfe2895b4 | Elliott Hughes | 2017-02-24 | 1 | -0/+1 |
|\| | | | | |
|
| * | | | | | Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56 | Elliott Hughes | 2017-02-24 | 1 | -0/+1 |
| |\| | | | |
|
| | * | | | | Merge "Add a missing #include for openat(2)." | Elliott Hughes | 2017-02-24 | 1 | -0/+1 |
| |/| | | |
| | |/ / / |
|
| | * | | | Merge "Add a missing #include for openat(2)." | Elliott Hughes | 2017-02-24 | 1 | -0/+1 |
| | |\ \ \ |
|
| | | * | | | Add a missing #include for openat(2). | Elliott Hughes | 2017-02-23 | 1 | -0/+1 |
| | |/ / / |
|
* | | | | | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49 am: 6f06890343 | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
|\| | | | |
|
| * | | | | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49 | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
| | |\ \ \ \ |
|
| | | * | | | | Merge "Use bspatch from external/bsdiff." | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
| | | |\| | | |
|
| | | | * | | | Merge "Use bspatch from external/bsdiff." | Sen Jiang | 2017-02-16 | 5 | -183/+31 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Use bspatch from external/bsdiff. | Sen Jiang | 2017-02-02 | 5 | -183/+31 |
* | | | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e am: c42d44bbeb am: 19e7776451 | Tao Bao | 2017-02-14 | 1 | -92/+55 |
|\| | | | | | |
|
| * | | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e am: c42d44bbeb | Tao Bao | 2017-02-14 | 1 | -92/+55 |
| |\| | | | | |
|
| | * | | | | | Merge "recovery: Clean up browse_directory()." am: 635eb1c83e | Tao Bao | 2017-02-14 | 1 | -92/+55 |
| | |\| | | | |
|
| | | * | | | | Merge "recovery: Clean up browse_directory()." | Tao Bao | 2017-02-14 | 1 | -92/+55 |
| | | |\| | | |
|
| | | | * | | | Merge "recovery: Clean up browse_directory()." | Tao Bao | 2017-02-14 | 1 | -92/+55 |
| | | | |\ \ \ |
|
| | | | | * | | | recovery: Clean up browse_directory(). | Tao Bao | 2017-02-11 | 1 | -92/+55 |
* | | | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368 am: b8997adc20 | Tao Bao | 2017-02-13 | 8 | -271/+333 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368 | Tao Bao | 2017-02-13 | 8 | -271/+333 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c | Tao Bao | 2017-02-13 | 8 | -271/+333 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." | Tao Bao | 2017-02-13 | 8 | -271/+333 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minui: Move graphics_{adf,drm,fbdev} into classes." | Tao Bao | 2017-02-13 | 8 | -271/+333 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | minui: Move graphics_{adf,drm,fbdev} into classes. | Tao Bao | 2017-02-11 | 8 | -271/+333 |
| | | | |/ / / |
|
* | | | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1 am: 30c164411f | Tao Bao | 2017-02-10 | 1 | -1/+2 |
|\| | | | | | |
|
| * | | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1 | Tao Bao | 2017-02-10 | 1 | -1/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Save errno before calling close()." am: df464dbe79 | Tao Bao | 2017-02-10 | 1 | -1/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Save errno before calling close()." | Tao Bao | 2017-02-10 | 1 | -1/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Save errno before calling close()." | Treehugger Robot | 2017-02-10 | 1 | -1/+2 |
| | | | |\ \ \ |
|
| | | | | * | | | minui: Save errno before calling close(). | Tao Bao | 2017-02-09 | 1 | -1/+2 |
| | | | |/ / / |
|
* | | | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 am: e91a2d23ca am: c441edd1c3 | Tao Bao | 2017-02-09 | 1 | -139/+129 |
|\| | | | | | |
|
| * | | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 am: e91a2d23ca | Tao Bao | 2017-02-09 | 1 | -139/+129 |
| |\| | | | | |
|
| | * | | | | | Merge "minui: Clean up graphics_fbdev.cpp." am: 5121961421 | Tao Bao | 2017-02-09 | 1 | -139/+129 |
| | |\| | | | |
|
| | | * | | | | Merge "minui: Clean up graphics_fbdev.cpp." | Tao Bao | 2017-02-09 | 1 | -139/+129 |
| | | |\| | | |
|
| | | | * | | | Merge "minui: Clean up graphics_fbdev.cpp." | Treehugger Robot | 2017-02-09 | 1 | -139/+129 |
| | | | |\ \ \ |
|
| | | | | * | | | minui: Clean up graphics_fbdev.cpp. | Tao Bao | 2017-02-07 | 1 | -139/+129 |
* | | | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326e am: ffd5c03711 | Tao Bao | 2017-02-09 | 1 | -191/+156 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326e | Tao Bao | 2017-02-09 | 1 | -191/+156 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 | Tao Bao | 2017-02-09 | 1 | -191/+156 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minui: Clean up graphics_adf.cpp." | Tao Bao | 2017-02-09 | 1 | -191/+156 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minui: Clean up graphics_adf.cpp." | Tao Bao | 2017-02-09 | 1 | -191/+156 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | minui: Clean up graphics_adf.cpp. | Tao Bao | 2017-02-07 | 1 | -191/+156 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916 am: ed5ee5292c | Tao Bao | 2017-02-09 | 1 | -351/+297 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916 | Tao Bao | 2017-02-09 | 1 | -351/+297 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 | Tao Bao | 2017-02-09 | 1 | -351/+297 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minui: Clean up graphics_drm.cpp." | Tao Bao | 2017-02-09 | 1 | -351/+297 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minui: Clean up graphics_drm.cpp." | Treehugger Robot | 2017-02-09 | 1 | -351/+297 |
| | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | | |
|
| | | | | * | | | minui: Clean up graphics_drm.cpp. | Tao Bao | 2017-02-07 | 1 | -351/+297 |
| | | | |/ / / |
|
* | | | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2 am: b8af1beed0 | Tao Bao | 2017-02-04 | 6 | -9/+9 |
|\| | | | | | |
|
| * | | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2 | Tao Bao | 2017-02-04 | 6 | -9/+9 |
| |\| | | | | |
|
| | * | | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e | Tao Bao | 2017-02-04 | 6 | -9/+9 |
| | |\| | | | |
|
| | | * | | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." | Tao Bao | 2017-02-04 | 6 | -9/+9 |
| | | |\| | | |
|
| | | | * | | | Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." | Treehugger Robot | 2017-02-04 | 6 | -9/+9 |
| | | | |\ \ \ |
|
| | | | | * | | | Replace _exit(-1) with _exit(EXIT_FAILURE). | Tao Bao | 2017-02-03 | 6 | -9/+9 |
| | | | |/ / / |
|
* | | | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 am: 15ab95bb63 | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
|\| | | | | | |
|
| * | | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
| |\| | | | | |
|
| | * | | | | | Merge "Avoid to call UI functions in child process" am: 0f275ae56e | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
| | |\| | | | |
|
| | | * | | | | Merge "Avoid to call UI functions in child process" | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
| | | |\| | | |
|
| | | | * | | | Merge "Avoid to call UI functions in child process" | Treehugger Robot | 2017-02-03 | 1 | -1/+5 |
| | | | |\ \ \ |
|
| | | | | * | | | Avoid to call UI functions in child process | Tianjie Xu | 2017-02-03 | 1 | -1/+5 |
* | | | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cf am: a8764c46aa | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
|\| | | | | | | |
|
| * | | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cf | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
| |\| | | | | | |
|
| | * | | | | | | Merge "update_verifier should read dm wrapped partition" am: c44c479197 | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
| | |\| | | | | |
|
| | | * | | | | | Merge "update_verifier should read dm wrapped partition" | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
| | | |\| | | | |
|
| | | | * | | | | Merge "update_verifier should read dm wrapped partition" | Tianjie Xu | 2017-02-03 | 1 | -6/+64 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | update_verifier should read dm wrapped partition | Tianjie Xu | 2017-01-26 | 1 | -6/+64 |
| | | | | |/ / / |
|
* | | | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d am: 7d8e13a535 | Tao Bao | 2017-02-03 | 1 | -62/+1 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minui: Minor clean up to graphics.cpp." | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minui: Minor clean up to graphics.cpp." | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | minui: Minor clean up to graphics.cpp. | Tao Bao | 2017-02-03 | 1 | -62/+1 |
| | | | |/ / / |
|
* | | | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7d am: 2be767eba4 | Tao Bao | 2017-02-01 | 1 | -1/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7d | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "Fix a log issue in ui.cpp." | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| | | |\| | | |
|
| | | | * | | | Merge "Fix a log issue in ui.cpp." | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| | | | |\ \ \ |
|
| | | | | * | | | Fix a log issue in ui.cpp. | Tao Bao | 2017-02-01 | 1 | -1/+1 |
| | | | |/ / / |
|
* | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777 am: 1c35b48253 | Tao Bao | 2017-02-01 | 1 | -0/+1 |
|\| | | | | | |
|
| * | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777 | Tao Bao | 2017-02-01 | 1 | -0/+1 |
| |\| | | | | |
|
| | * | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d | Tao Bao | 2017-02-01 | 1 | -0/+1 |
| | |\| | | | |
|
| | | * | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" | Tao Bao | 2017-02-01 | 1 | -0/+1 |
| | | |\| | | |
|
| | | | * | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" | Tao Bao | 2017-02-01 | 1 | -0/+1 |
| | | | |\ \ \ |
|
| | | | | * | | | bootable/recovery: cleanup compiler warnings (potential leak of memory) | Rahul Chaudhry | 2016-12-07 | 1 | -0/+1 |
* | | | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34 am: 79ce31073a | Tao Bao | 2017-01-31 | 2 | -24/+120 |
|\| | | | | | | |
|
| * | | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34 | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| |\| | | | | | |
|
| | * | | | | | | Merge "recovery: Add screensaver mode." am: 389a29193c | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| | |\| | | | | |
|
| | | * | | | | | Merge "recovery: Add screensaver mode." | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| | | |\| | | | |
|
| | | | * | | | | Merge "recovery: Add screensaver mode." | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| | | | |\ \ \ \
| | | | | |_|/ /
| | | | |/| | | |
|
| | | | | * | | | recovery: Add screensaver mode. | Tao Bao | 2017-01-31 | 2 | -24/+120 |
| | | | |/ / / |
|
* | | | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 am: 9518d34c0f | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
|\| | | | | | |
|
| * | | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
| |\| | | | | |
|
| | * | | | | | Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
| | |\| | | | |
|
| | | * | | | | Merge "Remove '_static' suffix from libext2* references." | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
| | | |\| | | |
|
| | | | * | | | Merge "Remove '_static' suffix from libext2* references." | Alex Deymo | 2017-01-26 | 2 | -2/+2 |
| | | | |\ \ \ |
|
| | | | | * | | | Remove '_static' suffix from libext2* references. | Alex Deymo | 2017-01-24 | 2 | -2/+2 |
* | | | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 am: 445f24f712 | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
|\| | | | | | | |
|
| * | | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
| |\| | | | | | |
|
| | * | | | | | | Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
| | |\| | | | | |
|
| | | * | | | | | Merge "Use flash erase & logical block size for userdata wipe" | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
| | | |\| | | | |
|
| | | | * | | | | Merge "Use flash erase & logical block size for userdata wipe" | Treehugger Robot | 2017-01-25 | 1 | -1/+6 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Use flash erase & logical block size for userdata wipe | Connor O'Brien | 2017-01-25 | 1 | -1/+6 |
| | | | |/ / / / |
|
* | | | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 am: 19856bcb2e | Tao Bao | 2017-01-25 | 5 | -129/+115 |
|\| | | | | | | |
|
| * | | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 | Tao Bao | 2017-01-25 | 5 | -129/+115 |
| |\| | | | | | |
|
| | * | | | | | | Merge "minui: Move callback functions to std::function." am: a476312714 | Tao Bao | 2017-01-25 | 5 | -129/+115 |
| | |\| | | | | |
|
| | | * | | | | | Merge "minui: Move callback functions to std::function." | Tao Bao | 2017-01-25 | 5 | -129/+115 |
| | | |\| | | | |
|
| | | | * | | | | Merge "minui: Move callback functions to std::function." | Tao Bao | 2017-01-25 | 5 | -129/+115 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | minui: Move callback functions to std::function. | Tao Bao | 2017-01-23 | 5 | -129/+115 |
* | | | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 am: b30b8cf436 | Tao Bao | 2017-01-25 | 1 | -48/+46 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 | Tao Bao | 2017-01-25 | 1 | -48/+46 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 | Tao Bao | 2017-01-25 | 1 | -48/+46 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." | Tao Bao | 2017-01-25 | 1 | -48/+46 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "update_verifier: Move property_get() to android::base::GetProperty()." | Tao Bao | 2017-01-25 | 1 | -48/+46 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | update_verifier: Move property_get() to android::base::GetProperty(). | Tao Bao | 2017-01-20 | 1 | -48/+46 |
* | | | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d am: 14be4eb8ce | Tao Bao | 2017-01-24 | 3 | -7/+1 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d | Tao Bao | 2017-01-24 | 3 | -7/+1 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Print with newline for ui_print." am: 90deaf9ab7 | Tao Bao | 2017-01-24 | 3 | -7/+1 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Print with newline for ui_print." | Tao Bao | 2017-01-24 | 3 | -7/+1 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Print with newline for ui_print." | Tao Bao | 2017-01-24 | 3 | -7/+1 |
| | | | |\ \ \ \ \ \
| | | | | |_|_|/ / /
| | | | |/| | | | | |
|
| | | | | * | | | | | Print with newline for ui_print. | Tao Bao | 2017-01-22 | 3 | -7/+1 |
| | | | | |/ / / / |
|
* | | | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e am: 58eace4a96 | Chris Phoenix | 2017-01-23 | 0 | -0/+0 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "bootctrl HAL uses "default" service name" | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "bootctrl HAL uses "default" service name" | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | bootctrl HAL uses "default" service name | Chris Phoenix | 2017-01-20 | 1 | -1/+1 |
* | | | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e am: f1a371b1b0 | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| |\| | | | | | | | |
|
| | * | | | | | | | | Merge "Restore the max width for recovery background texts" am: c1df344381 | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| | |\| | | | | | | |
|
| | | * | | | | | | | Merge "Restore the max width for recovery background texts" | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| | | |\| | | | | | |
|
| | | | * | | | | | | Merge "Restore the max width for recovery background texts" | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| | | | |\ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | | * | | | | | Restore the max width for recovery background texts | Tianjie Xu | 2017-01-23 | 11 | -0/+3 |
| | | | |/ / / / / |
|
* | | | | | | | | | Merge "bootctrl HAL uses "default" service name" | Chris Phoenix | 2017-01-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | bootctrl HAL uses "default" service name | Chris Phoenix | 2017-01-21 | 1 | -1/+1 |
* | | | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 am: 6a82bc228a | Tao Bao | 2017-01-20 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| / / / / / / / /
| |/ / / / / / / / |
|
| * | | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| | |\| | | | | | |
|
| | | * | | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| | | |\| | | | | |
|
| | | | * | | | | | Merge "imgpatch: Compile with ZLIB_CONST defined." | Tao Bao | 2017-01-20 | 2 | -4/+10 |
| | | | |\ \ \ \ \
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | | * | | | | imgpatch: Compile with ZLIB_CONST defined. | Tao Bao | 2017-01-20 | 2 | -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: e4dcbd1c9e | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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: 87f49b83ca | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -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 | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | | | * \ \ \ \ \ | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev | Tianjie Xu | 2017-01-20 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | | | | * | | | | | | DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev | Tianjie Xu | 2017-01-20 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6 am: f859652e5f | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6 | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "imgdiff: cache bsdiff suffix array in zip mode." | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | imgdiff: cache bsdiff suffix array in zip mode. | Sen Jiang | 2017-01-19 | 2 | -16/+20 |
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb am: 18098b7de3 | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Add checkers and tests for empty locale in PNG file" | Tianjie Xu | 2017-01-19 | 5 | -3/+177 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | Add checkers and tests for empty locale in PNG file | Tianjie Xu | 2017-01-19 | 5 | -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-aosp | Tianjie Xu | 2017-01-19 | 0 | -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-aosp | Android Build Merger (Role) | 2017-01-19 | 0 | -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: 4aa56ad477 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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: de530474e9 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | |_|_|/ / / /
| | | | | | | | | | | | |/| | | | | | |
|
| | | | | | | | | | | | * | | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | |_|_|/ / /
| | | | | | | | | | | | | |/| | | | | |
|
| | | | | | | | | | | | | * | | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | |_|_|/ /
| | | | | | | | | | | | | | |/| | | | |
|
| | | | | | | | | | | | | | * | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ \ |
|
| | | | | | | | | | | | | | | * \ \ \ \ | DO NOT MERGE: Add a checker for signature boundary in verifier | Tianjie Xu | 2017-01-18 | 1 | -0/+7 |
| | | | | | | | | | | | | | | |\ \ \ \ \ |
|
| | | | | | | | | | | | | | | | * | | | | | DO NOT MERGE: Add a checker for signature boundary in verifier | Tianjie Xu | 2016-12-20 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21 am: 97ea844aca | Tianjie Xu | 2017-01-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21 | Tianjie Xu | 2017-01-19 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | resolve build error when merging 0f7f7e21 | Tianjie Xu | 2017-01-19 | 1 | -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-aosp | Tianjie Xu | 2017-01-19 | 0 | -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-aosp | Android Build Merger (Role) | 2017-01-18 | 0 | -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: f127896675 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-18 | 1 | -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 | Tianjie Xu | 2017-01-18 | 1 | -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: 8a45adb243 | Tianjie Xu | 2017-01-19 | 0 | -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 | Tianjie Xu | 2017-01-18 | 1 | -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 | Tianjie Xu | 2017-01-18 | 1 | -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 | Tianjie Xu | 2017-01-18 | 1 | -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 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |/ / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |/ / / / / / / / / / / / / /
| | | | | | |/| | | | | | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |/ / / / / / / / / / / / /
| | | | | | | |/| | | | | | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | |/ / / / / / / / / / / /
| | | | | | | | |/| | | | | | | | | | | | |
|
| | | | | | | | * | | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |/ / / / / / / / / / /
| | | | | | | | | |/| | | | | | | | | | | |
|
| | | | | | | | | * | | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |/ / / / / / / / / /
| | | | | | | | | | |/| | | | | | | | | | |
|
| | | | | | | | | | * | | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |/ / / / / / / / /
| | | | | | | | | | | |/| | | | | | | | | |
|
| | | | | | | | | | | * | | | | | | | | | | Add a checker for signature boundary in verifier am: 54ea136fde | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |/ / / / / / / /
| | | | | | | | | | | | |/| | | | | | | | |
|
| | | | | | | | | | | | * | | | | | | | | | Add a checker for signature boundary in verifier | Tianjie Xu | 2017-01-18 | 1 | -0/+6 |
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | | | |/| | | | | | | |
|
| | | | | | | | | | | | | * | | | | | | | | Add a checker for signature boundary in verifier | Tianjie Xu | 2016-12-17 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397 am: 54890af615 | Tao Bao | 2017-01-17 | 11 | -22/+45 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397 | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." am: 13d15af08f | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "minui: Export minui/minui.h." | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | minui: Export minui/minui.h. | Tao Bao | 2017-01-17 | 11 | -22/+45 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d am: 81bffbda89 | Tao Bao | 2017-01-14 | 2 | -82/+78 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d | Tao Bao | 2017-01-14 | 2 | -82/+78 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 | Tao Bao | 2017-01-14 | 2 | -82/+78 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." | Tao Bao | 2017-01-14 | 2 | -82/+78 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "recovery: Move property_get() to android::base::GetProperty()." | Tao Bao | 2017-01-14 | 2 | -82/+78 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | recovery: Move property_get() to android::base::GetProperty(). | Tao Bao | 2017-01-13 | 2 | -82/+78 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 am: e05674f93e | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" am: f0af02fea6 | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Update background text images in recovery" | Tianjie Xu | 2017-01-14 | 26 | -2/+20 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Update background text images in recovery | Tianjie Xu | 2017-01-07 | 26 | -2/+20 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Rename language+country resources to just language" | Roozbeh Pournader | 2017-01-13 | 30 | -270/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | Rename language+country resources to just language | Roozbeh Pournader | 2017-01-11 | 30 | -0/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 am: a1e336d548 | Alex Deymo | 2017-01-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 | Alex Deymo | 2017-01-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb | Alex Deymo | 2017-01-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' | Alex Deymo | 2017-01-12 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge changes from topic 'host_suffix_cleanup' | Alex Deymo | 2017-01-12 | 3 | -6/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a am: 9e93a79f4c | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse am: 67f3aa8804 | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libsparse | Alex Deymo | 2017-01-11 | 3 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 am: 9edd655f94 | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. am: 31653660ad | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. | Alex Deymo | 2017-01-12 | 3 | -3/+3 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Remove "_static" suffix from libext4_utils. | Alex Deymo | 2017-01-11 | 3 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2017-01-12 | 30 | -0/+270 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 am: 7d345f27e7 | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Do not inject I/O fault on a retry" | Tianjie Xu | 2017-01-10 | 3 | -4/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Do not inject I/O fault on a retry | Tianjie Xu | 2017-01-09 | 3 | -4/+6 |
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda am: ac431948d3 | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." am: 77ec0071cf | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Address review comment." | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Address review comment." | Elliott Hughes | 2017-01-10 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Address review comment. | Elliott Hughes | 2017-01-09 | 1 | -1/+1 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8 am: 6ac5db29db | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8 | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Move to .md files for even trivial documentation." | Elliott Hughes | 2017-01-09 | 1 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Move to .md files for even trivial documentation. | Elliott Hughes | 2017-01-07 | 1 | -0/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c am: b7ce9c5e00 | Tao Bao | 2017-01-09 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." am: 33808f16c5 | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing." | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | recovery: Fix the argument parsing. | Tao Bao | 2017-01-09 | 1 | -2/+2 |
| | | | | | |/ / / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70 am: 5ec75851a7 | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
|\| | | | | | | | | | | | | | | | | | | | | | |
| |_|_|_|_|_|/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70 | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Retry ioctl in uncrypt if it returns block# 0" | Tianjie Xu | 2017-01-07 | 1 | -1/+40 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Retry ioctl in uncrypt if it returns block# 0 | Tianjie Xu | 2016-12-05 | 1 | -1/+40 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af am: af53db6ba0 | Tao Bao | 2017-01-06 | 1 | -145/+166 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af | Tao Bao | 2017-01-06 | 1 | -145/+166 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb | Tao Bao | 2017-01-06 | 1 | -145/+166 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." | Tao Bao | 2017-01-06 | 1 | -145/+166 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up try_update_binary() in install.cpp." | Treehugger Robot | 2017-01-06 | 1 | -145/+166 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | recovery: Clean up try_update_binary() in install.cpp. | Tao Bao | 2017-01-06 | 1 | -145/+166 |
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b am: ba0dad8828 | Tao Bao | 2017-01-06 | 1 | -0/+50 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for show_progress() and set_progress()." | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add testcase for show_progress() and set_progress(). | Tao Bao | 2017-01-06 | 1 | -0/+50 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187 am: fbb5dbb471 | Tao Bao | 2017-01-05 | 1 | -83/+84 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187 | Tao Bao | 2017-01-05 | 1 | -83/+84 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." am: 91f74c82cd | Tao Bao | 2017-01-05 | 1 | -83/+84 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." | Tao Bao | 2017-01-05 | 1 | -83/+84 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Clean up CreateStash()." | Tao Bao | 2017-01-05 | 1 | -83/+84 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | updater: Clean up CreateStash(). | Tao Bao | 2016-12-29 | 1 | -84/+85 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 am: e513c0f2ac | Tao Bao | 2017-01-04 | 3 | -15/+91 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 | Tao Bao | 2017-01-04 | 3 | -15/+91 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b | Tao Bao | 2017-01-04 | 3 | -15/+91 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." | Tao Bao | 2017-01-04 | 3 | -15/+91 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Fix an edge case that leads to infinite loop." | Tao Bao | 2017-01-04 | 3 | -15/+91 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | imgdiff: Fix an edge case that leads to infinite loop. | Tao Bao | 2016-12-28 | 3 | -15/+91 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed am: e477a54c8d | Jerry Zhang | 2017-01-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | Write aliases before ffs mount in recovery | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 am: 3806993e25 | Tao Bao | 2017-01-04 | 9 | -236/+244 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 | Tao Bao | 2017-01-04 | 9 | -236/+244 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." am: 56fc8fa376 | Tao Bao | 2017-01-04 | 9 | -236/+244 |
| | |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." | Tao Bao | 2017-01-04 | 9 | -236/+244 |
| | | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the broken UI text." | Tao Bao | 2017-01-04 | 9 | -236/+244 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | recovery: Fix the broken UI text. | Tao Bao | 2017-01-04 | 9 | -236/+244 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Write aliases before ffs mount in recovery" | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | Write aliases before ffs mount in recovery | Jerry Zhang | 2017-01-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b am: cb9c4fc4fb | Tao Bao | 2017-01-04 | 1 | -74/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
|/| / / / / / / / / / / / / / / / / / / / / / / / /
| |/ / / / / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." am: 466e1b396a | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| | |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| | | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor parse_range()." | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | updater: Refactor parse_range(). | Tao Bao | 2017-01-04 | 1 | -74/+63 |
| | | | |/ / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000 am: 83317083c8 | Tao Bao | 2017-01-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000 | Tao Bao | 2017-01-04 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 | Tao Bao | 2017-01-04 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" | Tao Bao | 2017-01-04 | 1 | -2/+4 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Remove outdated reference to icon_installing.png" | Tao Bao | 2017-01-04 | 1 | -2/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png | Tim Kryger | 2017-01-04 | 1 | -2/+4 |
| | | | | | |/ / / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5 am: c025f145cb | Tao Bao | 2017-01-04 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5 | Tao Bao | 2017-01-04 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 | Tao Bao | 2017-01-04 | 1 | -2/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." | Tao Bao | 2017-01-04 | 1 | -2/+2 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Update the header name for bootloader.h." | Tao Bao | 2017-01-04 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Update the header name for bootloader.h. | Tao Bao | 2016-12-29 | 1 | -2/+2 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 am: 1b29658702 | Tao Bao | 2016-12-28 | 2 | -3/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Don't expose FindMatchingPatch()." | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | applypatch: Don't expose FindMatchingPatch(). | Tao Bao | 2016-12-28 | 2 | -3/+2 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed am: 4e2471d6dd | Tao Bao | 2016-12-28 | 8 | -266/+812 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed | Tao Bao | 2016-12-28 | 8 | -266/+812 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." am: 344c8eb453 | Tao Bao | 2016-12-28 | 8 | -266/+812 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." | Tao Bao | 2016-12-28 | 8 | -266/+812 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add tests for imgdiff." | Tao Bao | 2016-12-28 | 8 | -266/+812 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Add tests for imgdiff. | Tao Bao | 2016-12-20 | 8 | -266/+812 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d am: 7f0f49dd2b | Tao Bao | 2016-12-23 | 2 | -0/+151 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d | Tao Bao | 2016-12-23 | 2 | -0/+151 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 | Tao Bao | 2016-12-23 | 2 | -0/+151 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." | Tao Bao | 2016-12-23 | 2 | -0/+151 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add test coverage for DirUtil." | Tao Bao | 2016-12-23 | 2 | -0/+151 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | tests: Add test coverage for DirUtil. | Tao Bao | 2016-12-22 | 2 | -0/+151 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d am: ef801f9a62 | Tao Bao | 2016-12-22 | 2 | -8/+16 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Replace the O_RDONLY in access(2)." | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | tests: Replace the O_RDONLY in access(2). | Tao Bao | 2016-12-22 | 2 | -8/+16 |
| | | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e am: 830ab1c482 | Tao Bao | 2016-12-22 | 2 | -1/+193 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcase for ZipUtil." | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | tests: Add testcase for ZipUtil. | Tao Bao | 2016-12-22 | 2 | -1/+193 |
| | | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 am: 11e9af909d | Paul Crowley | 2016-12-22 | 1 | -12/+52 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 | Paul Crowley | 2016-12-22 | 1 | -12/+52 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 | Paul Crowley | 2016-12-22 | 1 | -12/+52 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." | Paul Crowley | 2016-12-22 | 1 | -12/+52 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Support a "ask before wiping" boot flag." | Treehugger Robot | 2016-12-22 | 1 | -12/+52 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Support a "ask before wiping" boot flag. | Paul Crowley | 2016-12-21 | 1 | -12/+52 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add a checker for signature boundary in verifier" | Tianjie Xu | 2016-12-19 | 3 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | Add a checker for signature boundary in verifier | Tianjie Xu | 2016-12-17 | 3 | -1/+8 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 am: 88bd5d59de | Tao Bao | 2016-12-19 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / /
|/| / / / / / / / / / / / / / / / / / / / / /
| |/ / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 | Tao Bao | 2016-12-19 | 1 | -0/+11 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 | Tao Bao | 2016-12-19 | 1 | -0/+11 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." | Tao Bao | 2016-12-19 | 1 | -0/+11 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." | Tao Bao | 2016-12-19 | 1 | -0/+11 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Bugfix:updater always retry apply patch failed,when memcpy failed. | katao | 2016-12-19 | 1 | -0/+11 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png am: 48be23c8ed am: 14bdbb6c77 -s ours | Tim Kryger | 2016-12-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png am: 48be23c8ed | Tim Kryger | 2016-12-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png | Tim Kryger | 2016-12-15 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 910c83b915 | Tim Kryger | 2016-12-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp | Tim Kryger | 2016-12-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp | TreeHugger Robot | 2016-12-16 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp am: a5876e43f7 | Tim Kryger | 2016-12-16 | 1 | -2/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp | Tim Kryger | 2016-12-16 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp | Tim Kryger | 2016-12-15 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Remove outdated reference to icon_installing.png | Tim Kryger | 2016-11-29 | 1 | -2/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef am: cb15594696 | Tao Bao | 2016-12-16 | 4 | -12/+65 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef | Tao Bao | 2016-12-16 | 4 | -12/+65 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 | Tao Bao | 2016-12-16 | 4 | -12/+65 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." | Tao Bao | 2016-12-15 | 4 | -12/+65 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Add update_bootloader_message() to fix two-step OTAs." | Tao Bao | 2016-12-15 | 4 | -12/+65 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Add update_bootloader_message() to fix two-step OTAs. | Tao Bao | 2016-12-15 | 4 | -12/+65 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec am: 870b87dfc8 | Tao Bao | 2016-12-16 | 2 | -0/+140 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b am: 7f3ada54ec | Tao Bao | 2016-12-16 | 2 | -0/+140 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." am: 07d985b75b | Tao Bao | 2016-12-16 | 2 | -0/+140 |
| | |\| | | | | | | | | | | | | | | | | | | |
| | | |_|/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." | Tao Bao | 2016-12-15 | 2 | -0/+140 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Add tests for bootloader_message." | Tao Bao | 2016-12-15 | 2 | -0/+140 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add tests for bootloader_message. | Tao Bao | 2016-12-15 | 2 | -0/+140 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc am: ef45a88680 | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf am: 2f8f6ec0fc | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." am: 8c1584feaf | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Add a stub recovery UI." | Sen Jiang | 2016-12-14 | 9 | -17/+102 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Add a stub recovery UI. | Sen Jiang | 2016-12-13 | 9 | -17/+102 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8 am: e97575e7ae | Tao Bao | 2016-12-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8 | Tao Bao | 2016-12-14 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." am: 2bb3a2270e | Tao Bao | 2016-12-14 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." | Tao Bao | 2016-12-14 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix the operator order." | Treehugger Robot | 2016-12-14 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Fix the operator order. | Tao Bao | 2016-12-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0b am: 1871a2feeb | Tao Bao | 2016-12-14 | 3 | -26/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 am: 527f08ed0b | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." am: 833ecb03f2 | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Remove the obsolete comments for firmware update." | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Remove the obsolete comments for firmware update. | Tao Bao | 2016-12-14 | 3 | -26/+4 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08 am: b1e8150c44 | Tao Bao | 2016-12-14 | 3 | -1/+177 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 am: af62097c08 | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." am: 4e48a6c1a1 | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Add tests for setup-bcb and clear-bcb via uncrypt." | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Add tests for setup-bcb and clear-bcb via uncrypt. | Tao Bao | 2016-12-14 | 3 | -1/+177 |
| | | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b am: 495478e853 | Tao Bao | 2016-12-14 | 1 | -95/+85 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up the log saving while wiping." | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | recovery: Clean up the log saving while wiping. | Tao Bao | 2016-12-13 | 1 | -95/+85 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a am: 01afbb8f29 | Tao Bao | 2016-12-13 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a | Tao Bao | 2016-12-13 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb | Tao Bao | 2016-12-13 | 1 | -1/+2 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." | Tao Bao | 2016-12-13 | 1 | -1/+2 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "clang-format: Adjust short functions / if settings." | Tao Bao | 2016-12-13 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | clang-format: Adjust short functions / if settings. | Tao Bao | 2016-12-13 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 am: 1b321e43e1 | Tao Bao | 2016-12-13 | 2 | -9/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 | Tao Bao | 2016-12-13 | 2 | -9/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 | Tao Bao | 2016-12-13 | 2 | -9/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" | Tao Bao | 2016-12-13 | 2 | -9/+2 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" | Tao Bao | 2016-12-13 | 2 | -9/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Revert "write_bootloader_message(<options>) should not reset stage field." | Tao Bao | 2016-12-13 | 2 | -9/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a am: ff77b42d66 | Tao Bao | 2016-12-10 | 1 | -21/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be am: cbb044239a | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." am: 594dc4f5be | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | recovery: Remove obsolete code that supports "CACHE:foo" format. | Tao Bao | 2016-12-10 | 1 | -21/+1 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c am: d8ce8fa609 | Tao Bao | 2016-12-09 | 2 | -2/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c | Tao Bao | 2016-12-09 | 2 | -2/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d | Tao Bao | 2016-12-09 | 2 | -2/+9 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." | Tao Bao | 2016-12-09 | 2 | -2/+9 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "write_bootloader_message(<options>) should not reset stage field." | Tao Bao | 2016-12-09 | 2 | -2/+9 |
| | | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | write_bootloader_message(<options>) should not reset stage field. | Tao Bao | 2016-12-06 | 2 | -2/+9 |
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| | | | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 am: d4ceb1fb64 | Tao Bao | 2016-12-09 | 1 | -2/+5 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Fix the argument parsing from COMMAND_FILE." | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | recovery: Fix the argument parsing from COMMAND_FILE. | Tao Bao | 2016-12-09 | 1 | -2/+5 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 am: dd9c5674df | Tao Bao | 2016-12-06 | 1 | -80/+70 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 | Tao Bao | 2016-12-06 | 1 | -80/+70 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." am: 3aadbbac39 | Tao Bao | 2016-12-06 | 1 | -80/+70 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." | Tao Bao | 2016-12-06 | 1 | -80/+70 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "recovery: Clean up get_args()." | Tao Bao | 2016-12-06 | 1 | -80/+70 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | recovery: Clean up get_args(). | Tao Bao | 2016-12-05 | 1 | -80/+70 |
| | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" | Bill Yi | 2016-12-05 | 81 | -0/+729 |
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-12-03 | 81 | -729/+0 |
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b am: 997ccbc5a4 | Tao Bao | 2016-12-02 | 3 | -993/+994 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b | Tao Bao | 2016-12-02 | 3 | -993/+994 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." am: d2c56629ab | Tao Bao | 2016-12-02 | 3 | -993/+994 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." | Tao Bao | 2016-12-02 | 3 | -993/+994 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "updater: Switch to libbase logging." | Tao Bao | 2016-12-02 | 3 | -993/+994 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | updater: Switch to libbase logging. | Tao Bao | 2016-12-01 | 3 | -993/+994 |
* | | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 am: bd8f34190c | Tao Bao | 2016-12-01 | 1 | -0/+16 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 | Tao Bao | 2016-12-01 | 1 | -0/+16 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 | Tao Bao | 2016-12-01 | 1 | -0/+16 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" | Tao Bao | 2016-12-01 | 1 | -0/+16 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (unused value)" | Tao Bao | 2016-12-01 | 1 | -0/+16 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | bootable/recovery: cleanup compiler warnings (unused value) | Rahul Chaudhry | 2016-11-30 | 1 | -0/+16 |
| | | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix inconsistent code." | Tao Bao | 2016-12-01 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | updater: Fix inconsistent code. | Tao Bao | 2016-12-01 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58 am: 83b649ee1d | Tao Bao | 2016-11-30 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / /
|/| / / / / / / / / / / / / / / / / / / / /
| |/ / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58 | Tao Bao | 2016-11-30 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 | Tao Bao | 2016-11-30 | 1 | -0/+4 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" | Tao Bao | 2016-11-30 | 1 | -0/+4 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" | Tao Bao | 2016-11-30 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | bootable/recovery: cleanup compiler warnings (potential leak of memory) | Rahul Chaudhry | 2016-11-16 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 am: 95beb966e2 | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" am: 1528def46e | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Switch update verifier to HIDL HAL" | Connor O'Brien | 2016-11-30 | 2 | -15/+21 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Switch update verifier to HIDL HAL | Connor O'Brien | 2016-11-21 | 2 | -15/+21 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd am: 8762a560fc | Tao Bao | 2016-11-29 | 4 | -89/+93 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd | Tao Bao | 2016-11-29 | 4 | -89/+93 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 | Tao Bao | 2016-11-29 | 4 | -89/+93 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." | Tao Bao | 2016-11-29 | 4 | -89/+93 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Remove ota_close(int) and ota_fclose(FILE*)." | Tao Bao | 2016-11-29 | 4 | -89/+93 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Remove ota_close(int) and ota_fclose(FILE*). | Tao Bao | 2016-11-28 | 4 | -89/+93 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3 am: 6a8e0eb164 | Tao Bao | 2016-11-29 | 3 | -9/+25 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3 | Tao Bao | 2016-11-29 | 3 | -9/+25 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf | Tao Bao | 2016-11-29 | 3 | -9/+25 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." | Tao Bao | 2016-11-29 | 3 | -9/+25 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." | Tao Bao | 2016-11-29 | 3 | -9/+25 |
| | | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&). | Tao Bao | 2016-11-23 | 3 | -9/+25 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da am: 5e52ac31d4 | Tao Bao | 2016-11-29 | 1 | -31/+144 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da | Tao Bao | 2016-11-29 | 1 | -31/+144 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." am: d226f28e87 | Tao Bao | 2016-11-29 | 1 | -31/+144 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." | Tao Bao | 2016-11-29 | 1 | -31/+144 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Add testcases for EMMC targets." | Tao Bao | 2016-11-29 | 1 | -31/+144 |
| | | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | tests: Add testcases for EMMC targets. | Tao Bao | 2016-11-22 | 1 | -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 ours | Andriy Naborskyy | 2016-11-23 | 0 | -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 ours | Andriy Naborskyy | 2016-11-23 | 0 | -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 | Andriy Naborskyy | 2016-11-23 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function. am: 1bf1772625 -s ours | Tao Bao | 2016-11-22 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function. | Tao Bao | 2016-11-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE updater: Add "write_value()" function. | Tao Bao | 2016-11-18 | 1 | -1/+28 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d am: b4aae79230 | Tao Bao | 2016-11-21 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d | Tao Bao | 2016-11-21 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 | Tao Bao | 2016-11-21 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." | Tao Bao | 2016-11-21 | 1 | -5/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Release FD when explicitly calling close." | Treehugger Robot | 2016-11-21 | 1 | -5/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | applypatch: Release FD when explicitly calling close. | Tao Bao | 2016-11-21 | 1 | -5/+5 |
| | | | | | |_|/ / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85 am: 5713071c81 | Tao Bao | 2016-11-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85 | Tao Bao | 2016-11-21 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f | Tao Bao | 2016-11-21 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" | Tao Bao | 2016-11-21 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Fail gracefully when we fail to fork the update binary" | Tao Bao | 2016-11-21 | 1 | -0/+8 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-11-21 | 1 | -0/+8 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours am: 92ac9041c1 -s ours | Bill Yi | 2016-11-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours | Bill Yi | 2016-11-21 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | Bill Yi | 2016-11-21 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | TreeHugger Robot | 2016-11-21 | 78 | -312/+390 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours am: 8d7399f553 -s ours | Bill Yi | 2016-11-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours | Bill Yi | 2016-11-21 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-11-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-11-21 | 78 | -312/+390 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b am: 4cbedcc679 | Tao Bao | 2016-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| / / / / / / / / / / / / / / / / /
| | | | |/ / / / / / / / / / / / / / / / / |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "Call update_engine_sideload from recovery." | Tao Bao | 2016-11-20 | 2 | -39/+186 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery. | Alex Deymo | 2016-11-20 | 2 | -39/+186 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e am: 062a2cffb3 | Tao Bao | 2016-11-20 | 6 | -91/+193 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e | Tao Bao | 2016-11-20 | 6 | -91/+193 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 | Tao Bao | 2016-11-20 | 6 | -91/+193 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." | Tao Bao | 2016-11-20 | 6 | -91/+193 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Refactor set_stage() and get_stage() functions." | Tao Bao | 2016-11-20 | 6 | -91/+193 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | updater: Refactor set_stage() and get_stage() functions. | Tao Bao | 2016-11-18 | 6 | -91/+193 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c am: 9f4d385704 | Tao Bao | 2016-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master | Tao Bao | 2016-11-20 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master | Tao Bao | 2016-11-20 | 1 | -2/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. am: 5422d80961 am: ca64fa7bb9 | Tao Bao | 2016-11-20 | 1 | -2/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. am: 5422d80961 | Tao Bao | 2016-11-20 | 1 | -2/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. | Tao Bao | 2016-11-20 | 1 | -2/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | update_verifier: Sync Android.mk with aosp-master. | Tao Bao | 2016-11-19 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. am: fbde508ace am: 52b4d869b0 | Tao Bao | 2016-11-19 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. am: fbde508ace | Tao Bao | 2016-11-19 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. | Tao Bao | 2016-11-19 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | bootloader_message: Remove the no-op blank line. | Tao Bao | 2016-11-19 | 1 | -1/+0 |
| | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp am: 692e95aa87 | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" am: 7206ec7a1d | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa am: b5cf492040 | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" | Connor O'Brien | 2016-11-18 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" | Connor O'Brien | 2016-11-18 | 2 | -21/+15 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-18 | 2 | -21/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | Skip this change on AOSP. | Yifan Hong | 2016-11-18 | 0 | -0/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad am: 9b1a791e3c | Tao Bao | 2016-11-18 | 3 | -17/+119 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add testcase for package_extract_dir()." | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Add testcase for package_extract_dir(). | Tao Bao | 2016-11-18 | 3 | -17/+119 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Convert update_verifier to boot HIDL HAL"" | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Revert "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-18 | 2 | -25/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30 am: 776ea9b464 | Tao Bao | 2016-11-18 | 2 | -282/+280 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30 | Tao Bao | 2016-11-18 | 2 | -282/+280 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc | Tao Bao | 2016-11-18 | 2 | -282/+280 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." | Tao Bao | 2016-11-18 | 2 | -282/+280 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Use unique_fd to avoid leaking FDs." | Tao Bao | 2016-11-18 | 2 | -282/+280 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | applypatch: Use unique_fd to avoid leaking FDs. | Tao Bao | 2016-11-17 | 2 | -282/+280 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9 am: 29dc892c07 | Tao Bao | 2016-11-18 | 2 | -3/+64 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9 | Tao Bao | 2016-11-18 | 2 | -3/+64 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." am: d00046b691 | Tao Bao | 2016-11-18 | 2 | -3/+64 |
| | |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." | Tao Bao | 2016-11-18 | 2 | -3/+64 |
| | | |\| | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add "write_value()" function." | Tao Bao | 2016-11-18 | 2 | -3/+64 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | | updater: Add "write_value()" function. | Tao Bao | 2016-11-17 | 2 | -3/+64 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f am: c43acc9938 | Tao Bao | 2016-11-17 | 1 | -283/+257 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Clean up LoadPartitionContents()." | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | | applypatch: Clean up LoadPartitionContents(). | Tao Bao | 2016-11-17 | 1 | -283/+257 |
| | | | | |/ / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s ours am: 97f6af8d34 -s ours | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s ours | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | |_|_|_|_|/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-17 | 2 | -15/+21 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | |/| | / / / / / / / / / / / / / / / / /
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL | Connor O'Brien | 2016-11-16 | 2 | -15/+21 |
| | | | | | |_|_|/ / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL am: 86199a47e1 | Connor O'Brien | 2016-11-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL | Connor O'Brien | 2016-11-17 | 2 | -15/+25 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL | Connor O'Brien | 2016-11-17 | 2 | -15/+25 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee am: 6a6e54da04 | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary uses of reinterpret_cast." | Treehugger Robot | 2016-11-16 | 2 | -3/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Remove unnecessary uses of reinterpret_cast. | Rahul Chaudhry | 2016-11-16 | 2 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Convert update_verifier to boot HIDL HAL" | Connor O'Brien | 2016-11-16 | 2 | -15/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Convert update_verifier to boot HIDL HAL | Connor O'Brien | 2016-11-16 | 2 | -15/+25 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad am: b8c4ae9f80 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad | Tao Bao | 2016-11-16 | 6 | -29/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c | Tao Bao | 2016-11-16 | 6 | -29/+29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." | Tao Bao | 2016-11-16 | 6 | -29/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." | Tao Bao | 2016-11-16 | 6 | -29/+29 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap. | Rahul Chaudhry | 2016-11-16 | 6 | -29/+29 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 am: 7563bad2ac | Tao Bao | 2016-11-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 4f86f26 to stage-aosp-master | Tao Bao | 2016-11-16 | 6 | -137/+197 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix the wrong return value for package_extract_file()." | Tao Bao | 2016-11-16 | 6 | -137/+197 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file(). | Tao Bao | 2016-11-15 | 6 | -137/+197 |
| | | | | | |/ / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 am: 2e55280df2 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge changes from topic 'minui-cherrypick' | Tao Bao | 2016-11-16 | 5 | -67/+93 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15b am: 9c29567c67 | Damien Bargiacchi | 2016-11-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15b | Damien Bargiacchi | 2016-11-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: 97eda9db70 | Damien Bargiacchi | 2016-11-16 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font | Damien Bargiacchi | 2016-11-16 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font | Damien Bargiacchi | 2016-11-16 | 2 | -8/+16 |
* | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 am: 7f0a56dbf1 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5d34d7 to stage-aosp-master | Tao Bao | 2016-11-16 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Support use of custom fonts in miniui | Damien Bargiacchi | 2016-11-15 | 5 | -65/+83 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | / / / / / / / / / / / / / / / / | updater: Fix the wrong return value for package_extract_file(). am: 2274e57f67 | Tao Bao | 2016-11-16 | 6 | -137/+197 |
|\| | | | | | | | | | | | | | | | | | | |
| |_|_|_|/ / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file(). | Tao Bao | 2016-11-16 | 6 | -137/+197 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | updater: Fix the wrong return value for package_extract_file(). | Tao Bao | 2016-11-16 | 6 | -137/+197 |
* | | | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea am: db50f8863a | Tao Bao | 2016-11-14 | 1 | -0/+14 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea | Tao Bao | 2016-11-14 | 1 | -0/+14 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." am: b76960c984 | Tao Bao | 2016-11-14 | 1 | -0/+14 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." | Tao Bao | 2016-11-14 | 1 | -0/+14 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Add .clang-format style file." | Tao Bao | 2016-11-14 | 1 | -0/+14 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | Add .clang-format style file. | Tao Bao | 2016-11-07 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493 am: 0f81984970 | Tao Bao | 2016-11-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493 | Tao Bao | 2016-11-14 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 | Tao Bao | 2016-11-14 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." | Tao Bao | 2016-11-14 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "Fix "ordered comparison between pointer and zero"." | Tao Bao | 2016-11-14 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | Fix "ordered comparison between pointer and zero". | MinSeong Kim | 2016-11-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 am: 91f736fe1a | Tianjie Xu | 2016-11-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 | Tianjie Xu | 2016-11-12 | 1 | -2/+18 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 | Tianjie Xu | 2016-11-12 | 1 | -2/+18 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" | Tianjie Xu | 2016-11-12 | 1 | -2/+18 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" | Tianjie Xu | 2016-11-12 | 1 | -2/+18 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Allow uncrypt to work without socket communication | Tianjie Xu | 2016-11-11 | 1 | -2/+18 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe am: 62aaba5a3f | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add 'reboot bootloader' to bootloader_message." | Treehugger Robot | 2016-11-10 | 2 | -0/+22 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Add 'reboot bootloader' to bootloader_message. | Vineela Tummalapalli | 2016-11-10 | 2 | -0/+22 |
| | | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." | TreeHugger Robot | 2016-11-10 | 6 | -30/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap. | Rahul Chaudhry | 2016-11-09 | 6 | -30/+30 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 am: b86af2577c | Tianjie Xu | 2016-11-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 | Tianjie Xu | 2016-11-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours | Tianjie Xu | 2016-11-10 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" | Tianjie Xu | 2016-11-10 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" | Tianjie Xu | 2016-11-10 | 2 | -12/+128 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Touch blocks in care_map in update_verifier | Tianjie Xu | 2016-11-09 | 2 | -12/+128 |
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c am: 7da0c7e439 | Tao Bao | 2016-11-09 | 2 | -26/+56 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add more testcase for symlink()." | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | updater: Add more testcase for symlink(). | Tao Bao | 2016-11-09 | 2 | -26/+56 |
| | | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 am: d9d435cd83 | Tao Bao | 2016-11-09 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 | Tao Bao | 2016-11-09 | 2 | -12/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." am: b80d136dca | Tao Bao | 2016-11-09 | 2 | -12/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." | Tao Bao | 2016-11-09 | 2 | -12/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." | Tao Bao | 2016-11-09 | 2 | -12/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | otautil: Clean up obsolete includes. | Tao Bao | 2016-11-08 | 2 | -12/+1 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up obsolete includes." | Tao Bao | 2016-11-09 | 2 | -12/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | otautil: Clean up obsolete includes. | Tao Bao | 2016-11-08 | 2 | -12/+0 |
| | |_|_|_|/ / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "healthd: change how charger is launched in recovery." | Sandeep Patil | 2016-11-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | healthd: change how charger is launched in recovery. | Sandeep Patil | 2016-11-01 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 am: 260573b3c2 | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Make make_parent() to take const argument" | Treehugger Robot | 2016-11-08 | 2 | -19/+49 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Make make_parent() to take const argument | Tianjie Xu | 2016-11-08 | 2 | -19/+49 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 am: a1c121e034 | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Move recovery_test.cpp out of unit test" | Treehugger Robot | 2016-11-08 | 4 | -92/+112 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | Move recovery_test.cpp out of unit test | Tianjie Xu | 2016-11-08 | 4 | -92/+112 |
| | | | |/ / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d am: 5d52303488 | Tao Bao | 2016-11-08 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d | Tao Bao | 2016-11-08 | 4 | -200/+349 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master | Tao Bao | 2016-11-08 | 4 | -200/+349 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 70172d7 to stage-aosp-master | Tao Bao | 2016-11-08 | 4 | -200/+349 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "otautil: Clean up SysUtil.cpp." | Tao Bao | 2016-11-08 | 4 | -195/+344 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | otautil: Clean up SysUtil.cpp. | Tao Bao | 2016-11-07 | 4 | -195/+344 |
| | | | |/ / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | otautil: Clean up SysUtil.cpp. | Tao Bao | 2016-11-08 | 4 | -201/+350 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 am: a99c6eab22 | Tao Bao | 2016-11-07 | 1 | -59/+50 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 | Tao Bao | 2016-11-07 | 1 | -59/+50 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 | Tao Bao | 2016-11-07 | 1 | -59/+50 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." | Tao Bao | 2016-11-07 | 1 | -59/+50 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "tests: Fix unit/zip_test.cpp." | Tao Bao | 2016-11-07 | 1 | -59/+50 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | tests: Fix unit/zip_test.cpp. | Tao Bao | 2016-11-04 | 1 | -59/+50 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e am: 8269eb0d1f | Tao Bao | 2016-11-04 | 2 | -1/+33 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e | Tao Bao | 2016-11-04 | 2 | -1/+33 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df | Tao Bao | 2016-11-04 | 2 | -1/+33 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." | Tao Bao | 2016-11-04 | 2 | -1/+33 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "updater: Add a testcase for RenameFn()." | Tao Bao | 2016-11-04 | 2 | -1/+33 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | updater: Add a testcase for RenameFn(). | Tao Bao | 2016-11-04 | 2 | -1/+33 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 am: 92097726ef | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Cleanup the duplicates of logs rotation functions" | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | Cleanup the duplicates of logs rotation functions | Tianjie Xu | 2016-11-04 | 6 | -182/+178 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9 am: 786b083b8e | Tao Bao | 2016-11-04 | 2 | -9/+46 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9 | Tao Bao | 2016-11-04 | 2 | -9/+46 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 | Tao Bao | 2016-11-04 | 2 | -9/+46 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." | Tao Bao | 2016-11-04 | 2 | -9/+46 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix a bug in DeleteFn()." | Tao Bao | 2016-11-04 | 2 | -9/+46 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | updater: Fix a bug in DeleteFn(). | Tao Bao | 2016-11-04 | 2 | -9/+46 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac am: b9c3411de7 | Tao Bao | 2016-11-04 | 7 | -70/+69 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac | Tao Bao | 2016-11-04 | 7 | -70/+69 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 | Tao Bao | 2016-11-04 | 7 | -70/+69 |
| | |\| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" | Tao Bao | 2016-11-04 | 7 | -70/+69 |
| | | |\| | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Some cleanups to recovery.""" | Tao Bao | 2016-11-04 | 7 | -70/+69 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | Revert "Revert "Some cleanups to recovery."" | Tao Bao | 2016-11-03 | 7 | -70/+69 |
| | | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f am: 4098285e8c | Tao Bao | 2016-11-04 | 2 | -6/+59 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f | Tao Bao | 2016-11-04 | 2 | -6/+59 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 | Tao Bao | 2016-11-04 | 2 | -6/+59 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." | Tao Bao | 2016-11-04 | 2 | -6/+59 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "updater: Fix an off-by-1 bug in file_getprop()." | Tao Bao | 2016-11-04 | 2 | -6/+59 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | updater: Fix an off-by-1 bug in file_getprop(). | Tao Bao | 2016-11-03 | 2 | -6/+59 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4bef am: f35ce240a1 | Tao Bao | 2016-11-03 | 4 | -31/+23 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a am: a98b4e4bef | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "tests: Set up testdata path for continuous native tests." | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | tests: Set up testdata path for continuous native tests. | Tao Bao | 2016-11-03 | 4 | -31/+23 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac am: 24356d778f | Tao Bao | 2016-11-02 | 11 | -287/+426 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac | Tao Bao | 2016-11-02 | 11 | -287/+426 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 | Tao Bao | 2016-11-02 | 11 | -287/+426 |
| | |\| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." | Tao Bao | 2016-11-02 | 11 | -287/+426 |
| | | |\| | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Add testcases for applypatch executable." | Treehugger Robot | 2016-11-02 | 11 | -287/+426 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | applypatch: Add testcases for applypatch executable. | Tao Bao | 2016-11-01 | 11 | -287/+426 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54 am: 0b6085a341 | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54 | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
| | |\| | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
| | | |\| | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | Merge "Cleanup ReadArgs & ReadValueArgs usage" | Tianjie Xu | 2016-11-02 | 4 | -632/+424 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | Cleanup ReadArgs & ReadValueArgs usage | Tianjie Xu | 2016-11-01 | 4 | -632/+424 |
| | | | |/ / / / / / / / / / / / / / / / / |
|
* | | | | / / / / / / / / / / / / / / / / | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 am: edf2928edf | Tao Bao | 2016-11-01 | 5 | -152/+162 |
|\| | | | | | | | | | | | | | | | | | | |
| |_|_|_|/ / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 | Tao Bao | 2016-11-01 | 5 | -152/+162 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef | Tao Bao | 2016-11-01 | 5 | -152/+162 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." | Tao Bao | 2016-11-01 | 5 | -152/+162 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "applypatch: Switch the parameter of Value** to std::vector." | Tao Bao | 2016-11-01 | 5 | -152/+162 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | applypatch: Switch the parameter of Value** to std::vector. | Tao Bao | 2016-10-29 | 5 | -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 ours | Andriy Naborskyy | 2016-10-27 | 0 | -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 ours | Andriy Naborskyy | 2016-10-27 | 0 | -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 | Andriy Naborskyy | 2016-10-27 | 0 | -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 | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | |/| | | | | | | | | | | | | | | | |
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|/ / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |_|_|/ / / / / / / / / /
| | | | | | |/| | | | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init | Andriy Naborskyy | 2016-10-27 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |_|_|/ / / / / / / / /
| | | | | | | |/| | | | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | | | DO NOT MERGE ANYWHERE init: move healthd to late-init | Andriy Naborskyy | 2016-10-25 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923 am: 3456ee19f9 | Dan Albert | 2016-10-27 | 7 | -63/+70 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923 | Dan Albert | 2016-10-27 | 7 | -63/+70 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 | Dan Albert | 2016-10-27 | 7 | -63/+70 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" | Dan Albert | 2016-10-27 | 7 | -63/+70 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|/ / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Revert "Some cleanups to recovery."" | Treehugger Robot | 2016-10-27 | 7 | -63/+70 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Revert "Some cleanups to recovery." | Dan Albert | 2016-10-27 | 7 | -63/+70 |
* | | | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 am: 05c68a8775 | Tao Bao | 2016-10-27 | 7 | -70/+63 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 | Tao Bao | 2016-10-27 | 7 | -70/+63 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." am: 46fb0a6a6f | Tao Bao | 2016-10-27 | 7 | -70/+63 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." | Tao Bao | 2016-10-27 | 7 | -70/+63 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Some cleanups to recovery." | Treehugger Robot | 2016-10-27 | 7 | -70/+63 |
| | | | |\| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | Some cleanups to recovery. | Tao Bao | 2016-10-26 | 7 | -70/+63 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305 am: 74851d8191 | Tao Bao | 2016-10-26 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305 | Tao Bao | 2016-10-26 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 | Tao Bao | 2016-10-26 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" | Tao Bao | 2016-10-26 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Skip update-on-boot for bootreason in blacklist" | Tao Bao | 2016-10-26 | 2 | -14/+41 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist | Tianjie Xu | 2016-10-26 | 2 | -14/+41 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db am: ab526b1246 | Tao Bao | 2016-10-26 | 1 | -1/+12 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "tests: Generate testdata for 2nd arch." | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | tests: Generate testdata for 2nd arch. | Tao Bao | 2016-10-26 | 1 | -1/+12 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e am: 6d9f8993b0 | Tao Bao | 2016-10-25 | 1 | -2/+3 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| |/| | | | | | | | | | | | | | | | |
| | |/ / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "applypatch: Fix the bug when constructing VAL_BLOB." | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | applypatch: Fix the bug when constructing VAL_BLOB. | Tao Bao | 2016-10-25 | 1 | -2/+3 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipng am: 2f2c723d1b | Damien Bargiacchi | 2016-10-20 | 455 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipng | Damien Bargiacchi | 2016-10-20 | 455 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Shrink all recovery loop images with zopflipng | Damien Bargiacchi | 2016-10-20 | 455 | -0/+0 |
* | | | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3 am: a866b12c2d | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3 | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." | Treehugger Robot | 2016-10-19 | 6 | -204/+140 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Verify wipe package when wiping A/B device in recovery. | Yabin Cui | 2016-10-19 | 6 | -204/+140 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" am: 06603c76c5 am: d7d7f3c792 | Tianjie Xu | 2016-10-19 | 1 | -0/+5 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" am: 06603c76c5 | Tianjie Xu | 2016-10-19 | 1 | -0/+5 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" | Tianjie Xu | 2016-10-19 | 1 | -0/+5 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Add a unit test for applypatch_check" | Treehugger Robot | 2016-10-19 | 1 | -0/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Add a unit test for applypatch_check | Tianjie Xu | 2016-10-19 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 am: 7691800c2e | Tianjie Xu | 2016-10-19 | 1 | -29/+13 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 | Tianjie Xu | 2016-10-19 | 1 | -29/+13 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" | Tianjie Xu | 2016-10-19 | 1 | -29/+13 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Clean up bootloader_message usage in recovery" | Treehugger Robot | 2016-10-19 | 1 | -29/+13 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Clean up bootloader_message usage in recovery | Tianjie Xu | 2016-10-19 | 1 | -29/+13 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 am: ece0b68ca6 | Tianjie Xu | 2016-10-19 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 | Tianjie Xu | 2016-10-19 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" | Tianjie Xu | 2016-10-19 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Fix applypatch_check failure when applying update on angler" | Tianjie Xu | 2016-10-19 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Fix applypatch_check failure when applying update on angler | Tianjie Xu | 2016-10-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." am: 7c95fe10de am: 83e4e6d35c | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." am: 7c95fe10de | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." | Yabin Cui | 2016-10-19 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Fix bootloader_message." | Treehugger Robot | 2016-10-19 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | Fix bootloader_message. | Yabin Cui | 2016-10-19 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-master am: 69c117c2ff | Tao Bao | 2016-10-19 | 1 | -5/+6 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-master | Tao Bao | 2016-10-19 | 1 | -5/+6 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of e89bf25 to stage-aosp-master | Tao Bao | 2016-10-19 | 1 | -5/+6 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Create bootloader_message static library." | Tao Bao | 2016-10-18 | 8 | -207/+354 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | Create bootloader_message static library. | Yabin Cui | 2016-10-18 | 8 | -207/+354 |
| | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 434697f to master | Tianjie Xu | 2016-10-19 | 34 | -2342/+472 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 6fba98c to stage-aosp-master | Tianjie Xu | 2016-10-19 | 34 | -2345/+476 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of 6fba98c to stage-aosp-master | Tianjie Xu | 2016-10-18 | 34 | -2345/+476 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Replace minzip with libziparchive" | Tianjie Xu | 2016-10-18 | 33 | -2322/+448 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Replace minzip with libziparchive | Tianjie Xu | 2016-10-18 | 33 | -2322/+448 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" am: 2b17b24ae5 am: 430b7ae469 | Tianjie Xu | 2016-10-18 | 16 | -528/+505 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" am: 2b17b24ae5 | Tianjie Xu | 2016-10-18 | 16 | -528/+505 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" | Tianjie Xu | 2016-10-18 | 16 | -528/+505 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Change StringValue to use std::string" | Treehugger Robot | 2016-10-18 | 16 | -528/+505 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Change StringValue to use std::string | Tianjie Xu | 2016-10-15 | 16 | -528/+505 |
* | | | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" am: a01ffc73ef am: 4de11bb370 | Tao Bao | 2016-10-17 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" am: a01ffc73ef | Tao Bao | 2016-10-17 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" | Tao Bao | 2016-10-17 | 1 | -1/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "init: move healthd to late-init" | Tao Bao | 2016-10-17 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | init: move healthd to late-init | Andriy Naborskyy | 2016-10-11 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-master am: ddf293aa0c | Tao Bao | 2016-10-15 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-master | Tao Bao | 2016-10-15 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 08d0ae9 to stage-aosp-master | Tao Bao | 2016-10-15 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Fix the prefix matching for uncrypt status." | Treehugger Robot | 2016-10-15 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status. | Tao Bao | 2016-10-14 | 1 | -2/+2 |
| | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status. | Tao Bao | 2016-10-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status. | Tao Bao | 2016-10-14 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Fix the prefix matching for uncrypt status. | Tao Bao | 2016-10-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca am: bd16939bbf | Tao Bao | 2016-10-13 | 8 | -98/+70 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "edify: Some clean-ups to libedify." am: c5b4b71913 | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "edify: Some clean-ups to libedify." | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | edify: Some clean-ups to libedify. | Tao Bao | 2016-10-13 | 8 | -98/+70 |
| | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd am: aa9f017ceb | Tao Bao | 2016-10-12 | 2 | -43/+55 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd | Tao Bao | 2016-10-12 | 2 | -43/+55 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 | Tao Bao | 2016-10-12 | 2 | -43/+55 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." | Tao Bao | 2016-10-12 | 2 | -43/+55 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "updater: Kill the duplicate PrintSha1() in install.cpp." | Tao Bao | 2016-10-12 | 2 | -43/+55 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | updater: Kill the duplicate PrintSha1() in install.cpp. | Tao Bao | 2016-10-11 | 2 | -43/+55 |
| | | | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0 am: 44864a75ed | Tao Bao | 2016-10-11 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0 | Tao Bao | 2016-10-11 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." am: a7995d7581 | Tao Bao | 2016-10-11 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." | Tao Bao | 2016-10-11 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Refactor libupdater into a seperate module." | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 am: 8ff7cd20ba | Tao Bao | 2016-10-11 | 9 | -85/+196 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. am: 0c7839ac14 | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Refactor libupdater into a seperate module. | Tao Bao | 2016-10-11 | 9 | -85/+196 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815 am: 514dc15399 | Tao Bao | 2016-10-11 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815 | Tao Bao | 2016-10-11 | 4 | -11/+5 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." am: 2bd94433f8 | Tao Bao | 2016-10-10 | 4 | -11/+5 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." | Tao Bao | 2016-10-10 | 4 | -11/+5 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." | Tao Bao | 2016-10-10 | 4 | -11/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Update the header path for ext4_utils. | Tao Bao | 2016-10-09 | 4 | -11/+5 |
* | | | | | | | | | | | | | | | | | | | | Merge "Update the header path for ext4_utils." | Tao Bao | 2016-10-10 | 4 | -11/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | Update the header path for ext4_utils. | Tao Bao | 2016-10-07 | 4 | -11/+5 |
* | | | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd am: 5ceada5bea | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" am: b330559fb6 | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | Merge "No longer need android/log.h" | Mark Salyzyn | 2016-10-10 | 1 | -1/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | No longer need android/log.h | Mark Salyzyn | 2016-10-07 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-10-09 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
| |_|_|_|_|/ / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-10-09 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B." am: aa4924cab1 | Tao Bao | 2016-10-09 | 2 | -14/+44 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B." | Tao Bao | 2016-10-09 | 2 | -14/+44 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Disable the meaningless parts of the UI for A/B." | Tao Bao | 2016-10-09 | 2 | -14/+44 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. | Elliott Hughes | 2016-10-09 | 2 | -14/+44 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 713ad36 to master | Tao Bao | 2016-10-05 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773 am: 6674f22a2f | Tao Bao | 2016-10-05 | 5 | -86/+55 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773 | Tao Bao | 2016-10-05 | 5 | -86/+55 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." | Tao Bao | 2016-10-05 | 5 | -86/+55 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "edify: Move State.script and State.errmsg to std::string." | Treehugger Robot | 2016-10-05 | 5 | -86/+55 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | edify: Move State.script and State.errmsg to std::string. | Tao Bao | 2016-10-04 | 5 | -86/+55 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | edify: Move State.script and State.errmsg to std::string. | Tao Bao | 2016-10-05 | 5 | -86/+55 |
* | | | | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f am: 0467a905cc | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" am: 38b923ff6c | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "recovery: drop log/logger.h" | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | recovery: drop log/logger.h | Mark Salyzyn | 2016-10-04 | 2 | -2/+0 |
* | | | | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 am: bace857dbb | Tao Bao | 2016-10-04 | 5 | -227/+267 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." am: 0bc2df1696 | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| | | |\| | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "edify: Move the testcases to gtest." | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | edify: Move the testcases to gtest. | Tao Bao | 2016-10-04 | 5 | -227/+267 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-09-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-09-30 | 11 | -13/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Turn on -Werror for recovery | Tianjie Xu | 2016-09-30 | 11 | -13/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Turn on -Werror for recovery | Tianjie Xu | 2016-09-30 | 11 | -13/+27 |
* | | | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 am: dbde5cf1d5 -s ours | Tianjie Xu | 2016-09-30 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 | Tianjie Xu | 2016-09-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| / / / / / / / / / / / / / / / / /
| | |/ / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" am: 695ef7cacc | Tianjie Xu | 2016-09-30 | 10 | -13/+28 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" | Tianjie Xu | 2016-09-30 | 10 | -13/+28 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Turn on -Werror for recovery" | Tianjie Xu | 2016-09-30 | 10 | -13/+28 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Turn on -Werror for recovery | Tianjie Xu | 2016-09-30 | 10 | -13/+28 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-09-29 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp | TreeHugger Robot | 2016-09-29 | 3 | -25/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Report uncrypt errors in details | Tianjie Xu | 2016-09-29 | 3 | -25/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Report uncrypt errors in details | Tianjie Xu | 2016-09-29 | 3 | -25/+14 |
* | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 am: 4c53af080d -s ours | Tianjie Xu | 2016-09-29 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 | Tianjie Xu | 2016-09-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | / / / / / / / / / / / / / /
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details | Tianjie Xu | 2016-09-29 | 3 | -40/+75 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE Report uncrypt errors in details | Tianjie Xu | 2016-09-29 | 3 | -40/+75 |
* | | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61 am: fc887a8fba | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61 | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" am: af8b9363c6 | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Report uncrypt errors in details" | Treehugger Robot | 2016-09-27 | 3 | -41/+88 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Report uncrypt errors in details | Tianjie Xu | 2016-09-27 | 3 | -41/+88 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE Duplicate the last_install content into last_log. | Tao Bao | 2016-09-27 | 2 | -39/+41 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | DO NOT MERGE Duplicate the last_install content into last_log. | Tao Bao | 2016-09-27 | 2 | -39/+41 |
* | | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fb am: 5ac819a51f am: c064b01898 | Tao Bao | 2016-09-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fb am: 5ac819a51f | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." am: 95afc912fb | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." | Tao Bao | 2016-09-27 | 2 | -38/+42 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. am: f4885adc18 | Tao Bao | 2016-09-27 | 2 | -38/+42 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. | Tao Bao | 2016-09-27 | 2 | -38/+42 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. | Tao Bao | 2016-09-26 | 2 | -38/+42 |
* | | | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aosp | Tao Bao | 2016-09-27 | 2 | -38/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Duplicate the last_install content into last_log. | Tao Bao | 2016-09-27 | 2 | -38/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Duplicate the last_install content into last_log. | Tao Bao | 2016-09-26 | 2 | -38/+41 |
* | | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-09-26 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| / / / / / / / / / / / / / / / / / /
| | |/ / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>." am: cc02f9652f | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>." | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "Switch to <android-base/properties.h>." | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | Switch to <android-base/properties.h>. | Elliott Hughes | 2016-09-26 | 8 | -49/+40 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-09-26 | 1 | -0/+8 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-09-21 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | Switch to <android-base/properties.h>. | Elliott Hughes | 2016-09-24 | 8 | -49/+40 |
* | | | | | | | | | | | | | | | | | | | Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067" | Matthew Bouyack | 2016-09-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067" | Matthew Bouyack | 2016-09-21 | 1 | -8/+0 |
* | | | | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067 | Matthew Bouyack | 2016-09-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-09-20 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | DO NOT MERGE Fail gracefully when we fail to fork the update binary | Matthew Bouyack | 2016-09-20 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file am: 41a3fd4e20 am: 914f39d2d3 | Tianjie Xu | 2016-09-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file am: 41a3fd4e20 | Tianjie Xu | 2016-09-14 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file | Tianjie Xu | 2016-09-13 | 1 | -0/+2 |
* | | | | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 am: 1d55666106 | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" | Tianjie Xu | 2016-09-14 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Check corruption when reading uncrypt_status file" | Treehugger Robot | 2016-09-14 | 1 | -0/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Check corruption when reading uncrypt_status file | Tianjie Xu | 2016-09-13 | 1 | -0/+2 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-dev am: 7a97733f7a | Damien Bargiacchi | 2016-09-13 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-dev | Damien Bargiacchi | 2016-09-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Have gr_init_font alloc memory for the font" into cw-f-dev | Damien Bargiacchi | 2016-09-13 | 2 | -8/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font am: d00f5eb63a | Damien Bargiacchi | 2016-09-13 | 2 | -8/+16 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font | Damien Bargiacchi | 2016-09-13 | 2 | -8/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Have gr_init_font alloc memory for the font | Damien Bargiacchi | 2016-09-09 | 2 | -8/+16 |
* | | | | | | | | | | | | | | | | | | | | save uncrypt status to last_install am: e16e799dfd am: 4769f209dc | Tianjie Xu | 2016-09-13 | 2 | -0/+34 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | save uncrypt status to last_install am: e16e799dfd | Tianjie Xu | 2016-09-13 | 2 | -0/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | save uncrypt status to last_install | Tianjie Xu | 2016-09-13 | 2 | -0/+34 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | save uncrypt status to last_install | Tianjie Xu | 2016-09-13 | 2 | -0/+34 |
| | | | |_|_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10 am: 86ea1724ae -s ours | Tianjie Xu | 2016-09-13 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10 | Tianjie Xu | 2016-09-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" am: cdf509cce2 | Tianjie Xu | 2016-09-13 | 2 | -1/+34 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" | Tianjie Xu | 2016-09-13 | 2 | -1/+34 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "save uncrypt status to last_install" | Tianjie Xu | 2016-09-13 | 2 | -1/+34 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | save uncrypt status to last_install | Tianjie Xu | 2016-09-13 | 2 | -1/+34 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-09-10 | 2 | -54/+6 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-09-09 | 2 | -54/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Remove duplicate thread loop | Damien Bargiacchi | 2016-09-09 | 2 | -54/+6 |
| | | |_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Remove debug log statement; fix build am: 43d186021a | Damien Bargiacchi | 2016-09-08 | 1 | -2/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Remove debug log statement; fix build | Damien Bargiacchi | 2016-09-08 | 1 | -2/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Remove debug log statement; fix build | Damien Bargiacchi | 2016-09-08 | 1 | -2/+0 |
* | | | | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUI am: 5e7cfb9af6 | Damien Bargiacchi | 2016-09-08 | 4 | -334/+148 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUI | Damien Bargiacchi | 2016-09-08 | 4 | -334/+148 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Remove duplicate methods and variables from WearRecoveryUI | Damien Bargiacchi | 2016-09-07 | 4 | -334/+148 |
* | | | | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 am: ec6a47ae46 -s ours | Tianjie Xu | 2016-09-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 | Tianjie Xu | 2016-09-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" am: 61590bbf0d | Tianjie Xu | 2016-09-02 | 22 | -512/+323 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" | Tianjie Xu | 2016-09-02 | 22 | -512/+323 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Switch recovery to libbase logging" | Tianjie Xu | 2016-09-02 | 22 | -512/+323 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Switch recovery to libbase logging | Tianjie Xu | 2016-09-01 | 22 | -512/+323 |
* | | | | | | | | | | | | | | | | | | | Fix a typo of variable name in install.cpp | Tianjie Xu | 2016-09-02 | 1 | -6/+6 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Fix a typo of variable name in install.cpp | Tianjie Xu | 2016-09-02 | 1 | -6/+6 |
* | | | | | | | | | | | | | | | | | | | Switch recovery to libbase logging | Tianjie Xu | 2016-09-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Switch recovery to libbase logging | Tianjie Xu | 2016-09-01 | 20 | -546/+352 |
* | | | | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb am: 0ae9d80082 | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Check an edge case when read(2) returns 0" | Treehugger Robot | 2016-09-01 | 3 | -8/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | Check an edge case when read(2) returns 0 | Tianjie Xu | 2016-09-01 | 3 | -8/+12 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Switch recovery to libbase logging | Tianjie Xu | 2016-09-01 | 20 | -545/+351 |
* | | | | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3 am: a331d85806 | Josh Gao | 2016-08-30 | 4 | -3/+28 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3 | Josh Gao | 2016-08-30 | 4 | -3/+28 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d | Josh Gao | 2016-08-30 | 4 | -3/+28 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." | Josh Gao | 2016-08-30 | 4 | -3/+28 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "minadbd: rename adb_server_main to minadbd_main." | Josh Gao | 2016-08-30 | 4 | -3/+28 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | minadbd: rename adb_server_main to minadbd_main. | Josh Gao | 2016-08-30 | 4 | -3/+28 |
* | | | | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 am: d987fe1d57 | Chih-Hung Hsieh | 2016-08-27 | 3 | -4/+4 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 | Chih-Hung Hsieh | 2016-08-27 | 3 | -4/+4 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 | Chih-Hung Hsieh | 2016-08-27 | 3 | -4/+4 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." | Chih-Hung Hsieh | 2016-08-27 | 3 | -4/+4 |
| | | |\| | | | | | | | | | | | | | |
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Fix clang-tidy warnings in bootable/recovery." | Treehugger Robot | 2016-08-27 | 3 | -4/+4 |
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Fix clang-tidy warnings in bootable/recovery. | Chih-Hung Hsieh | 2016-08-26 | 3 | -4/+4 |
| | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-dev am: 929ffefdcc | Damien Bargiacchi | 2016-08-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-dev | Damien Bargiacchi | 2016-08-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Support use of custom fonts in miniui" into cw-f-dev | Damien Bargiacchi | 2016-08-24 | 5 | -65/+83 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | Support use of custom fonts in miniui am: 35fff61b1c | Damien Bargiacchi | 2016-08-24 | 5 | -65/+83 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Support use of custom fonts in miniui | Damien Bargiacchi | 2016-08-24 | 5 | -65/+83 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Support use of custom fonts in miniui | Damien Bargiacchi | 2016-08-19 | 5 | -65/+83 |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-08-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-08-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Free mmaped area if keys fail to load" am: f599414aec | Tao Bao | 2016-08-18 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Free mmaped area if keys fail to load" | Tao Bao | 2016-08-18 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Free mmaped area if keys fail to load" | Tao Bao | 2016-08-18 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Free mmaped area if keys fail to load | WiZarD | 2016-08-18 | 1 | -0/+1 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc am: a44d4355ba | Tianjie Xu | 2016-08-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc | Tianjie Xu | 2016-08-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
* | | | | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5 am: e254b4e9e4 | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5 | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge ""view recovery logs" will show /tmp/recovery.log" | Tianjie Xu | 2016-08-18 | 1 | -31/+36 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | "view recovery logs" will show /tmp/recovery.log | Tianjie Xu | 2016-08-17 | 1 | -31/+36 |
| | | | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d am: d7865e81f1 | Johan Harvyl | 2016-08-15 | 1 | -1/+14 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d | Johan Harvyl | 2016-08-15 | 1 | -1/+14 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" am: cb76857147 | Johan Harvyl | 2016-08-15 | 1 | -1/+14 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" | Johan Harvyl | 2016-08-15 | 1 | -1/+14 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Format formattable partitions if mount fails" | Treehugger Robot | 2016-08-15 | 1 | -1/+14 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Format formattable partitions if mount fails | Johan Harvyl | 2016-08-12 | 1 | -1/+14 |
* | | | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. am: 53c107f068 am: 0d345b6731 | Alex Deymo | 2016-08-13 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. am: 53c107f068 | Alex Deymo | 2016-08-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. | Alex Deymo | 2016-08-13 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. | Alex Deymo | 2016-08-12 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp | Alex Deymo | 2016-08-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp | Alex Deymo | 2016-08-12 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Add inttypes.h for PRIu64. | Alex Deymo | 2016-08-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Add inttypes.h for PRIu64. | Alex Deymo | 2016-08-12 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9f am: d7067c7fea | Josh Gao | 2016-08-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9f | Josh Gao | 2016-08-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." am: e4cf854dbf | Josh Gao | 2016-08-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." | Josh Gao | 2016-08-12 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | Merge "adb headers now refer to openssl headers." | Josh Gao | 2016-08-12 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | adb headers now refer to openssl headers. | Elliott Hughes | 2016-08-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp | Alex Deymo | 2016-08-12 | 2 | -42/+189 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp | Alex Deymo | 2016-08-12 | 2 | -42/+189 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery. | Alex Deymo | 2016-08-12 | 2 | -42/+189 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / / /
| | | |/| | | | / / / / / / / / / / / /
| | | |_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Call update_engine_sideload from recovery. | Alex Deymo | 2016-08-12 | 2 | -42/+189 |
| | |/ / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7 am: b33a6f8342 | Johan Harvyl | 2016-08-09 | 1 | -4/+6 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7 | Johan Harvyl | 2016-08-09 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 | Johan Harvyl | 2016-08-09 | 1 | -4/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" | Johan Harvyl | 2016-08-09 | 1 | -4/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Handle error from fopen_path in finish_recovery" | Treehugger Robot | 2016-08-09 | 1 | -4/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | Handle error from fopen_path in finish_recovery | Johan Harvyl | 2016-08-08 | 1 | -4/+6 |
* | | | | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346 am: e6a4195bf7 | Josh Gao | 2016-08-08 | 4 | -12/+12 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346 | Josh Gao | 2016-08-08 | 4 | -12/+12 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 | Josh Gao | 2016-08-08 | 4 | -12/+12 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." | Josh Gao | 2016-08-08 | 4 | -12/+12 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Fix references to libcrypto_utils_static." | Josh Gao | 2016-08-08 | 4 | -12/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Fix references to libcrypto_utils_static. | Josh Gao | 2016-08-06 | 4 | -12/+12 |
| | | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8 am: 1e324fa459 | xinglong.zhu | 2016-08-08 | 2 | -1/+24 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8 | xinglong.zhu | 2016-08-08 | 2 | -1/+24 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" am: 629bde8c6c | xinglong.zhu | 2016-08-08 | 2 | -1/+24 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" | xinglong.zhu | 2016-08-08 | 2 | -1/+24 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Recovery mode UI flicker" | Treehugger Robot | 2016-08-08 | 2 | -1/+24 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | Recovery mode UI flicker | xinglong.zhu | 2016-08-06 | 2 | -1/+24 |
* | | | | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301 am: 5a84cecd26 | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301 | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" am: 61240f88ea | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Further compress the text images with zopflipng" | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Further compress the text images with zopflipng | Tianjie Xu | 2016-08-03 | 26 | -0/+2 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge \\\"Clean up verifier testcases.\\\" am: e91aef0ee9 am: 717b49254b am: 73d3acf50e | Tao Bao | 2016-08-01 | 21 | -41/+30 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Clean up verifier testcases.\\\" am: e91aef0ee9 am: 717b49254b | Tao Bao | 2016-08-01 | 21 | -41/+30 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Clean up verifier testcases.\\" am: e91aef0ee9 | Tao Bao | 2016-08-01 | 21 | -41/+30 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Clean up verifier testcases.\" | Tao Bao | 2016-08-01 | 21 | -41/+30 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Clean up verifier testcases." | Treehugger Robot | 2016-08-01 | 21 | -41/+30 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Clean up verifier testcases. | Tao Bao | 2016-08-01 | 21 | -41/+30 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge \\\\"Add docs on regeneration background text image\\\\" am: 5aa2e104c0 am: b02a58740e am: 698f75467a | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Add docs on regeneration background text image\\\" am: 5aa2e104c0 am: b02a58740e | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Add docs on regeneration background text image\\" am: 5aa2e104c0 | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Add docs on regeneration background text image\" | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Add docs on regeneration background text image" | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Add docs on regeneration background text image | Tianjie Xu | 2016-07-29 | 4 | -2/+35 |
* | | | | | | | | | | | | | | | | | | | Merge \\\\"Regenerate the background text with pngcrush\\\\" am: 7b6263960f am: c6d607f6ba am: a26823d96d | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"Regenerate the background text with pngcrush\\\" am: 7b6263960f am: c6d607f6ba | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"Regenerate the background text with pngcrush\\" am: 7b6263960f | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"Regenerate the background text with pngcrush\" | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Regenerate the background text with pngcrush" | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | Regenerate the background text with pngcrush | Tianjie Xu | 2016-07-29 | 25 | -0/+0 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d am: 53c34ebdc4 | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Resolve merge conflicts of 286848e to stage-aosp-master | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Update background text images under recovery" | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Update background text images under recovery | Tianjie Xu | 2016-07-28 | 25 | -0/+0 |
| | | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge \\\\"Fix clang-tidy performance warnings.\\\\" am: 2a3b695168 am: 977903da49 am: fc7cbe465f | Chih-hung Hsieh | 2016-07-27 | 5 | -5/+5 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Fix clang-tidy performance warnings.\\\" am: 2a3b695168 am: 977903da49 | Chih-Hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Fix clang-tidy performance warnings.\\" am: 2a3b695168 | Chih-hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Fix clang-tidy performance warnings.\" | Chih-Hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Fix clang-tidy performance warnings." | Chih-hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | Fix clang-tidy performance warnings. | Chih-Hung Hsieh | 2016-07-27 | 5 | -5/+5 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e49c0d6406 -s ours | Bill Yi | 2016-07-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-07-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-07-21 | 3 | -12/+12 |
* | | | | | | | | | | | | | | | | | Skip update verification if care_map is not found am: da654af606 | Tianjie Xu | 2016-07-16 | 1 | -2/+5 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Skip update verification if care_map is not found | Tianjie Xu | 2016-07-16 | 1 | -2/+5 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Skip update verification if care_map is not found | Tianjie Xu | 2016-07-16 | 1 | -2/+5 |
* | | | | | | | | | | | | | | | | | Fix a typo when comparing the verity mode am: 4bbe0c93c8 | Tianjie Xu | 2016-07-15 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Fix a typo when comparing the verity mode | Tianjie Xu | 2016-07-15 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Fix a typo when comparing the verity mode | Tianjie Xu | 2016-07-15 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge \\"Touch blocks in care_map in update_verifier\\" into nyc-mr1-dev am: 13f44939b1 | Tianjie Xu | 2016-07-15 | 2 | -14/+122 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge \"Touch blocks in care_map in update_verifier\" into nyc-mr1-dev | Tianjie Xu | 2016-07-15 | 2 | -14/+122 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Touch blocks in care_map in update_verifier" into nyc-mr1-dev | Tianjie Xu | 2016-07-15 | 2 | -14/+122 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | Touch blocks in care_map in update_verifier | Tianjie Xu | 2016-07-14 | 2 | -14/+122 |
* | | | | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist am: 27b9fc8a36 | Tianjie Xu | 2016-07-13 | 2 | -10/+38 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist | Tianjie Xu | 2016-07-13 | 2 | -10/+38 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Skip update-on-boot for bootreason in blacklist | Tianjie Xu | 2016-07-12 | 2 | -10/+38 |
| | |/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Support landscape layouts. am: 6d089a955f | Elliott Hughes | 2016-07-09 | 2 | -15/+31 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Support landscape layouts. | Elliott Hughes | 2016-07-09 | 2 | -15/+31 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Support landscape layouts. | Elliott Hughes | 2016-07-09 | 2 | -15/+31 |
* | | | | | | | | | | | | | | | | | Merge "Allow uncrypt to work without socket communication" | Tianjie Xu | 2016-07-08 | 1 | -2/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Allow uncrypt to work without socket communication | Tianjie Xu | 2016-07-01 | 1 | -2/+18 |
* | | | | | | | | | | | | | | | | | | Fix bootloader_message. am: 9da04d595f | Yabin Cui | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Fix bootloader_message. | Yabin Cui | 2016-07-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Fix bootloader_message. | Yabin Cui | 2016-07-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 34e2854786 -s ours am: 93d2e08ef2 -s ours | Bill Yi | 2016-07-01 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 34e2854786 -s ours | Bill Yi | 2016-07-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-07-01 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-07-01 | 78 | -312/+390 |
* | | | | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. am: ccb0ba908a | Tao Bao | 2016-07-01 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
| |_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. | Tao Bao | 2016-07-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. | Tao Bao | 2016-07-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp | Yabin Cui | 2016-07-01 | 10 | -397/+328 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp | Yabin Cui | 2016-07-01 | 10 | -397/+328 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Create bootloader_message static library. | Yabin Cui | 2016-06-30 | 10 | -381/+227 |
* | | | | | | | | | | | | | | | | | Merge \\\\"Fix install.h\\\\'s use of attribute printf.\\\\" am: a82ee456bb am: 691db7ba77 am: 7c4a34195f | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge \\\"Fix install.h\\\'s use of attribute printf.\\\" am: a82ee456bb am: 691db7ba77 | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge \\"Fix install.h\\'s use of attribute printf.\\" am: a82ee456bb | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge \"Fix install.h\'s use of attribute printf.\" | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "Fix install.h's use of attribute printf." | Treehugger Robot | 2016-06-30 | 2 | -4/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | Fix install.h's use of attribute printf. | Elliott Hughes | 2016-06-30 | 2 | -4/+3 |
* | | | | | | | | | | | | | | | | | | Merge \\\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\\" am: a9f648f010 am: 8e6e4bc979 am: a4cd854625 | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\" am: a9f648f010 am: 8e6e4bc979 | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Fix google-explicit-constructor warnings in bootable/recovery.\\" am: a9f648f010 | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Fix google-explicit-constructor warnings in bootable/recovery.\" | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
| | |/| | | | | | | | | | | | | | |
| | | |/ / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings in bootable/recovery." | Treehugger Robot | 2016-06-30 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Fix google-explicit-constructor warnings in bootable/recovery. | Chih-Hung Hsieh | 2016-06-30 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 am: e5c6d47f52 | Tianjie Xu | 2016-06-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 | Tianjie Xu | 2016-06-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Increase EIO retry count | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 am: 6074099cb9 | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Increase EIO retry count am: c37c5c3410 | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Increase EIO retry count | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Increase EIO retry count | Tianjie Xu | 2016-06-24 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp | Yabin Cui | 2016-06-21 | 8 | -77/+232 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp | Yabin Cui | 2016-06-21 | 8 | -77/+232 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Verify wipe package when wiping A/B device in recovery." into nyc-mr1-dev | Yabin Cui | 2016-06-21 | 8 | -76/+231 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Verify wipe package when wiping A/B device in recovery. | Yabin Cui | 2016-06-21 | 8 | -76/+231 |
* | | | | | | | | | | | | | | | | | Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 2c709ccef9 -s ours am: bf44cb7363 -s ours | Bill Yi | 2016-06-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 2c709ccef9 -s ours | Bill Yi | 2016-06-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master | Bill Yi | 2016-06-17 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Import translations. DO NOT MERGE" into stage-aosp-master | Bill Yi | 2016-06-17 | 78 | -312/+390 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-06-16 | 78 | -312/+390 |
* | | | | | | | | | | | | | | | | | | | Merge \\\\"Minor minadbd cleanup.\\\\" am: a49c8a19da am: 98c97c8932 am: aaa7c08cfa | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"Minor minadbd cleanup.\\\" am: a49c8a19da am: 98c97c8932 | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"Minor minadbd cleanup.\\" am: a49c8a19da | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"Minor minadbd cleanup.\" | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | / / / / / / / / / / /
| | | | | |_|_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Minor minadbd cleanup." | Treehugger Robot | 2016-06-17 | 4 | -8/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Minor minadbd cleanup. | Elliott Hughes | 2016-06-17 | 4 | -8/+3 |
* | | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf am: 93110c767f | Tianjie Xu | 2016-06-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf | Tianjie Xu | 2016-06-16 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Check the results from applypatch | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf am: d0dcbddd31 | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Check the results from applypatch am: 31f8cc84cf | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Check the results from applypatch | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Check the results from applypatch | Tianjie Xu | 2016-06-16 | 1 | -4/+10 |
* | | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: 7eb60efa8d am: 28a425aa1f | Tao Bao | 2016-06-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: 7eb60efa8d | Tao Bao | 2016-06-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. am: ab2fb94bf4 | Tao Bao | 2016-06-16 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | tests: Remove obsolete MTD support. | Tao Bao | 2016-06-16 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | Merge \\\\"Remove an abused global so we can actually see logging.\\\\" am: 37450d7f42 am: 4692e5d8c8 am: d71cf2eee3 | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"Remove an abused global so we can actually see logging.\\\" am: 37450d7f42 am: 4692e5d8c8 | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"Remove an abused global so we can actually see logging.\\" am: 37450d7f42 | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"Remove an abused global so we can actually see logging.\" | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Remove an abused global so we can actually see logging." | Treehugger Robot | 2016-06-16 | 1 | -19/+11 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Remove an abused global so we can actually see logging. | Elliott Hughes | 2016-06-16 | 1 | -19/+11 |
| | | | | | |_|/ / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Merge \\\\"init now uses libprocessgroup, so set up /acct.\\\\" am: 279876c932 am: c58d7dda8c am: a087302da7 | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"init now uses libprocessgroup, so set up /acct.\\\" am: 279876c932 am: c58d7dda8c | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"init now uses libprocessgroup, so set up /acct.\\" am: 279876c932 | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"init now uses libprocessgroup, so set up /acct.\" | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "init now uses libprocessgroup, so set up /acct." | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | init now uses libprocessgroup, so set up /acct. | Elliott Hughes | 2016-06-16 | 1 | -0/+3 |
| | | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f am: eaddde6888 | Elliott Hughes | 2016-06-16 | 16 | -1490/+242 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f | Elliott Hughes | 2016-06-16 | 16 | -1490/+242 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master | Elliott Hughes | 2016-06-16 | 16 | -1490/+242 |
| | |\| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | resolve merge conflicts of 179c0d8 to stage-aosp-master | Elliott Hughes | 2016-06-16 | 16 | -1490/+242 |
| | |/| | | | | | | | | | | | | | | |
| | | |/ / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | Merge "Remove obsolete MTD support." | Elliott Hughes | 2016-06-15 | 16 | -1490/+242 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Remove obsolete MTD support. | Elliott Hughes | 2016-06-10 | 16 | -1490/+242 |
* | | | | | | | | | | | | | | | | | | Merge \\\\"Add bootloader_message_ab struct.\\\\" am: 59f04b9982 am: f57d7f02c9 am: 2fc7cd69fd | Tao Bao | 2016-06-14 | 1 | -13/+58 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Add bootloader_message_ab struct.\\\" am: 59f04b9982 am: f57d7f02c9 | Tao Bao | 2016-06-14 | 1 | -13/+58 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Add bootloader_message_ab struct.\\" am: 59f04b9982 | Tao Bao | 2016-06-14 | 1 | -13/+58 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | Merge \"Add bootloader_message_ab struct.\" | Tao Bao | 2016-06-14 | 1 | -13/+58 |
| | | |\| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Add bootloader_message_ab struct." | Tao Bao | 2016-06-14 | 1 | -13/+58 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Add bootloader_message_ab struct. | Tao Bao | 2016-06-10 | 1 | -13/+58 |
| | | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp am: 38afad46d8 | Tao Bao | 2016-06-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp | Tao Bao | 2016-06-14 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp | Tao Bao | 2016-06-14 | 1 | -57/+66 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-06-14 | 1 | -57/+66 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-06-14 | 1 | -57/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | applypatch: Don\'t call inflate() when it expects zero-length output. | Tao Bao | 2016-06-14 | 1 | -57/+66 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | |/| | | | / / / / / / / / / / /
| | | |_|_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | applypatch: Don't call inflate() when it expects zero-length output. | Tao Bao | 2016-06-14 | 1 | -57/+66 |
* | | | | | | | | | | | | | | | | | | Merge \\"recovery: Track the name change for wipe_ab.\\" into nyc-mr1-dev am: dc1393d09b | Tao Bao | 2016-06-13 | 1 | -12/+12 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \"recovery: Track the name change for wipe_ab.\" into nyc-mr1-dev | Tao Bao | 2016-06-13 | 1 | -12/+12 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "recovery: Track the name change for wipe_ab." into nyc-mr1-dev | Tao Bao | 2016-06-13 | 1 | -12/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | recovery: Track the name change for wipe_ab. | Tao Bao | 2016-06-10 | 1 | -12/+12 |
* | | | | | | | | | | | | | | | | | | | Merge \\\\"updater: Fix the broken ReadFileFn.\\\\" am: 4ddd5edf31 am: 89dfe730d4 am: 1e67422f37 | Tao Bao | 2016-06-11 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge \\\"updater: Fix the broken ReadFileFn.\\\" am: 4ddd5edf31 am: 89dfe730d4 | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge \\"updater: Fix the broken ReadFileFn.\\" am: 4ddd5edf31 | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge \"updater: Fix the broken ReadFileFn.\" | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "updater: Fix the broken ReadFileFn." | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | updater: Fix the broken ReadFileFn. | Tao Bao | 2016-06-11 | 1 | -1/+1 |
| | | | | | |_|_|/ / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 am: dcf1089771 | Tianjie Xu | 2016-06-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 | Tianjie Xu | 2016-06-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Log source/target build version to last_install | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | / / / / / / / / / / /
| | | | |_|_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 am: 9d2657fbb7 | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Log source/target build version to last_install am: b0ddae55e5 | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Log source/target build version to last_install | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Log source/target build version to last_install | Tianjie Xu | 2016-06-10 | 1 | -0/+55 |
* | | | | | | | | | | | | | | | | | | Merge \\\\"Remove etc/META-INF/com/google/android/update-script.\\\\" am: 5b2191a9d6 am: 5be6ae12b5 am: 21c4f4e6e6 | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge \\\"Remove etc/META-INF/com/google/android/update-script.\\\" am: 5b2191a9d6 am: 5be6ae12b5 | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge \\"Remove etc/META-INF/com/google/android/update-script.\\" am: 5b2191a9d6 | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge \"Remove etc/META-INF/com/google/android/update-script.\" | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Remove etc/META-INF/com/google/android/update-script." | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | Remove etc/META-INF/com/google/android/update-script. | Elliott Hughes | 2016-06-10 | 1 | -8/+0 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge \"resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3\" into nyc-mr1-dev-plus-aosp | Alain Vongsouvanh | 2016-06-08 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-06-08 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 2a697feb39 | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | resolve merge conflicts of 6aa6ddb to nyc-dev | Alain Vongsouvanh | 2016-06-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | recovery: Make wear recovery more customizable. | Alain Vongsouvanh | 2016-06-08 | 2 | -3/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|/ / / / / / / / /
| | | | | |/| | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | recovery: Make wear recovery more customizable. | Alain Vongsouvanh | 2016-06-07 | 2 | -3/+4 |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-06-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp | Tao Bao | 2016-06-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "recovery: Add support to brick a device." into nyc-mr1-dev | Tao Bao | 2016-06-04 | 1 | -1/+91 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | recovery: Add support to brick a device. | Tao Bao | 2016-06-03 | 1 | -1/+91 |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp am: 64f46fb16c | Tianjie Xu | 2016-06-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp | Tianjie Xu | 2016-06-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp | Tianjie Xu | 2016-06-04 | 4 | -14/+76 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-06-04 | 4 | -14/+76 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-06-04 | 4 | -14/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Call ioctl before each write on retry | Tianjie Xu | 2016-06-04 | 4 | -14/+76 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Call ioctl before each write on retry | Tianjie Xu | 2016-06-03 | 4 | -14/+76 |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp am: ba33da2884 | Tao Bao | 2016-06-04 | 1 | -1/+91 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp | Tao Bao | 2016-06-04 | 1 | -1/+91 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp | Tao Bao | 2016-06-03 | 1 | -1/+91 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "recovery: Add support to brick a device." | Tao Bao | 2016-06-03 | 1 | -1/+91 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|/ / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "recovery: Add support to brick a device." | Tao Bao | 2016-06-03 | 1 | -1/+91 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | recovery: Add support to brick a device. | Tao Bao | 2016-06-03 | 1 | -1/+91 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d am: e13a690c16 | Tao Bao | 2016-06-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." | Tao Bao | 2016-06-01 | 1 | -38/+40 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" | Tao Bao | 2016-06-01 | 1 | -38/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." | Tao Bao | 2016-06-01 | 1 | -38/+40 |
* | | | | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 am: 23bb1d210d | Adam Buchbinder | 2016-06-01 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 | Adam Buchbinder | 2016-06-01 | 1 | -40/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 | Adam Buchbinder | 2016-06-01 | 1 | -40/+38 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." | Adam Buchbinder | 2016-06-01 | 1 | -40/+38 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." | Treehugger Robot | 2016-06-01 | 1 | -40/+38 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector. | Adam Buchbinder | 2016-06-01 | 1 | -40/+38 |
| | | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf am: d8a518d711 | Tao Bao | 2016-06-01 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf | Tao Bao | 2016-06-01 | 1 | -2/+1 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb | Tao Bao | 2016-06-01 | 1 | -2/+1 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" | Tao Bao | 2016-06-01 | 1 | -2/+1 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "Revert "imgdiff: Generate statically linked imgdiff."" | Tao Bao | 2016-06-01 | 1 | -2/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | Revert "imgdiff: Generate statically linked imgdiff." | Tao Bao | 2016-06-01 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 am: f90090d429 | Tao Bao | 2016-06-01 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | | |
| |_|_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 | Tao Bao | 2016-06-01 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc | Tao Bao | 2016-06-01 | 1 | -1/+2 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." | Tao Bao | 2016-06-01 | 1 | -1/+2 |
| | | |\| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge "imgdiff: Generate statically linked imgdiff." | Tao Bao | 2016-06-01 | 1 | -1/+2 |
| | | | |\| | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | imgdiff: Generate statically linked imgdiff. | Tao Bao | 2016-05-31 | 1 | -1/+2 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector. | Adam Buchbinder | 2016-05-26 | 1 | -40/+38 |
* | | | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. am: 01fcbe160b | Elliott Hughes | 2016-05-24 | 2 | -14/+44 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. | Elliott Hughes | 2016-05-24 | 2 | -14/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Disable the meaningless parts of the UI for A/B. | Elliott Hughes | 2016-05-24 | 2 | -14/+44 |
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 am: 3f6eb86390 | Tianjie Xu | 2016-05-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 | Tianjie Xu | 2016-05-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 | Tianjie Xu | 2016-05-23 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 am: f5e2831bf3 | Jeremy Compostella | 2016-05-24 | 1 | -1/+4 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 | Jeremy Compostella | 2016-05-24 | 1 | -1/+4 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c | Jeremy Compostella | 2016-05-23 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" | Jeremy Compostella | 2016-05-23 | 1 | -1/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "slot_metadata: add verity_corrupted field" | Treehugger Robot | 2016-05-23 | 1 | -1/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | slot_metadata: add verity_corrupted field | Jeremy Compostella | 2016-05-23 | 1 | -1/+4 |
| | | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | resolve merge conflicts of 50f6417 to nyc-dev-plus-aosp | Tianjie Xu | 2016-05-23 | 11 | -105/+267 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-23 | 11 | -105/+266 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-23 | 11 | -105/+266 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Allow recovery to return error codes" into nyc-dev | Tianjie Xu | 2016-05-23 | 11 | -104/+265 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Allow recovery to return error codes" into nyc-dev | Tianjie Xu | 2016-05-23 | 11 | -104/+265 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Allow recovery to return error codes | Tianjie Xu | 2016-05-20 | 11 | -104/+265 |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: bd43d7e92b | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: 8a55c65345 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | / / / / / / / / / /
| | | | | |_|_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|/ / / / / / / / /
| | | | | |/| | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |_|_|/ / / / / / / /
| | | | | | |/| | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |_|_|/ / / / / / /
| | | | | | | |/| | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | * \ \ \ \ \ \ \ \ \ | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |_|_|/ / / / / /
| | | | | | | | | |/| | | | | | | | |
|
| | | | | | | | | * | | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | |_|_|/ / / / /
| | | | | | | | | | |/| | | | | | | |
|
| | | | | | | | | | * | | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | | | |/| | | | | | | |
| | | | | | | | | | | |_|_|/ / / /
| | | | | | | | | | |/| | | | | | |
|
| | | | | | | | | | * | | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev | Matt Sarett | 2016-05-20 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | |_|_|/ / /
| | | | | | | | | | | |/| | | | | |
|
| | | | | | | | | | | * | | | | | | resolve merge conflicts of 86a28d0 to klp-modular-dev | Matt Sarett | 2016-05-19 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | |_|_|/ /
| | | | | | | | | | | | |/| | | | |
|
| | | | | | | | | | | | * | | | | | DO NOT MERGE Use updated libpng API | Matt Sarett | 2016-05-19 | 1 | -10/+10 |
| | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | |_|_|/
| | | | | | | | | | | | | |/| | | |
|
| | | | | | | | | | | | | * | | | | DO NOT MERGE Use updated libpng API | Matt Sarett | 2016-05-17 | 1 | -10/+10 |
| | | | | | | | | | | | |/ / / / |
|
* | | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 am: 142b864ba1 | Tianjie Xu | 2016-05-18 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 | Tianjie Xu | 2016-05-18 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Add time and I/O info to last_install | Tianjie Xu | 2016-05-18 | 2 | -4/+35 |
| | |\| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 am: 027b403e8a | Tianjie Xu | 2016-05-18 | 2 | -4/+35 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Add time and I/O info to last_install am: dd874b1c87 | Tianjie Xu | 2016-05-18 | 2 | -4/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Add time and I/O info to last_install | Tianjie Xu | 2016-05-18 | 2 | -4/+35 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Add time and I/O info to last_install | Tianjie Xu | 2016-05-16 | 2 | -4/+35 |
* | | | | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726 am: 0cc7e28ffd | Jonathan Hamilton | 2016-05-12 | 1 | -6/+8 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726 | Jonathan Hamilton | 2016-05-12 | 1 | -6/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 | Jonathan Hamilton | 2016-05-12 | 1 | -6/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|/ /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" | Jonathan Hamilton | 2016-05-12 | 1 | -6/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|/
| | | | |/| | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | Merge "Keep ADF device alive for the lifetime of the minui backend" | Treehugger Robot | 2016-05-12 | 1 | -6/+8 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | Keep ADF device alive for the lifetime of the minui backend | Jonathan Hamilton | 2016-05-06 | 1 | -6/+8 |
* | | | | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7 am: eef053fda1 | Tao Bao | 2016-05-08 | 2 | -2/+2 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7 | Alistair Strachan | 2016-05-08 | 2 | -2/+2 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 | Tao Bao | 2016-05-08 | 2 | -2/+2 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." | Alistair Strachan | 2016-05-08 | 2 | -2/+2 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "updater, minzip: Remove unnecessary O_SYNC flags." | Tao Bao | 2016-05-08 | 2 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | updater, minzip: Remove unnecessary O_SYNC flags. | Alistair Strachan | 2016-05-06 | 2 | -2/+2 |
| | | | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 am: 7caebae682 am: 22431741ce | Sen Jiang | 2016-05-06 | 3 | -425/+10 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 am: 7caebae682 | Sen Jiang | 2016-05-06 | 3 | -425/+10 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 | Sen Jiang | 2016-05-06 | 3 | -425/+10 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." | Sen Jiang | 2016-05-06 | 3 | -425/+10 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "applypatch: Use bsdiff from external/bsdiff." | Treehugger Robot | 2016-05-06 | 3 | -425/+10 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | applypatch: Use bsdiff from external/bsdiff. | Sen Jiang | 2016-05-04 | 3 | -425/+10 |
| | | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50 am: 88234ad84b am: c66a83dac0 | Tao Bao | 2016-05-03 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50 am: 88234ad84b | Tao Bao | 2016-05-03 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." am: ecd6e2af50 | Tao Bao | 2016-05-03 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "recovery: Always log the update attempt." | Tao Bao | 2016-05-03 | 1 | -0/+4 |
| | | |\| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | Merge "recovery: Always log the update attempt." | Treehugger Robot | 2016-05-03 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | recovery: Always log the update attempt. | Tao Bao | 2016-05-03 | 1 | -0/+4 |
| | | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-05-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8d | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Make text for recovery larger on angler | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8d am: ba4e7977e4 | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Make text for recovery larger on angler am: 087c5edd8d | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | | | / / / / / / / / / /
| | | |_|_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Make text for recovery larger on angler | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Make text for recovery larger on angler | Tianjie Xu | 2016-05-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp am: cacb47b2a3 | Tianjie Xu | 2016-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Add ability to show "installing security update"" into nyc-dev | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Add ability to show "installing security update"" into nyc-dev | Tianjie Xu | 2016-05-02 | 5 | -1/+23 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Add ability to show "installing security update" | Tianjie Xu | 2016-04-29 | 5 | -1/+23 |
* | | | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp | Tao Bao | 2016-05-02 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-05-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895 | Tao Bao | 2016-05-02 | 1 | -0/+4 |
| | |\| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | recovery: Always log the update attempt. | Tao Bao | 2016-05-02 | 1 | -0/+4 |
| | | |\| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895 am: e0c8a9bb02 | Tao Bao | 2016-05-02 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | recovery: Always log the update attempt. am: 5687001895 | Tao Bao | 2016-05-02 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | / / / / / / / / / / / /
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | recovery: Always log the update attempt. | Tao Bao | 2016-05-02 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | recovery: Always log the update attempt. | Tao Bao | 2016-04-30 | 1 | -0/+4 |
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0a am: 8d3b85a320 | Chih-hung Hsieh | 2016-04-30 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0a | Chih-Hung Hsieh | 2016-04-30 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 | Chih-hung Hsieh | 2016-04-30 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." | Chih-Hung Hsieh | 2016-04-30 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | Merge "Fix google-explicit-constructor warnings." | Chih-hung Hsieh | 2016-04-30 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | Fix google-explicit-constructor warnings. | Chih-Hung Hsieh | 2016-04-29 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e am: 6bfe76e | Tao Bao | 2016-04-28 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e | Tao Bao | 2016-04-28 | 1 | -2/+1 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee | Tao Bao | 2016-04-28 | 1 | -2/+1 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "updater: Don\'t zero out CommandParameters with memset(3)." | Tao Bao | 2016-04-28 | 1 | -2/+1 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge "updater: Don't zero out CommandParameters with memset(3)." | Tao Bao | 2016-04-28 | 1 | -2/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | updater: Don't zero out CommandParameters with memset(3). | Tao Bao | 2016-04-27 | 1 | -2/+1 |
| | | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp | TreeHugger Robot | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 | TreeHugger Robot | 2016-04-28 | 1 | -8/+10 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev | Elliott Hughes | 2016-04-28 | 1 | -8/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: a7f7e70 | Elliott Hughes | 2016-04-28 | 1 | -8/+10 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 | TreeHugger Robot | 2016-04-28 | 1 | -8/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | | | / / / / / / / / / /
| | | |_|_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev | Elliott Hughes | 2016-04-28 | 1 | -8/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Improve the layout-related comments." into nyc-dev | TreeHugger Robot | 2016-04-28 | 1 | -8/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Improve the layout-related comments. | Elliott Hughes | 2016-04-28 | 1 | -8/+10 |
* | | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: e890e19 | Tianjie Xu | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 | Tianjie Xu | 2016-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 21092a9 | Elliott Hughes | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd | Elliott Hughes | 2016-04-28 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: d57691e | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Update background text for recovery UI" into nyc-dev | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Update background text for recovery UI | Tianjie Xu | 2016-04-28 | 25 | -0/+0 |
* | | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 75191f3 | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev am: 2f1eedd | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Update recovery UI." into nyc-dev | Elliott Hughes | 2016-04-28 | 502 | -50/+80 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Update recovery UI. | Elliott Hughes | 2016-04-27 | 502 | -50/+80 |
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours am: a42bca8 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours am: 06be362 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Baligh Uddin | 2016-04-27 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2016-04-26 | 3 | -11/+7 |
* | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: abd0988 -s ours | Baligh Uddin | 2016-04-28 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev | Baligh Uddin | 2016-04-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev | Baligh Uddin | 2016-04-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2016-04-26 | 78 | -312/+312 |
* | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2016-04-27 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2016-04-26 | 3 | -11/+7 |
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours am: 97ee2b1 -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours am: e84e73a -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: ca5003e -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 3 | -11/+7 |
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: a004356 -s ours | Bill Yi | 2016-04-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 78 | -312/+312 |
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-27 | 3 | -11/+7 |
| |_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours am: 29c7a34 -s ours | Bill Yi | 2016-04-25 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours | Bill Yi | 2016-04-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-25 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours am: d210dc0 -s ours | Bill Yi | 2016-04-25 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: e59f5de -s ours | Bill Yi | 2016-04-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-25 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-25 | 81 | -324/+328 |
* | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-25 | 81 | -324/+328 |
* | | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 2f9be55 | Tao Bao | 2016-04-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 | Tao Bao | 2016-04-23 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev | Tao Bao | 2016-04-23 | 2 | -3/+20 |
| | |\| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 5e3aa78 | Tao Bao | 2016-04-23 | 2 | -3/+20 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 | Tao Bao | 2016-04-23 | 2 | -3/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev | Tao Bao | 2016-04-23 | 2 | -3/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "recovery: Dump the signature in the zip package." into nyc-dev | Tao Bao | 2016-04-23 | 2 | -3/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | recovery: Dump the signature in the zip package. | Tao Bao | 2016-04-20 | 2 | -3/+20 |
* | | | | | | | | | | | | | | | | | Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-04-22 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Go back to the old ear-wiggling Android animation. am: 692941be79 | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. am: 692941be79 am: 17266d9a65 | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. am: 692941be79 | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. | Elliott Hughes | 2016-04-22 | 457 | -15/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Go back to the old ear-wiggling Android animation. | Elliott Hughes | 2016-04-21 | 457 | -15/+48 |
* | | | | | | | | | | | | | | | | | Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp | Tianjie Xu | 2016-04-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 8bb3bd9209 | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Regenerate background text imgs in recovery" into nyc-dev | Tianjie Xu | 2016-04-21 | 25 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Regenerate background text imgs in recovery | Tianjie Xu | 2016-04-19 | 25 | -0/+0 |
* | | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 210b0a5 | Tianjie Xu | 2016-04-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 | Tianjie Xu | 2016-04-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev | Tianjie Xu | 2016-04-21 | 4 | -14/+44 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 45609d3 | Tianjie Xu | 2016-04-21 | 4 | -14/+44 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev am: 8b86373 | Tianjie Xu | 2016-04-21 | 4 | -14/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev | Tianjie Xu | 2016-04-21 | 4 | -14/+44 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Fix matches_locale function" into nyc-dev | Tianjie Xu | 2016-04-20 | 4 | -14/+44 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Fix matches_locale function | Tianjie Xu | 2016-04-20 | 4 | -14/+44 |
| | | | | |/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-04-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-dev | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-20 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-dev | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Merge "Remove trailing punctuation from recovery strings." into nyc-dev | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Remove trailing punctuation from recovery strings. | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | | | | |_|/ / / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp | Elliott Hughes | 2016-04-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp | Android Build Merger (Role) | 2016-04-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / /
| |/| | | | / / / / / / / / / / / / /
| | | |_|_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0 | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Decrease OTA package verification times further. | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / /
| | | | |/| / / / / / / / / / / / /
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0 am: 1864feb | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Decrease OTA package verification times further. am: dd895d0 | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Decrease OTA package verification times further. | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Decrease OTA package verification times further. | Elliott Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1 am: 0231e70 | Chih-hung Hsieh | 2016-04-19 | 12 | -46/+53 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1 | Chih-Hung Hsieh | 2016-04-19 | 12 | -46/+53 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." am: a1f4a1e | Chih-hung Hsieh | 2016-04-19 | 12 | -46/+53 |
| |/| | | | | | | | | | | | |
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Fix google-runtime-int warnings." | Chih-Hung Hsieh | 2016-04-19 | 12 | -46/+53 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "Fix google-runtime-int warnings." | Chih-hung Hsieh | 2016-04-19 | 12 | -46/+53 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | Fix google-runtime-int warnings. | Chih-Hung Hsieh | 2016-04-18 | 12 | -46/+53 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "Fix IWYU errors." am: 51dcd0d am: 405db92 | David Benjamin | 2016-04-16 | 1 | -0/+1 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Fix IWYU errors." am: 51dcd0d | Treehugger Robot | 2016-04-16 | 1 | -0/+1 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Fix IWYU errors." | David Benjamin | 2016-04-16 | 1 | -0/+1 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "Fix IWYU errors." | Treehugger Robot | 2016-04-16 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | Fix IWYU errors. | David Benjamin | 2016-04-16 | 1 | -0/+1 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "Update the system update animation." into nyc-dev am: e8d0ecc | Elliott Hughes | 2016-04-15 | 466 | -73/+164 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Update the system update animation." into nyc-dev | Elliott Hughes | 2016-04-15 | 466 | -73/+164 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Update the system update animation." into nyc-dev | Elliott Hughes | 2016-04-15 | 466 | -73/+164 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Update the system update animation. | Elliott Hughes | 2016-04-15 | 466 | -73/+164 |
* | | | | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" am: e6af522 am: b30c6f6 | Jeremy Compostella | 2016-04-15 | 1 | -1/+53 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" am: e6af522 | Tao Bao | 2016-04-15 | 1 | -1/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" | Jeremy Compostella | 2016-04-15 | 1 | -1/+53 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "Define the Bootloader Control A/B structure" | Tao Bao | 2016-04-15 | 1 | -1/+53 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | Define the Bootloader Control A/B structure | Jeremy Compostella | 2016-04-06 | 1 | -1/+53 |
* | | | | | | | | | | | | | | | | Explicitly set the font face and color. am: 70ae70b | Elliott Hughes | 2016-04-15 | 2 | -7/+6 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Explicitly set the font face and color. | Elliott Hughes | 2016-04-15 | 2 | -7/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Explicitly set the font face and color. | Elliott Hughes | 2016-04-15 | 2 | -7/+6 |
| | | |_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | resolve merge conflicts of 8febafa to nyc-dev-plus-aosp | Elliott Hughes | 2016-04-14 | 2 | -10/+14 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | resolve merge conflicts of 8febafa to nyc-dev-plus-aosp | Elliott Hughes | 2016-04-14 | 2 | -10/+14 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Use BoringSSL instead of mincrypt to speed up package verification. | Elliott Hughes | 2016-04-14 | 10 | -257/+285 |
* | | | | | | | | | | | | | | | resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp | Mattias Nissler | 2016-04-13 | 11 | -247/+274 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp | Elliott Hughes | 2016-04-13 | 11 | -247/+274 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Convert recovery to use BoringSSL instead of mincrypt." | Mattias Nissler | 2016-04-13 | 11 | -247/+275 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "Convert recovery to use BoringSSL instead of mincrypt." | Elliott Hughes | 2016-04-13 | 11 | -247/+275 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | Convert recovery to use BoringSSL instead of mincrypt. | Mattias Nissler | 2016-04-06 | 11 | -247/+275 |
* | | | | | | | | | | | | | | | | resolve merge conflicts of a58a6db to nyc-dev-plus-aosp | Yabin Cui | 2016-04-09 | 4 | -45/+160 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of a58a6db to nyc-dev-plus-aosp | Yabin Cui | 2016-04-09 | 4 | -45/+160 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | uncrypt: split libbootloader_message_writer for reuse. | Yabin Cui | 2016-04-08 | 4 | -44/+160 |
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: b162551 -s ours | Bill Yi | 2016-04-05 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Bill Yi | 2016-04-05 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev | Bill Yi | 2016-04-05 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Bill Yi | 2016-04-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console files am: a569727 | Mark Salyzyn | 2016-04-05 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console files | Mark Salyzyn | 2016-04-05 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | recovery-persist: pick up both pstore console files | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" am: 901f315 am: 4195388 | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
|\| | | | | | | | | | | | | | | |
| |_|/ / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" am: 901f315 | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "recovery-persist: pick up both pstore console files" | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | recovery-persist: pick up both pstore console files | Mark Salyzyn | 2016-04-05 | 1 | -2/+7 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: f75b6e4 -s ours | Bill Yi | 2016-04-05 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 81 | -229/+148 |
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-04-05 | 81 | -229/+148 |
* | | | | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." am: 8124750 am: dc91161 | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." am: 8124750 | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "Move selinux dependencies out of header files." | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | Move selinux dependencies out of header files. | Elliott Hughes | 2016-04-02 | 8 | -11/+18 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files am: 13aca59 | Mark Salyzyn | 2016-03-31 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files | Mark Salyzyn | 2016-03-31 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
* | | | | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771 am: 6f83130 | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771 | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "recovery: use __android_log_pmsg_file_write for log files" | Mark Salyzyn | 2016-03-31 | 8 | -12/+548 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | recovery: use __android_log_pmsg_file_write for log files | Mark Salyzyn | 2016-03-28 | 8 | -12/+548 |
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: f1b2785 -s ours | Bill Yi | 2016-03-31 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-03-31 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-03-31 | 81 | -312/+498 |
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Bill Yi | 2016-03-31 | 81 | -312/+498 |
* | | | | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." am: ebd22be am: ecc068c -s ours | Yabin Cui | 2016-03-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." am: ebd22be | Yabin Cui | 2016-03-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "uncrypt: remove --read-bcb option." | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | uncrypt: remove --read-bcb option. | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-dev am: 912e87e -s ours | Yabin Cui | 2016-03-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-dev | Yabin Cui | 2016-03-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "uncrypt: fix call to close()." into nyc-dev | Yabin Cui | 2016-03-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | uncrypt: fix call to close(). | Yabin Cui | 2016-03-30 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" am: 3568004 am: 2e21897 | Tianjie Xu | 2016-03-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" am: 3568004 | Tianjie Xu | 2016-03-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" | Tianjie Xu | 2016-03-30 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Add string for Installing_security_update" | Tianjie Xu | 2016-03-30 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Add string for Installing_security_update | Tianjie Xu | 2016-03-29 | 1 | -0/+4 |
| | | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | resolve merge conflicts of 61799ba to nyc-dev-plus-aosp | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | resolve merge conflicts of 61799ba to nyc-dev-plus-aosp | Yabin Cui | 2016-03-30 | 1 | -32/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | uncrypt: remove --read-bcb option. | Yabin Cui | 2016-03-29 | 1 | -32/+0 |
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Add string for Installing_security_update am: 1ee0ff3 | Tianjie Xu | 2016-03-29 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Add string for Installing_security_update | Tianjie Xu | 2016-03-29 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Add string for Installing_security_update | Tianjie Xu | 2016-03-29 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | Fix uncrypt.cpp unique_fd build breakage. | Elliott Hughes | 2016-03-29 | 1 | -10/+10 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Fix uncrypt.cpp unique_fd build breakage. | Elliott Hughes | 2016-03-29 | 1 | -10/+10 |
* | | | | | | | | | | | | | | | | resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp | Elliott Hughes | 2016-03-29 | 4 | -128/+56 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp | Elliott Hughes | 2016-03-29 | 4 | -128/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Switch to <android-base/unique_fd.h>." | Elliott Hughes | 2016-03-29 | 4 | -143/+74 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| / / / / / / / / / / /
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "Switch to <android-base/unique_fd.h>." | Elliott Hughes | 2016-03-29 | 4 | -143/+74 |
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Switch to <android-base/unique_fd.h>. | Elliott Hughes | 2016-03-29 | 4 | -143/+74 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Move recovery_l10n here from development/tools. am: cc79490 | Elliott Hughes | 2016-03-26 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Move recovery_l10n here from development/tools. | Elliott Hughes | 2016-03-26 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Move recovery_l10n here from development/tools. | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
* | | | | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools." am: 2dbd06c | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools." | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Move recovery_l10n here from development/tools." | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Move recovery_l10n here from development/tools. | Elliott Hughes | 2016-03-26 | 83 | -0/+1038 |
* | | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" am: 3123e5a | Tianjie Xu | 2016-03-25 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" | Tianjie Xu | 2016-03-25 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" | Tianjie Xu | 2016-03-25 | 1 | -8/+46 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Skip stashing source blocks in verify mode | Tianjie Xu | 2016-03-25 | 1 | -8/+46 |
* | | | | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp" am: 7e18ce2 | Tianjie Xu | 2016-03-25 | 1 | -23/+5 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp" | Tianjie Xu | 2016-03-25 | 1 | -23/+5 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Clean up intent_file related code in recovery.cpp" | Tianjie Xu | 2016-03-25 | 1 | -23/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Clean up intent_file related code in recovery.cpp | Tianjie Xu | 2016-03-24 | 1 | -23/+5 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache" am: 9afbf2a | Jed Estep | 2016-03-25 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache" | Jed Estep | 2016-03-25 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Correct caching behavior for should_inject_cache" | Tao Bao | 2016-03-25 | 2 | -18/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Correct caching behavior for should_inject_cache | Jed Estep | 2016-03-25 | 2 | -18/+23 |
| | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-dev am: adca297 | Tianjie Xu | 2016-03-24 | 1 | -8/+46 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-dev | Tianjie Xu | 2016-03-24 | 1 | -8/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Skip stashing source blocks in verify mode" into nyc-dev | Tianjie Xu | 2016-03-24 | 1 | -8/+46 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Skip stashing source blocks in verify mode | Tianjie Xu | 2016-03-23 | 1 | -8/+46 |
* | | | | | | | | | | | | | | | | Correct caching behavior for should_inject_cache am: 88dd779 | Jed Estep | 2016-03-24 | 2 | -17/+17 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Correct caching behavior for should_inject_cache | Jed Estep | 2016-03-24 | 2 | -17/+17 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Correct caching behavior for should_inject_cache | Jed Estep | 2016-03-23 | 2 | -17/+17 |
* | | | | | | | | | | | | | | | | Merge "Remove dead tools." am: 4cb6812 | Elliott Hughes | 2016-03-23 | 4 | -398/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Remove dead tools." | Elliott Hughes | 2016-03-23 | 4 | -398/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Remove dead tools." | Elliott Hughes | 2016-03-23 | 4 | -398/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Remove dead tools. | Elliott Hughes | 2016-03-23 | 4 | -398/+0 |
| | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Control fault injection with config files instead of build flags am: ff6df89 | Jed Estep | 2016-03-21 | 10 | -137/+242 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Control fault injection with config files instead of build flags | Jed Estep | 2016-03-21 | 10 | -137/+242 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Control fault injection with config files instead of build flags | Jed Estep | 2016-03-19 | 10 | -137/+242 |
* | | | | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade" am: 867e60d | caozhiyuan | 2016-03-21 | 2 | -12/+14 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade" | caozhiyuan | 2016-03-21 | 2 | -12/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Fix: full ota package larger than 2GB fails to upgrade" | Tao Bao | 2016-03-21 | 2 | -12/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Fix: full ota package larger than 2GB fails to upgrade | caozhiyuan | 2016-03-21 | 2 | -12/+14 |
| | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | recovery: Move SwipeDetector into common location am: 9020e0f | Prashant Malani | 2016-03-18 | 3 | -0/+236 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | recovery: Move SwipeDetector into common location | Prashant Malani | 2016-03-18 | 3 | -0/+236 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | recovery: Move SwipeDetector into common location | Prashant Malani | 2016-03-18 | 3 | -0/+236 |
* | | | | | | | | | | | | | | | resolve merge conflicts of ce58688 to nyc-dev-plus-aosp | Tao Bao | 2016-03-17 | 10 | -241/+139 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | resolve merge conflicts of ce58688 to nyc-dev-plus-aosp | Tao Bao | 2016-03-17 | 10 | -241/+139 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Revert "DO NOT MERGE Control fault injection with config files instead of build flags" | Tao Bao | 2016-03-17 | 10 | -237/+137 |
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | | resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp | Jed Estep | 2016-03-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp | Elliott Hughes | 2016-03-17 | 0 | -0/+0 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | DO NOT MERGE Control fault injection with config files instead of build flags | Jed Estep | 2016-03-16 | 10 | -137/+237 |
* | | | | | | | | | | | | | | Merge "Add include/ to the Makefile include path." am: 38234f4bef | Alex Deymo | 2016-03-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Add include/ to the Makefile include path." | Alex Deymo | 2016-03-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Add include/ to the Makefile include path." | Alex Deymo | 2016-03-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Add include/ to the Makefile include path. | Alex Deymo | 2016-03-14 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp | Greg Kaiser | 2016-03-14 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp | Greg Kaiser | 2016-03-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "otafault: Fix setting of have_eio_error." into nyc-dev | Greg Kaiser | 2016-03-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | otafault: Fix setting of have_eio_error. | Greg Kaiser | 2016-03-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev am: 761653a4ad | Jed Estep | 2016-03-12 | 7 | -7/+428 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev | Jed Estep | 2016-03-12 | 7 | -7/+428 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Port applypatch.sh tests to recovery_component_tests" into nyc-dev | Jed Estep | 2016-03-12 | 7 | -8/+429 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Port applypatch.sh tests to recovery_component_tests | Jed Estep | 2016-03-12 | 7 | -8/+429 |
* | | | | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev am: 20df4adead | Prashant Malani | 2016-03-12 | 4 | -72/+31 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev | Prashant Malani | 2016-03-12 | 4 | -72/+31 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "recovery: Remove SetColor, and other refactoring for WearUI" into nyc-dev | Prashant Malani | 2016-03-12 | 4 | -72/+31 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | recovery: Remove SetColor, and other refactoring for WearUI | Prashant Malani | 2016-03-12 | 4 | -72/+31 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | applypatch: use vector to store data in FileContents. am: 1c522df25f -s ours | Yabin Cui | 2016-03-12 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | applypatch: use vector to store data in FileContents. | Yabin Cui | 2016-03-12 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | applypatch: use vector to store data in FileContents. | Yabin Cui | 2016-03-11 | 4 | -127/+78 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | recovery: Remove duplicate variables and functions am: 0ba21cff07 | Prashant Malani | 2016-03-11 | 4 | -18/+6 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | recovery: Remove duplicate variables and functions | Prashant Malani | 2016-03-11 | 4 | -18/+6 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | recovery: Remove duplicate variables and functions | Prashant Malani | 2016-03-11 | 4 | -18/+6 |
* | | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-dev am: d345de66ef -s ours | Tianjie Xu | 2016-03-10 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-dev | Tianjie Xu | 2016-03-10 | 0 | -0/+0 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" into nyc-dev | Tianjie Xu | 2016-03-10 | 5 | -12/+119 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Reboot and retry on I/O errors | Tianjie Xu | 2016-03-10 | 5 | -12/+119 |
* | | | | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI" am: f7f9e50528 | Prashant Malani | 2016-03-10 | 4 | -4/+84 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI" | Prashant Malani | 2016-03-10 | 4 | -4/+84 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Revert "recovery: More refactoring of WearUI" | Prashant Malani | 2016-03-10 | 4 | -4/+84 |
* | | | | | | | | | | | | | | | recovery: More refactoring of WearUI am: 1c7b2230d8 | Prashant Malani | 2016-03-09 | 4 | -84/+4 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | recovery: More refactoring of WearUI | Prashant Malani | 2016-03-09 | 4 | -84/+4 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | recovery: More refactoring of WearUI | Prashant Malani | 2016-03-09 | 4 | -84/+4 |
* | | | | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." am: 5593342575 | Sen Jiang | 2016-03-09 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." | Sen Jiang | 2016-03-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "applypatch: add -fPIC for libimgpatch in Chrome OS." | Sen Jiang | 2016-03-09 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | applypatch: add -fPIC for libimgpatch in Chrome OS. | Sen Jiang | 2016-03-09 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUI am: 7d9fd96dc9 | Prashant Malani | 2016-03-09 | 2 | -35/+2 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUI | Prashant Malani | 2016-03-09 | 2 | -35/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | recovery: Begin refactor of WearUI to use ScreenRecoveryUI | Prashant Malani | 2016-03-08 | 2 | -35/+2 |
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" am: 94dc34148c am: 90f01a4203 | Tianjie Xu | 2016-03-08 | 5 | -7/+93 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" am: 94dc34148c | Tianjie Xu | 2016-03-08 | 5 | -7/+93 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "Reboot and retry on I/O errors" | Tianjie Xu | 2016-03-08 | 5 | -7/+93 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Reboot and retry on I/O errors" | Tianjie Xu | 2016-03-08 | 5 | -7/+93 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Reboot and retry on I/O errors | Tianjie Xu | 2016-03-03 | 5 | -7/+93 |
| | | | | |/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-dev am: 1731f2980b | Alex Deymo | 2016-03-05 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-dev | Alex Deymo | 2016-03-05 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." into nyc-dev | Alex Deymo | 2016-03-05 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Restore labels on /postinstall during recovery. | Alex Deymo | 2016-03-05 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | | | recovery: Handle devices without /cache partition. am: ae6408d1a2 | Tao Bao | 2016-03-04 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | recovery: Handle devices without /cache partition. | Tao Bao | 2016-03-04 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | recovery: Handle devices without /cache partition. | Tao Bao | 2016-03-04 | 1 | -10/+29 |
| | |/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2 am: f2726712ea | Tao Bao | 2016-03-04 | 1 | -10/+29 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2 | Tao Bao | 2016-03-04 | 1 | -10/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." | Tao Bao | 2016-03-04 | 1 | -10/+29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "recovery: Handle devices without /cache partition." | Tao Bao | 2016-03-04 | 1 | -10/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | recovery: Handle devices without /cache partition. | Tao Bao | 2016-03-03 | 1 | -10/+29 |
* | | | | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51 am: 038c294453 | Tao Bao | 2016-03-04 | 10 | -60/+102 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51 | Tao Bao | 2016-03-04 | 10 | -60/+102 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." | Tao Bao | 2016-03-04 | 10 | -60/+102 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." | Tao Bao | 2016-03-04 | 10 | -60/+102 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES. | Tao Bao | 2016-03-03 | 10 | -60/+102 |
| | | | | |_|/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6 am: f6ffefb116 | Alex Deymo | 2016-03-04 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6 | Alex Deymo | 2016-03-04 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." | Alex Deymo | 2016-03-04 | 1 | -0/+3 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Restore labels on /postinstall during recovery." | Alex Deymo | 2016-03-04 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Restore labels on /postinstall during recovery. | Alex Deymo | 2016-03-02 | 1 | -0/+3 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt. am: 3a2bb594df | Tao Bao | 2016-03-04 | 2 | -79/+184 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt. | Tao Bao | 2016-03-04 | 2 | -79/+184 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | uncrypt: Communicate via /dev/socket/uncrypt. | Tao Bao | 2016-03-03 | 2 | -79/+184 |
* | | | | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." am: 5ffc038be6 am: ea0e0faae6 | Mattias Nissler | 2016-03-01 | 1 | -10/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." am: 5ffc038be6 | Mattias Nissler | 2016-03-01 | 1 | -10/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." | Mattias Nissler | 2016-03-01 | 1 | -10/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Remove dumpkey build guards after completing code move." | Mattias Nissler | 2016-03-01 | 1 | -10/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Remove dumpkey build guards after completing code move. | Mattias Nissler | 2016-02-26 | 1 | -10/+0 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-dev am: 9db7964834 | Prashant Malani | 2016-03-01 | 2 | -0/+35 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-dev | Prashant Malani | 2016-02-29 | 2 | -0/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Fixes to wear recovery for N" into nyc-dev | Prashant Malani | 2016-02-29 | 2 | -0/+35 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Fixes to wear recovery for N | Prashant Malani | 2016-02-27 | 2 | -0/+35 |
* | | | | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-dev am: 65f35b5c35 | Tao Bao | 2016-02-28 | 2 | -19/+2 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-dev | Tao Bao | 2016-02-28 | 2 | -19/+2 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "uncrypt: Retire pre-recovery service." into nyc-dev | Tao Bao | 2016-02-28 | 2 | -19/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | uncrypt: Retire pre-recovery service. | Tao Bao | 2016-02-23 | 2 | -19/+2 |
* | | | | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." am: 5197fde242 am: b652678953 | Mattias Nissler | 2016-02-26 | 3 | -0/+303 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." am: 5197fde242 | Mattias Nissler | 2016-02-26 | 3 | -0/+303 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." | Mattias Nissler | 2016-02-26 | 3 | -0/+303 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Move dumpkey tool to the recovery repo." | Mattias Nissler | 2016-02-26 | 3 | -0/+303 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Move dumpkey tool to the recovery repo. | Mattias Nissler | 2016-02-24 | 3 | -0/+303 |
| | | |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | Move recovery\'s convert_fbe folder to /tmp am: 661f8a69f2 | Paul Lawrence | 2016-02-25 | 1 | -4/+7 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Move recovery\'s convert_fbe folder to /tmp | Paul Lawrence | 2016-02-25 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Move recovery's convert_fbe folder to /tmp | Paul Lawrence | 2016-02-25 | 1 | -4/+7 |
* | | | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-dev am: 0757a093c1 | Josh Gao | 2016-02-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-dev | Josh Gao | 2016-02-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." into nyc-dev | Josh Gao | 2016-02-24 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | minadbd: update for adb_thread_create signature change. | Josh Gao | 2016-02-23 | 1 | -2/+1 |
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | recovery: check battery level before installing package. am: 99281df8e2 | Yabin Cui | 2016-02-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | recovery: check battery level before installing package. | Yabin Cui | 2016-02-24 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | recovery: check battery level before installing package. | Yabin Cui | 2016-02-23 | 3 | -16/+89 |
* | | | | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702 am: 0d63468171 | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702 | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge "Surpress warnings in minzip/Zip.c" | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | Surpress warnings in minzip/Zip.c | Tianjie Xu | 2016-02-23 | 1 | -4/+1 |
* | | | | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1 am: 089fe38ac5 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|/ / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|_|_|/ / / / / / /
| | | | | |/| | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |_|_|_|_|/ / / / / /
| | | | | | |/| | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |_|_|_|_|/ / / / /
| | | | | | | |/| | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | |_|_|_|_|/ / / /
| | | | | | | | |/| | | | | | | | |
|
| | | | | | | | * | | | | | | | | | Fix integer overflows in recovery procedure. am: 1273956e69 | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | * \ \ \ \ \ \ \ \ | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | |_|_|_|_|/ / /
| | | | | | | | | | |/| | | | | | | |
|
| | | | | | | | | | * | | | | | | | | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
* | | | | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-dev am: 0d28ba452f | Yabin Cui | 2016-02-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-dev | Yabin Cui | 2016-02-23 | 1 | -15/+52 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | resolve merge conflicts of e5d3d15cd2 to nyc-dev | Yabin Cui | 2016-02-23 | 1 | -15/+52 |
| | |\| | | | | | | | | | | | | | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Fix integer overflows in recovery procedure. am: 4f2df162c6 | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | |\| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-23 | 1 | -15/+54 |
| | | | |\| | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-22 | 1 | -15/+54 |
* | | | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" am: ed796b046d am: 24b3622933 | Tao Bao | 2016-02-23 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" am: ed796b046d | Tao Bao | 2016-02-23 | 10 | -121/+242 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|/ / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" | Tao Bao | 2016-02-23 | 10 | -121/+242 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|/ / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" | Tao Bao | 2016-02-23 | 10 | -121/+242 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|/ / / /
| | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Control fault injection with config files instead of build flags | Jed Estep | 2016-02-23 | 10 | -121/+242 |
* | | | | | | | | | | | | | | | | | Merge "Control fault injection with config files instead of build flags" | Jed Estep | 2016-02-23 | 10 | -121/+242 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Control fault injection with config files instead of build flags | Jed Estep | 2016-02-20 | 10 | -121/+242 |
* | | | | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." am: 16d0a18514 am: d1b66ad6a1 | Yabin Cui | 2016-02-23 | 3 | -16/+89 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." am: 16d0a18514 | Yabin Cui | 2016-02-23 | 3 | -16/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." | Yabin Cui | 2016-02-23 | 3 | -16/+89 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge "recovery: check battery level before installing package." | Yabin Cui | 2016-02-22 | 3 | -16/+89 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | recovery: check battery level before installing package. | Yabin Cui | 2016-02-20 | 3 | -16/+89 |
* | | | | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflict am: e1305768f6 | Jed Estep | 2016-02-22 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflict | Jed Estep | 2016-02-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Fix verifier test base testdata directory after merge conflict | Jed Estep | 2016-02-22 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge "Check each value read from block map file." | Yabin Cui | 2016-02-22 | 1 | -15/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | Check each value read from block map file. | Yabin Cui | 2016-02-20 | 1 | -15/+31 |
* | | | | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." am: fa9af7dae6 am: af38cd9330 | Elliott Hughes | 2016-02-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." am: fa9af7dae6 | Elliott Hughes | 2016-02-20 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." | Elliott Hughes | 2016-02-20 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge "Fix minui cleanup path on error." | Elliott Hughes | 2016-02-20 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | Fix minui cleanup path on error. | Elliott Hughes | 2016-02-19 | 1 | -3/+3 |
| | | |/ / / / / / / / / / / / / / / |
|
* | | | / / / / / / / / / / / / / / | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s ours am: a4436f7b25 -s ours | Tao Bao | 2016-02-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
| |_|_|/ / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours am: 52991c4639 -s ours | Tao Bao | 2016-02-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b -s ours | Tao Bao | 2016-02-19 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. | Tao Bao | 2016-02-19 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / / / / / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. | Tao Bao | 2016-02-19 | 1 | -7/+22 |
| | | |/ / / / / / / / / / / / / |
|
* | | / / / / / / / / / / / / / | Fix integer overflows in recovery procedure. | Yabin Cui | 2016-02-18 | 2 | -12/+33 |
|/ / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | Merge commit \'ce46828e08281dc507d4e40ba9e8b770bc21cf0b\' into HEAD | Bill Yi | 2016-02-17 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / / / / /
| |/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge commit 'ce46828e08281dc507d4e40ba9e8b770bc21cf0b' into HEAD | Bill Yi | 2016-02-17 | 1 | -12/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / / / / /
| |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | Merge "applypatch: Add libimgpatch.pc" | Sen Jiang | 2016-02-17 | 1 | -0/+6 |
|\| | | | | | | | | | | | | |
| |_|_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "applypatch: Add libimgpatch.pc" | Sen Jiang | 2016-02-17 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | applypatch: Add libimgpatch.pc | Sen Jiang | 2016-02-16 | 1 | -0/+6 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." | Josh Gao | 2016-02-13 | 1 | -2/+1 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "minadbd: update for adb_thread_create signature change." | Josh Gao | 2016-02-13 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | minadbd: update for adb_thread_create signature change. | Josh Gao | 2016-02-13 | 1 | -2/+1 |
| | | |_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | | Merge "imgdiff: don\'t fail if gzip is corrupted." | Sen Jiang | 2016-02-13 | 1 | -12/+10 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "imgdiff: don't fail if gzip is corrupted." | Sen Jiang | 2016-02-12 | 1 | -12/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | imgdiff: don't fail if gzip is corrupted. | Sen Jiang | 2016-02-12 | 1 | -12/+10 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "applypatch: use vector to store data in FileContents." | Yabin Cui | 2016-02-12 | 4 | -126/+77 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "applypatch: use vector to store data in FileContents." | Yabin Cui | 2016-02-12 | 4 | -126/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | applypatch: use vector to store data in FileContents. | Yabin Cui | 2016-02-12 | 4 | -126/+77 |
* | | | | | | | | | | | | | | Merge "Fix some memory leaks." | Yabin Cui | 2016-02-11 | 4 | -60/+35 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Fix some memory leaks." | Yabin Cui | 2016-02-11 | 4 | -60/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Fix some memory leaks. | Yabin Cui | 2016-02-11 | 4 | -60/+35 |
* | | | | | | | | | | | | | | resolve merge conflicts of 7043206503 to nyc-dev-plus-aosp. | Tao Bao | 2016-02-10 | 4 | -20/+18 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "IO fault injection for OTA packages" | Tao Bao | 2016-02-10 | 10 | -62/+365 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | IO fault injection for OTA packages | Jed Estep | 2016-02-10 | 10 | -62/+365 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "applypatch: Add a Makefile to build imgdiff in Chrome OS." | Sen Jiang | 2016-02-10 | 6 | -4/+39 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "applypatch: Add a Makefile to build imgdiff in Chrome OS." | Sen Jiang | 2016-02-10 | 6 | -4/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | applypatch: Add a Makefile to build imgdiff in Chrome OS. | Sen Jiang | 2016-02-10 | 6 | -4/+39 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "verifier_test: Suppress the unused parameter warnings." | Tao Bao | 2016-02-09 | 1 | -8/+9 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "verifier_test: Suppress the unused parameter warnings." | Tao Bao | 2016-02-09 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | verifier_test: Suppress the unused parameter warnings. | Tao Bao | 2016-02-05 | 1 | -8/+9 |
* | | | | | | | | | | | | | | Merge "Change on-device directory for recovery test data" | Tao Bao | 2016-02-08 | 2 | -2/+2 |
|\| | | | | | | | | | | | |
| |_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Change on-device directory for recovery test data" | Tao Bao | 2016-02-08 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | Change on-device directory for recovery test data | Jed Estep | 2016-02-05 | 2 | -2/+2 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | resolve merge conflicts of 715d8a203a to master. | Yabin Cui | 2016-02-06 | 7 | -303/+204 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Merge "applypatch: fix memory leaks reported by static analysis." | Yabin Cui | 2016-02-05 | 7 | -303/+202 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "applypatch: fix memory leaks reported by static analysis." | Yabin Cui | 2016-02-05 | 7 | -303/+202 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | applypatch: fix memory leaks reported by static analysis. | Yabin Cui | 2016-02-05 | 7 | -303/+202 |
* | | | | | | | | | | | | | | Merge "Refactor existing tests to use gtest" am: 38b02cc6a0 | Tao Bao | 2016-02-05 | 25 | -215/+145 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Refactor existing tests to use gtest" | Tao Bao | 2016-02-05 | 25 | -215/+145 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Refactor existing tests to use gtest" | Tao Bao | 2016-02-05 | 25 | -215/+145 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Refactor existing tests to use gtest | Jed Estep | 2016-02-04 | 25 | -215/+145 |
* | | | | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis." am: e50d447692 | Yabin Cui | 2016-02-05 | 1 | -44/+39 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis." | Yabin Cui | 2016-02-05 | 1 | -44/+39 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge "updater: fix memory leak based on static analysis." | Yabin Cui | 2016-02-05 | 1 | -44/+39 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | updater: fix memory leak based on static analysis. | Yabin Cui | 2016-02-04 | 1 | -44/+39 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | resolve merge conflicts of 7b6027dde4 to master. | Tao Bao | 2016-02-04 | 10 | -61/+59 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Switch from mincrypt to BoringSSL in applypatch and updater." | Tao Bao | 2016-02-04 | 10 | -61/+59 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Switch from mincrypt to BoringSSL in applypatch and updater." | Tao Bao | 2016-02-04 | 10 | -61/+59 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Switch from mincrypt to BoringSSL in applypatch and updater. | Sen Jiang | 2016-02-04 | 10 | -61/+59 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb." am: e3434279c8 | Yabin Cui | 2016-02-03 | 2 | -104/+198 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb." | Yabin Cui | 2016-02-03 | 2 | -104/+198 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "uncrypt: add options to setup bcb and clear bcb." | Yabin Cui | 2016-02-03 | 2 | -104/+198 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | uncrypt: add options to setup bcb and clear bcb. | Yabin Cui | 2016-02-03 | 2 | -104/+198 |
* | | | | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test." am: 351ddbbc0a | Tao Bao | 2016-02-03 | 4 | -193/+168 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test." | Tao Bao | 2016-02-03 | 4 | -193/+168 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "recovery: Refactor verifier and verifier_test." | Tao Bao | 2016-02-03 | 4 | -193/+168 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | recovery: Refactor verifier and verifier_test. | Tao Bao | 2016-02-03 | 4 | -193/+168 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file." am: 4c07a7ec05 | Yabin Cui | 2016-02-02 | 1 | -75/+93 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file." | Yabin Cui | 2016-02-02 | 1 | -75/+93 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "uncrypt: generate map file by renaming tmp file." | Yabin Cui | 2016-02-02 | 1 | -75/+93 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | uncrypt: generate map file by renaming tmp file. | Yabin Cui | 2016-02-01 | 1 | -75/+93 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Fix build." am: 9d72d4175b | Tao Bao | 2016-01-29 | 1 | -0/+2 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Fix build." | Tao Bao | 2016-01-29 | 1 | -0/+2 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Fix build." | Tao Bao | 2016-01-29 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Fix build. | Tao Bao | 2016-01-29 | 1 | -0/+2 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | resolve merge conflicts of 725833e024 to master. | Tao Bao | 2016-01-29 | 4 | -2/+69 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "applypatch: Compile libimgpatch for target and host." | Sen Jiang | 2016-01-29 | 4 | -2/+69 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "applypatch: Compile libimgpatch for target and host." | Sen Jiang | 2016-01-29 | 4 | -2/+69 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | applypatch: Compile libimgpatch for target and host. | Sen Jiang | 2016-01-28 | 4 | -2/+69 |
* | | | | | | | | | | | | | | Merge "edify: accept long string literal." am: d379b4410b | Yabin Cui | 2016-01-28 | 2 | -13/+16 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "edify: accept long string literal." | Yabin Cui | 2016-01-28 | 2 | -13/+16 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "edify: accept long string literal." | Yabin Cui | 2016-01-28 | 2 | -13/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | edify: accept long string literal. | Yabin Cui | 2016-01-27 | 2 | -13/+16 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Change BCB to perform synchronous writes." am: 5797bf9c90 | Tao Bao | 2016-01-22 | 1 | -59/+74 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Change BCB to perform synchronous writes." | Tao Bao | 2016-01-22 | 1 | -59/+74 |
| |\| | | | | | | | | | |
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "Change BCB to perform synchronous writes." | Tao Bao | 2016-01-22 | 1 | -59/+74 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Change BCB to perform synchronous writes. | Tao Bao | 2016-01-21 | 1 | -59/+74 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card." am: 37e3c71da3 | Tao Bao | 2016-01-14 | 3 | -69/+69 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card." | Tao Bao | 2016-01-14 | 3 | -69/+69 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "recovery: Fork a process for fuse when sideloading from SD card." | Tao Bao | 2016-01-14 | 3 | -69/+69 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | recovery: Fork a process for fuse when sideloading from SD card. | Tao Bao | 2016-01-14 | 3 | -69/+69 |
* | | | | | | | | | | | | | Merge "uncrypt: avoid use-after-free" am: 0305fcecc5 | Tao Bao | 2016-01-14 | 1 | -3/+4 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "uncrypt: avoid use-after-free" | Tao Bao | 2016-01-14 | 1 | -3/+4 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "uncrypt: avoid use-after-free" | Tao Bao | 2016-01-14 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | uncrypt: avoid use-after-free | Daniel Micay | 2016-01-12 | 1 | -3/+4 |
* | | | | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222 am: 40cce13094 | Andriy Naborskyy | 2016-01-13 | 1 | -12/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222 | Andriy Naborskyy | 2016-01-12 | 1 | -12/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ | Revert "Byte swap to support BGRA in recovery mode" | Andriy Naborskyy | 2016-01-12 | 1 | -12/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | Revert "Byte swap to support BGRA in recovery mode" | Andriy Naborskyy | 2016-01-08 | 1 | -12/+0 |
* | | | | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy" am: ab9db5284e | Ying Wang | 2016-01-13 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy" | Ying Wang | 2016-01-12 | 3 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "Rename .l/.y to .ll/.yy" | Ying Wang | 2016-01-12 | 3 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Rename .l/.y to .ll/.yy | Ying Wang | 2016-01-12 | 3 | -2/+2 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Rename .l/.y to .ll/.yy | Ying Wang | 2016-01-13 | 3 | -2/+2 |
* | | | | | | | | | | | | | Merge "IO fault injection for OTA packages" | Jed Estep | 2016-01-09 | 10 | -45/+348 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | IO fault injection for OTA packages | Jed Estep | 2016-01-06 | 10 | -45/+348 |
* | | | | | | | | | | | | | | Merge "updater: Add a function to check first block" am: 6f8b9b60db | Tianjie Xu | 2016-01-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "updater: Add a function to check first block" | Tianjie Xu | 2016-01-08 | 2 | -0/+58 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "updater: Add a function to check first block" | Tianjie Xu | 2016-01-08 | 2 | -0/+58 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | updater: Add a function to check first block | Tianjie Xu | 2016-01-07 | 2 | -0/+58 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "updater: Add a function to check first block" | Tianjie Xu | 2016-01-07 | 2 | -0/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|/ / / / / / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | updater: Add a function to check first block | Tianjie Xu | 2015-12-18 | 2 | -0/+58 |
* | | | | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files" am: 8e150a5b24 | David Riley | 2016-01-04 | 1 | -6/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files" | David Riley | 2016-01-04 | 1 | -6/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "imgdiff: skip spurious gzip headers in image files" | David Riley | 2016-01-04 | 1 | -6/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | imgdiff: skip spurious gzip headers in image files | David Riley | 2015-12-23 | 1 | -6/+13 |
| | |/ / / / / / / / / / / / |
|
* | | / / / / / / / / / / / | Merge "res: Embed FPS into icon_installing.png." am: 29b0fbe160 | Tao Bao | 2015-12-18 | 12 | -42/+82 |
|\| | | | | | | | | | | | |
| |_|/ / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "res: Embed FPS into icon_installing.png." | Tao Bao | 2015-12-18 | 12 | -42/+82 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "res: Embed FPS into icon_installing.png." | Tao Bao | 2015-12-18 | 12 | -42/+82 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | res: Embed FPS into icon_installing.png. | Tao Bao | 2015-12-16 | 12 | -42/+82 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." am: 4e72d1a81e | Tao Bao | 2015-12-15 | 1 | -6/+13 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." | Tao Bao | 2015-12-15 | 1 | -6/+13 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." | Tao Bao | 2015-12-15 | 1 | -6/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | updater: Use O_SYNC and fsync() for package_extract_file(). | Tao Bao | 2015-12-15 | 1 | -6/+13 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()." am: e062645efa | Tao Bao | 2015-12-11 | 1 | -5/+6 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()." | Tao Bao | 2015-12-11 | 1 | -5/+6 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "update_verifier: Track the API change for isSlotBootable()." | Tao Bao | 2015-12-11 | 1 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | update_verifier: Track the API change for isSlotBootable(). | Tao Bao | 2015-12-09 | 1 | -5/+6 |
* | | | | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64." am: ca18526760 | Tao Bao | 2015-12-11 | 1 | -10/+12 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64." | Tao Bao | 2015-12-11 | 1 | -10/+12 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "uncrypt: Suppress the compiler warnings on LP64." | Tao Bao | 2015-12-11 | 1 | -10/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | uncrypt: Suppress the compiler warnings on LP64. | Tao Bao | 2015-12-09 | 1 | -10/+12 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" am: 32f6298742 | Tianjie Xu | 2015-12-11 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" | Tianjie Xu | 2015-12-11 | 1 | -1/+4 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" | Tianjie Xu | 2015-12-11 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | updater: Output msg when recovery is called | Tianjie Xu | 2015-12-11 | 1 | -1/+4 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "updater: Output msg when recovery is called" | Tianjie Xu | 2015-12-11 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | updater: Output msg when recovery is called | Tianjie Xu | 2015-12-10 | 1 | -1/+4 |
* | | | | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2 am: ddde4676b6 | Tao Bao | 2015-12-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2 | Tao Bao | 2015-12-08 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge changes If00669a7,Ia5504ed2 | Tao Bao | 2015-12-08 | 3 | -0/+105 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. | Tao Bao | 2015-12-08 | 2 | -12/+8 |
| | | * | | | | | | | | | | | | Add update_verifier for A/B OTA update. | Tao Bao | 2015-12-08 | 3 | -0/+109 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()." am: d0acbb56ed | Tao Bao | 2015-12-08 | 1 | -133/+144 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()." | Tao Bao | 2015-12-08 | 1 | -133/+144 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge "updater: Replace strtok() with android::base::Split()." | Tao Bao | 2015-12-08 | 1 | -133/+144 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | updater: Replace strtok() with android::base::Split(). | Tao Bao | 2015-12-07 | 1 | -133/+144 |
| | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. am: 45eac58ef1 | Tao Bao | 2015-12-08 | 2 | -12/+8 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. | Tao Bao | 2015-12-08 | 2 | -12/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | update_verifier: Log to logd instead of kernel log. | Tao Bao | 2015-12-08 | 2 | -12/+8 |
* | | | | | | | | | | | | | | Add update_verifier for A/B OTA update. am: 1171d3a12b | Tao Bao | 2015-12-08 | 3 | -0/+109 |
|\| | | | | | | | | | | | |
| |_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Add update_verifier for A/B OTA update. | Tao Bao | 2015-12-08 | 3 | -0/+109 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Add update_verifier for A/B OTA update. | Tao Bao | 2015-12-07 | 3 | -0/+109 |
* | | | | | | | | | | | | | Merge "Track rename from base/ to android-base/." am: 06ca938ce2 | Elliott Hughes | 2015-12-05 | 7 | -13/+13 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Track rename from base/ to android-base/." | Elliott Hughes | 2015-12-05 | 7 | -13/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Track rename from base/ to android-base/." | Elliott Hughes | 2015-12-05 | 7 | -13/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Track rename from base/ to android-base/. | Elliott Hughes | 2015-12-05 | 7 | -13/+13 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Remove the building rules for applypatch_static." am: fc23a50cef | Tao Bao | 2015-12-05 | 1 | -13/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Remove the building rules for applypatch_static." | Tao Bao | 2015-12-03 | 1 | -13/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Remove the building rules for applypatch_static." | Tao Bao | 2015-12-02 | 1 | -13/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Remove the building rules for applypatch_static. | Tao Bao | 2015-12-02 | 1 | -13/+0 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main." am: ee5c87eea7 | Elliott Hughes | 2015-11-20 | 2 | -2/+2 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main." | Elliott Hughes | 2015-11-20 | 2 | -2/+2 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge "Track name change from adb_main to adb_server_main." | Elliott Hughes | 2015-11-20 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Track name change from adb_main to adb_server_main. | Elliott Hughes | 2015-11-20 | 2 | -2/+2 |
| | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | Add slot_suffix field to struct bootloader_message. am: 846c094fee | David Zeuthen | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Add slot_suffix field to struct bootloader_message. | David Zeuthen | 2015-11-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Add slot_suffix field to struct bootloader_message. | David Zeuthen | 2015-11-16 | 1 | -1/+9 |
* | | | | | | | | | | | | | Merge commit \'8f90389966fabf532b24741d49245215279533e1\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit '8f90389966fabf532b24741d49245215279533e1' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | recovery: Allow "Mount /system" for system_root_image. | Tao Bao | 2015-11-16 | 3 | -19/+39 |
* | | | | | | | | | | | | | Merge commit \'32ac97675bade3681203c46d001f76b11a359fd5\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit '32ac97675bade3681203c46d001f76b11a359fd5' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | applypatch: Fix the checking in WriteToPartition(). | Tao Bao | 2015-11-16 | 1 | -3/+4 |
* | | | | | | | | | | | | | Merge commit \'f47259b18492c921445d9e437a9f9ed11c52fac6\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit 'f47259b18492c921445d9e437a9f9ed11c52fac6' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | applypatch: Support flash mode. | Tao Bao | 2015-11-16 | 3 | -16/+97 |
* | | | | | | | | | | | | | Merge commit \'3b199267d6d4c279cbef3286a74e16bf92dd8d8a\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit '3b199267d6d4c279cbef3286a74e16bf92dd8d8a' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | updater: libapplypatch needs libbase now. | Tao Bao | 2015-11-16 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge commit \'27604fcbee0010b800bfc16b5bf7a48c365c2cf3\' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-20 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge commit '27604fcbee0010b800bfc16b5bf7a48c365c2cf3' into mnc-dr2-dev-plus-aosp | Qiwen Zhao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | applypatch: Refactor strtok(). | Tao Bao | 2015-11-16 | 2 | -86/+56 |
* | | | | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. am: 818fa781d1 -s ours | Tao Bao | 2015-11-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. | Tao Bao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. | Tao Bao | 2015-11-16 | 15 | -300/+304 |
* | | | | | | | | | | | | | Add error and range checks to parse_range am: 806f72f9e6 -s ours | Sami Tolvanen | 2015-11-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Add error and range checks to parse_range | Sami Tolvanen | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Add error and range checks to parse_range | Sami Tolvanen | 2015-11-16 | 1 | -10/+71 |
* | | | | | | | | | | | | | Stop using libstdc++. am: 56deefba73 -s ours | Dan Albert | 2015-11-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Stop using libstdc++. | Dan Albert | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Stop using libstdc++. | Dan Albert | 2015-11-16 | 3 | -5/+3 |
* | | | | | | | | | | | | | recovery: Switch to clang am: 7101b2e285 -s ours | Tao Bao | 2015-11-19 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | recovery: Switch to clang | Tao Bao | 2015-11-19 | 0 | -0/+0 |
| |\| | | | | | | | | | |
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | recovery: Switch to clang | Tao Bao | 2015-11-16 | 13 | -11/+38 |
| | |/ / / / / / / / / |
|
* | | | | | | | | | | | Merge "Create convert_fbe breadcrumb file to support conversion to FBE" | Paul Lawrence | 2015-11-13 | 3 | -3/+35 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Create convert_fbe breadcrumb file to support conversion to FBE | Paul Lawrence | 2015-11-13 | 3 | -3/+35 |
* | | | | | | | | | | | | Merge "We can use fclose directly in std::unique_ptr." | Elliott Hughes | 2015-11-13 | 2 | -16/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / /
|/| / / / / / / / / / /
| |/ / / / / / / / / / |
|
| * | | | | | | | | | | Merge "We can use fclose directly in std::unique_ptr." | Elliott Hughes | 2015-11-13 | 2 | -16/+5 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | We can use fclose directly in std::unique_ptr. | Elliott Hughes | 2015-11-13 | 2 | -16/+5 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Merge "uncrypt: remove O_SYNC to avoid time-out failures" | Tao Bao | 2015-11-05 | 1 | -1/+1 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "uncrypt: remove O_SYNC to avoid time-out failures" | Tao Bao | 2015-11-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | uncrypt: remove O_SYNC to avoid time-out failures | Jaegeuk Kim | 2015-11-04 | 1 | -1/+1 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Merge "recovery: Depend on mkfs.f2fs only if needed." am: a412198699 | Tao Bao | 2015-10-28 | 1 | -0/+2 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge "recovery: Depend on mkfs.f2fs only if needed." | Tao Bao | 2015-10-28 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge "recovery: Depend on mkfs.f2fs only if needed." | Tao Bao | 2015-10-28 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | recovery: Depend on mkfs.f2fs only if needed. | Tao Bao | 2015-10-28 | 1 | -0/+2 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4." am: f204185f71 | Tao Bao | 2015-10-23 | 1 | -1/+1 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4." | Tao Bao | 2015-10-23 | 1 | -1/+1 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "updater: Bump up the BBOTA version to 4." | Tao Bao | 2015-10-23 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | updater: Bump up the BBOTA version to 4. | Tao Bao | 2015-10-23 | 1 | -1/+1 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | am 339ec2ef: am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery" | Sami Tolvanen | 2015-10-19 | 2 | -1/+78 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery" | Sami Tolvanen | 2015-10-19 | 2 | -1/+78 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge "Error correction: Use libfec in blockimg.cpp for recovery" | Sami Tolvanen | 2015-10-19 | 2 | -1/+78 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Error correction: Use libfec in blockimg.cpp for recovery | Sami Tolvanen | 2015-10-19 | 2 | -1/+78 |
| | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | am 4c6c96a5: am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file." | Tao Bao | 2015-10-01 | 1 | -0/+4 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file." | Tao Bao | 2015-10-01 | 1 | -0/+4 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file." | Tao Bao | 2015-10-01 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ | Merge "updater: Skip empty lines in the transfer list file." | Tao Bao | 2015-10-01 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | updater: Skip empty lines in the transfer list file. | Tao Bao | 2015-09-26 | 1 | -0/+4 |
* | | | | | | | | | | | | | | am 6eb2668d: am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread." | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread." | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread." | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "minadbd: use strdup() to create argument for sideload thread." | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | | * | | | | | | | | | | minadbd: use strdup() to create argument for sideload thread. | Yabin Cui | 2015-09-30 | 1 | -2/+4 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am d7156748: am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3b | Tao Bao | 2015-09-25 | 3 | -57/+42 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3b | Tao Bao | 2015-09-25 | 3 | -57/+42 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am 2bdac629: Merge changes Ic769eafc,I63f28b3b | Tao Bao | 2015-09-25 | 3 | -57/+42 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge changes Ic769eafc,I63f28b3b | Tao Bao | 2015-09-25 | 3 | -57/+42 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | updater: Use android::base::ParseInt() to parse integers. | Tao Bao | 2015-09-24 | 2 | -52/+37 |
| | | | * | | | | | | | | | | Suppress some compiler warnings due to signedness. | Tao Bao | 2015-09-24 | 2 | -5/+5 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 7c7d876d: am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()." | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()." | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am 3317d501: Merge "minadbd: move from D() to VLOG()." | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "minadbd: move from D() to VLOG()." | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | minadbd: move from D() to VLOG(). | Yabin Cui | 2015-09-24 | 2 | -5/+2 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am c66b9ead: am cd3c8c4e: am b739a32b: Merge "recovery: Add timestamps in update logs." | Tao Bao | 2015-09-18 | 1 | -16/+98 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am cd3c8c4e: am b739a32b: Merge "recovery: Add timestamps in update logs." | Tao Bao | 2015-09-18 | 1 | -16/+98 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am b739a32b: Merge "recovery: Add timestamps in update logs." | Tao Bao | 2015-09-18 | 1 | -16/+98 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "recovery: Add timestamps in update logs." | Tao Bao | 2015-09-18 | 1 | -16/+98 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | recovery: Add timestamps in update logs. | Tao Bao | 2015-09-17 | 1 | -16/+98 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 53cfad08: (-s ours) am cde72079: am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am cde72079: am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / /
| | | | |/| | | | | | | | |
|
| | | | * | | | | | | | | | am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \
| | | | | | |_|/ / / / / /
| | | | | |/| | | | | | | |
|
| | | | | * | | | | | | | | am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \
| | | | | | | |_|/ / / / /
| | | | | | |/| | | | | | |
|
| | | | | | * | | | | | | | am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-17 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \
| | | | | | | | |_|/ / / /
| | | | | | | |/| | | | | |
|
| | | | | | | * | | | | | | am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-12 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \
| | | | | | | | | |_|/ / /
| | | | | | | | |/| | | | |
|
| | | | | | | | * | | | | | am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-10 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \
| | | | | | | | | | |_|/ /
| | | | | | | | | |/| | | |
|
| | | | | | | | | * | | | | am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-10 | 1 | -0/+1 |
| | | | | | | | | |\ \ \ \
| | | | | | | | | | | |_|/
| | | | | | | | | | |/| | |
|
| | | | | | | | | | * | | | Track usage of Vector / SortedVector from libutils DO NOT MERGE | Narayan Kamath | 2015-09-09 | 1 | -0/+1 |
* | | | | | | | | | | | | | am 6e9f726f: am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector." | Tao Bao | 2015-09-16 | 1 | -228/+168 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector." | Tao Bao | 2015-09-16 | 1 | -228/+168 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am a42a322d: Merge "updater: Manage buffers with std::vector." | Tao Bao | 2015-09-16 | 1 | -228/+168 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|/
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "updater: Manage buffers with std::vector." | Tao Bao | 2015-09-16 | 1 | -228/+168 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | updater: Manage buffers with std::vector. | Tao Bao | 2015-09-10 | 1 | -228/+168 |
* | | | | | | | | | | | | | | am cd3a68ce: am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature." | David Pursell | 2015-09-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature." | David Pursell | 2015-09-14 | 1 | -1/+1 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am ee17242f: Merge "minadbd: update service_to_fd() signature." | David Pursell | 2015-09-14 | 1 | -1/+1 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "minadbd: update service_to_fd() signature." | David Pursell | 2015-09-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | minadbd: update service_to_fd() signature. | David Pursell | 2015-09-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | am 8b2dcfb1: am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()." | Tao Bao | 2015-09-12 | 2 | -4/+1 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()." | Tao Bao | 2015-09-12 | 2 | -4/+1 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()." | Tao Bao | 2015-09-12 | 2 | -4/+1 |
| | |\| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "recovery: Remove redirect_stdio() when calling ShowFile()." | Tao Bao | 2015-09-12 | 2 | -4/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | recovery: Remove redirect_stdio() when calling ShowFile(). | Tao Bao | 2015-09-10 | 2 | -4/+1 |
| | | |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | am 7c3d09c2: am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands." | Tao Bao | 2015-09-10 | 1 | -26/+32 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands." | Tao Bao | 2015-09-10 | 1 | -26/+32 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | am 7a677807: Merge "updater: Fix the line breaks in ui_print commands." | Tao Bao | 2015-09-10 | 1 | -26/+32 |
| | |\| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge "updater: Fix the line breaks in ui_print commands." | Tao Bao | 2015-09-10 | 1 | -26/+32 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | updater: Fix the line breaks in ui_print commands. | Tao Bao | 2015-09-10 | 1 | -26/+32 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | am 272d268c: am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter." | Tao Bao | 2015-09-09 | 1 | -29/+26 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter." | Tao Bao | 2015-09-09 | 1 | -29/+26 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter." | Tao Bao | 2015-09-09 | 1 | -29/+26 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter." | Tao Bao | 2015-09-09 | 1 | -29/+26 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter. | Tao Bao | 2015-09-08 | 1 | -29/+26 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | am d4547c1d: am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak" | Tao Bao | 2015-09-08 | 1 | -1/+9 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak" | Tao Bao | 2015-09-08 | 1 | -1/+9 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 585a50ce: Merge "imgdiff: fix file descriptor leak" | Tao Bao | 2015-09-08 | 1 | -1/+9 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "imgdiff: fix file descriptor leak" | Tao Bao | 2015-09-08 | 1 | -1/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | imgdiff: fix file descriptor leak | Jeremy Compostella | 2015-09-08 | 1 | -1/+9 |
| | | |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | | | am 1e8e6a83: am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc" | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc" | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc" | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "move uncrypt from init.rc to uncrypt.rc" | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | | * | | | | | | | | | | move uncrypt from init.rc to uncrypt.rc | Tom Cherry | 2015-09-04 | 2 | -0/+11 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am 834c92b7: am 8e9c6801: recovery: Fix the bug that truncates menu entries. | Tao Bao | 2015-09-03 | 1 | -1/+6 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 8e9c6801: recovery: Fix the bug that truncates menu entries. | Tao Bao | 2015-09-03 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | recovery: Fix the bug that truncates menu entries. | Tao Bao | 2015-09-02 | 1 | -1/+6 |
* | | | | | | | | | | | | | am ceb81e49: am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message." | David Zeuthen | 2015-09-03 | 1 | -1/+9 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message." | David Zeuthen | 2015-09-03 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message." | David Zeuthen | 2015-09-03 | 1 | -1/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Merge "Add slot_suffix field to struct bootloader_message." | David Zeuthen | 2015-09-03 | 1 | -1/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | Add slot_suffix field to struct bootloader_message. | David Zeuthen | 2015-09-02 | 1 | -1/+9 |
* | | | | | | | | | | | | | | am 31dde162: am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes." | Tao Bao | 2015-09-03 | 1 | -602/+429 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes." | Tao Bao | 2015-09-03 | 1 | -602/+429 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 6997c287: Merge "updater: Clean up C codes." | Tao Bao | 2015-09-03 | 1 | -602/+429 |
| | |\| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge "updater: Clean up C codes." | Tao Bao | 2015-09-02 | 1 | -602/+429 |
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | | * | | | | | | | | | | updater: Clean up C codes. | Tao Bao | 2015-09-01 | 1 | -602/+429 |
| | | |/ / / / / / / / / / |
|
* | | | | | | | | | | | | | am d845a2d1: am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." | Tao Bao | 2015-08-26 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | am 5e3a40f9: am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" | Tao Bao | 2015-08-26 | 1 | -46/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | am 1a42ebc1: am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." | Tao Bao | 2015-08-21 | 5 | -37/+27 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | am b13fe892: am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | am 4854e292: am ad509fd4: Merge "Fix potential crash" | Tao Bao | 2015-08-11 | 1 | -5/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | am dffdd5eb: am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." | Tao Bao | 2015-08-10 | 3 | -16/+91 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | am 85afda17: am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." | Tao Bao | 2015-08-10 | 5 | -288/+185 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | am 85a77d2a: am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." | Dan Albert | 2015-08-08 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | am 34fa6d38: am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | am a9390df6: am 06689dc5: Merge "Fix recovery image build." | Elliott Hughes | 2015-08-07 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | am 371ab905: am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp | Tao Bao | 2015-08-04 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | | |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | am ea5d8f0a: am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." | Tao Bao | 2015-08-04 | 1 | -0/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | am 3fd097f8: am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." | Tao Bao | 2015-07-31 | 3 | -19/+39 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | am 77de4783: am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." | Tao Bao | 2015-07-28 | 1 | -6/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | am 05c4b53e: am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." | Tao Bao | 2015-07-25 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | am f6bebbd7: am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." | Tao Bao | 2015-07-24 | 3 | -16/+97 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | am d37f91d1: am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am c73e18f0: am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." | Tao Bao | 2015-07-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f075f9a1: am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." | Tao Bao | 2015-07-24 | 2 | -86/+56 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ca66fc1c: am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." | Tao Bao | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|