| commit | 60192004bf24082677b7888df41668c8bf06bbb4 | [log] [tgz] |
|---|---|---|
| author | Ivan Podogov <ginkage@google.com> | Tue Dec 13 20:56:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 20:56:24 2016 +0000 |
| tree | e1e416b703a4889aee2833261ba182d3fc2c88de | |
| parent | fb1bc8bc97dca1ad7b1dd2c994a8ccee1db0a0fd [diff] | |
| parent | 4460839e5ce43777e7f32841e4ab2e2ce0008257 [diff] |
Finish resolving conflict from d23dc17 am: 4460839e5c -s ours Change-Id: Id560c17d069d6405696e5fbc7e307c95f8922abd