tag | 1b07cc36eaec6bd274baace2752cc71d5ef87909 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 06 15:00:53 2019 -0700 |
object | 34d9f2fa13b1d1e9875a11213d4f3428ec377e6e |
Android 7.1.1 release 60
commit | 34d9f2fa13b1d1e9875a11213d4f3428ec377e6e | [log] [tgz] |
---|---|---|
author | Walter Jang <wjang@google.com> | Mon Nov 07 09:24:43 2016 -0800 |
committer | Feng Yu <feny@google.com> | Thu Dec 08 20:51:24 2016 -0800 |
tree | 84b40d40ec63ab96aada59819aee639a9232432c | |
parent | 1221f818b39e38f98fe4a5e3234ace8a20f6fde1 [diff] |
resolve merge conflicts of 9f523b4 to nyc-dev Bug: 32219099 Merged-In: Ib141ad682488aeabf6d90e8d169d5fff6df7a8dd Change-Id: I895b1f9f8ade2dcfa47d1c17e0aaac2edeb75a74