tag | cdaab934c91ddb6868cec04bf5d591fee9c5c212 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 06 17:01:46 2016 -0700 |
object | f31f0e4487adc02f45b3ebb4eab86faff124b5fc |
Android 6.0.1 Release 54 (MTC19Z)
commit | f31f0e4487adc02f45b3ebb4eab86faff124b5fc | [log] [tgz] |
---|---|---|
author | Dave Weinstein <olorin@google.com> | Tue Jun 14 11:05:01 2016 -0700 |
committer | Zach Jang <zachjang@google.com> | Tue Jun 14 22:22:23 2016 +0000 |
tree | 7894784cc38e96768063b002446fea109e633c75 | |
parent | 0a68a0cf03285c3447094ea7b77266c37624c3a3 [diff] |
Resolve a merge issue between lmp and lmp-mr1+ Change-Id: I336cb003fb7f50fd7d95c30ca47e45530a7ad503 (cherry picked from commit 33f6da1092834f1e4be199cfa3b6310d66b521c0) (cherry picked from commit bb3a0338b58fafb01ac5b34efc450b80747e71e4)