| commit | fb8d22de038b89374dd7f11fa2583065fb3e2989 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Mar 01 18:08:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 01 18:08:17 2017 +0000 |
| tree | 6283ade4d76d212e6326c5402bc7051b4d05b2f8 | |
| parent | 8beb26d5cb0e7af431e9094fbd869a2ff64e83a6 [diff] | |
| parent | 81d1ad1267689997b2499780fa623e07c393dac5 [diff] |
Merge "releasetools: Merge two identical conditional branches." am: 59978ab6e3 am: 514e6e4488 am: 81d1ad1267 Change-Id: Ia106d318e77b954eadcfdcd80e13e85f89e43187