| tag | 2d8ab5f96a3cc6eee471deee971fefa1530dd3d2 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 29 11:23:02 2015 -0700 |
| object | 8352d7a311ae3f7838cc9d9ee0d69625f73b89e6 |
Android 6.0.0 release 5
| commit | 8352d7a311ae3f7838cc9d9ee0d69625f73b89e6 | [log] [tgz] |
|---|---|---|
| author | Dan Rodney <danrodney@google.com> | Tue Jan 20 17:03:46 2015 -0600 |
| committer | Dan Rodney <danrodney@google.com> | Tue Jan 20 17:03:46 2015 -0600 |
| tree | 043680fc9f6d686dfeb8ac5a0129b6fdc61fb3e8 | |
| parent | 27209ff8d25be29db541a9772a0da818b4b834b8 [diff] | |
| parent | af2bd0869f68c9ab48c2a5bb7ffd2fda78789666 [diff] |
resolved conflicts for merge of af2bd086 to lmp-mr1-dev-plus-aosp Change-Id: Ic8655447bac2d8a780fd21293cc3ccaa320d4eb8