| commit | 514e6e4488154252329cabf1f2427533d2ae1e69 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Mar 01 18:03:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 01 18:03:46 2017 +0000 |
| tree | 9b81b728e3f6883be2cc275487e95c7d0f7e86b6 | |
| parent | 425bbada2890a363b4bf84c45ca8adc06010084c [diff] | |
| parent | 59978ab6e3d4ea8e5e69d2ee275d0ea7aba3c4ca [diff] |
Merge "releasetools: Merge two identical conditional branches." am: 59978ab6e3 Change-Id: I7a5c85ebff5e3ee4ecf3209b3a016daa1ddb14a9