tag | 57dfb31946b71b2806457b14860905e835fc4e0c | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 28 09:55:11 2015 -0700 |
object | 880be4622536d86b3d2edc83b2b7de41fa8398c3 |
Android 5.1.1 release 28
commit | 880be4622536d86b3d2edc83b2b7de41fa8398c3 | [log] [tgz] |
---|---|---|
author | dcashman <dcashman@google.com> | Fri Feb 06 10:39:23 2015 -0800 |
committer | dcashman <dcashman@google.com> | Fri Feb 06 10:43:02 2015 -0800 |
tree | 91070b751e27f742ce8b39658552ac1ea80e3a56 | |
parent | 72fef0b10cf51b30426e7f049fb457972977625c [diff] | |
parent | f82f5e01bf17d2856109f72659a3aead9e10b14f [diff] |
resolved conflicts for merge of f82f5e01 to lmp-mr1-dev. Change-Id: I093d7ecf48e9137b974047cd7d0fd2209792b748