tag | c6ccb3b99eb7fdcb1f14b89d371d687f21f77fce | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Mar 06 09:12:35 2017 -0800 |
object | fe818f19d897eb56838ceef82aa3383fad52f6c9 |
Android 7.0.0 release 30
commit | fe818f19d897eb56838ceef82aa3383fad52f6c9 | [log] [tgz] |
---|---|---|
author | Torne (Richard Coles) <torne@google.com> | Wed Sep 21 12:47:09 2016 +0100 |
committer | The Android Automerger <android-build@android.com> | Tue Sep 27 15:03:31 2016 -0700 |
tree | 821ba50e2a3168bb8fd08202408d092f87882e2f | |
parent | 6f4daebedb6fd8859817cef73c49bb5eaf1396a5 [diff] |
resolve merge conflicts of e9d901a to nyc-dev Change-Id: Ic0a5d1893786ae8a6a5b207f01da14ed93bfac0a