tag | ad5afc62e475022404882dafc593d41b2c5f9342 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 15 14:27:02 2017 -0700 |
object | 581a777a866d78be6cb4192e46891e418930fc1b |
Android O IOT Preview 5 (OIR1.170720.015)
commit | 581a777a866d78be6cb4192e46891e418930fc1b | [log] [tgz] |
---|---|---|
author | Torne (Richard Coles) <torne@google.com> | Wed Sep 21 16:51:49 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 16:51:49 2016 +0000 |
tree | d245a464a779fc9b3f911e217cb413c02d963256 | |
parent | dd019877a8cc9f17da2c538eee4af447f23cd170 [diff] | |
parent | 38660e5dfc2815e881a9d606699d21db544fc5ac [diff] |
resolve merge conflicts of e9d901a to nyc-dev am: 3b1cbcd66a am: 38660e5dfc Change-Id: Ia6e4cfec76557101bc15e707d145bf5d085b47e3