| tag | 59fa5b8d4e47e96e5a0532f240fd452088e15551 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 09 14:36:03 2015 -0700 |
| object | 52e4b474899fe48b0f557f23deba1aedf5ee4d02 |
Android 5.1.1 release 17
| commit | 52e4b474899fe48b0f557f23deba1aedf5ee4d02 | [log] [tgz] |
|---|---|---|
| author | Nathan Harold <nharold@google.com> | Thu Apr 23 14:34:10 2015 -0700 |
| committer | Nathan Harold <nharold@google.com> | Thu Apr 23 14:34:10 2015 -0700 |
| tree | a545421dd2958cc8e0caa7e8bdf2de89eafc6999 | |
| parent | c91c1a23f4f308a68c9f80ab2c74e1050eb5f179 [diff] | |
| parent | cb114405369aeb88317cc6d2401dfcd6e1657acc [diff] |
Resolve merge conflicts with cb114405 Change-Id: I62a6b880412ce92d1d8a38dfcd1e2c4a0fbaed17