| commit | a3b91e621c4ca1708fa2572e05e8ac5b0f4b5d17 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Aug 11 18:11:48 2015 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Tue Aug 11 18:11:48 2015 -0700 |
| tree | d8499439703615e1c08d29463f72601e362608c1 | |
| parent | 0ed2c39bb1e45b26de37892951f77d2926d4781c [diff] | |
| parent | c576c08fd594badde8e2c8bc6fd27ce3445efc7d [diff] |
resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp Change-Id: I86f6d0e7b9def5afa618915e7249c6758a5f0d1b