| tag | ed89c4acc7c2d3609687c414aac2ddbcca6be410 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 28 09:54:38 2015 -0700 |
| object | c7d7be3cdbefd99229903414cf71308f47973aa5 |
Android 5.1.1 release 26
| commit | c7d7be3cdbefd99229903414cf71308f47973aa5 | [log] [tgz] |
|---|---|---|
| author | Jon Boekenoogen <jboekeno@google.com> | Mon Sep 29 19:30:25 2014 -0700 |
| committer | Jon Boekenoogen <jboekeno@google.com> | Mon Sep 29 19:31:32 2014 -0700 |
| tree | 216e1fcbd84e2c7f2a9d18ba19930e394c7ffc19 | |
| parent | 1dbe3344fc8f6bbebf1ed616255e3e295947700d [diff] | |
| parent | 46ea63c7f5f4ebfc3588480bccf86067d61f5256 [diff] |
resolved conflicts for merge of 46ea63c7 to lmp-dev Change-Id: Icd0fcdd90df854d5c74ace9732636a10e215074d