tag | 6aeca21a33004c0cd5541c2a01a6a5834a4748bc | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Wed Feb 08 08:55:35 2017 -0800 |
object | 95e6c4663c640c67a69e1d2b44696753282136f8 |
Android n mr2 preview 1
commit | 95e6c4663c640c67a69e1d2b44696753282136f8 | [log] [tgz] |
---|---|---|
author | Dan Willemsen <dwillemsen@google.com> | Wed Mar 23 15:12:29 2016 -0700 |
committer | Dan Willemsen <dwillemsen@google.com> | Wed Mar 23 15:12:29 2016 -0700 |
tree | aafe2c8b5544208c79c2f2e741b911f6ffba920c | |
parent | aa9f36dcc43c95c7b4e4bbfb861d98aff91ec0bc [diff] | |
parent | 307435ff29e1f777214262a7416779b33f67899e [diff] |
resolve merge conflicts of 307435f to nyc-dev-plus-aosp Change-Id: I4b46d9d5a9e7e8fa4fc1d65c316dc7569c96a10a