tag | fba11a627b8a357fed8dc67e544bc83416fcb532 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 02 12:33:14 2017 -0800 |
object | 39a11635626c8db71449f6c358808e1a78c9ff12 |
Android 7.0.0 Release 28 (NBD91Y)
commit | 39a11635626c8db71449f6c358808e1a78c9ff12 | [log] [tgz] |
---|---|---|
author | Tom Taylor <tomtaylor@google.com> | Tue Dec 06 16:26:14 2016 -0800 |
committer | The Android Automerger <android-build@android.com> | Thu Dec 15 14:49:54 2016 -0800 |
tree | 0e7785ebd53aa0836e75cde7ef475c1965ec0b84 | |
parent | 5d57d9300582d52c0d4c59636a747dbe9d436a17 [diff] |
resolve merge conflicts of eafd58a to nyc-dev Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962 (cherry picked from commit a43c5c5f18d966355a63db194c931e02267a2695)