tag | 33f2ef9e4be83d59525d4debda1f441faca4fbb5 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 03 09:24:52 2017 -0700 |
object | 3f8da558f1d743d94a3afabb8c69fa43f4810cc6 |
Android 7.1.1 Release 33 (N4F26X)
commit | 3f8da558f1d743d94a3afabb8c69fa43f4810cc6 | [log] [tgz] |
---|---|---|
author | Chris Craik <ccraik@google.com> | Thu Jan 12 12:56:20 2017 -0800 |
committer | android-merger <android-merger@vpba3.mtv.corp.google.com> | Fri Jan 20 15:13:25 2017 -0800 |
tree | c031169e1c500b3d684d591e0f6c206dd2ff3b85 | |
parent | 854f11ac8ca942f9652b2e5db50cd794986d4d80 [diff] |
resolve merge conflicts of 89cdd4cb to mnc-dev Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207 (cherry picked from commit d2fd12358d35eb999ef8b92b1dcce07f7be15fc3)