tag | d66fd234642365489f4ff23b7681c524a2088bf9 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 05 17:05:20 2016 -0800 |
object | b74b4ad38fa162d3fe09e035fa570f419261c7dd |
Android n mr1 preview 2
commit | b74b4ad38fa162d3fe09e035fa570f419261c7dd | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Fri May 13 14:50:59 2016 -0700 |
committer | Elliott Hughes <enh@google.com> | Fri May 13 14:50:59 2016 -0700 |
tree | 0fa8d9e7874bedc3d5b0240c332afb1e34ec766f | |
parent | ca69393b8f54e0cd38d876547a0d82e641951798 [diff] | |
parent | 1cff6731f916e07dc13ab4765d480c87ee590cd7 [diff] |
resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp Change-Id: I38e31b1e1eee0a456ebd602029198bb7907e1239