commit | 08a3a32fa937a39c0993446bc368a01e38afe7c5 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Tue Mar 08 05:37:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Mar 08 05:37:27 2016 +0000 |
tree | c3f148634c5be384112b1cfe0a7bf5cc4ee06dc3 | |
parent | 9baa993c0775b025e3f4606ee71c4a7d2b2c5fed [diff] | |
parent | bd25fcdc02a94ec9f50fc431a3731484b9812e23 [diff] |
resolve merge conflicts of 177c610e7f to cw-e-dev am: bd25fcdc02 * commit 'bd25fcdc02a94ec9f50fc431a3731484b9812e23': DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.