commit | 81d1ad1267689997b2499780fa623e07c393dac5 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Wed Mar 01 18:05:46 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Mar 01 18:05:46 2017 +0000 |
tree | 2175b280988598a521d3a80dc08c1545b8a8fe46 | |
parent | 74ec2776e822ba7ac72c3b8056c0009a9046fbd2 [diff] | |
parent | 514e6e4488154252329cabf1f2427533d2ae1e69 [diff] |
Merge "releasetools: Merge two identical conditional branches." am: 59978ab6e3 am: 514e6e4488 Change-Id: I8f95b75becdb503c1837c1bc215f88f019eaa356