| commit | 9457634c4021cfa8e7234587fca295e6a7e5ee9b | [log] [tgz] |
|---|---|---|
| author | B--B <dark.schneider.ds@gmail.com> | Tue Apr 04 19:05:28 2017 +0200 |
| committer | Shubham Singh <coolsks94@gmail.com> | Thu Apr 06 02:13:14 2017 +0530 |
| tree | 500249da89b1db1a720599c314a3f8c352d9a5d9 | |
| parent | 5212a69521b65af03e5da67bee3a83eacd4448b0 [diff] |
Merge tag 'android-7.1.2_r4' into aosp-7.1.2 Android 7.1.2 Release 4 (N2G47H) Conflicts: core/build_id.mk core/version_defaults.mk tools/releasetools/add_img_to_target_files.py tools/releasetools/build_image.py tools/releasetools/img_from_target_files.py tools/releasetools/ota_from_target_files.py Conflicts: tools/releasetools/ota_from_target_files.py