tag | b8f686f576ff8e366b9c4302a57cf581886b30dd | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 09 14:35:54 2015 -0700 |
object | 1e82b6f77a414b14597a10399dc4d9f5bec7286f |
Android 5.1.1 release 17
commit | 1e82b6f77a414b14597a10399dc4d9f5bec7286f | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@google.com> | Thu Apr 23 17:57:18 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 23 17:57:18 2015 +0000 |
tree | d083a669b6d67fb33ce1d6116fa15cf25557d149 | |
parent | 66b7fc3124aee375f1916bad8a709ac5afd3801d [diff] | |
parent | be3bde3e9b44d43aa2508c8824e09319b3f9b805 [diff] |
Merge "resolved conflicts for merge of 11b83982 to lmp-mr1-wfc-dev" into lmp-mr1-wfc-dev