| commit | 8478f7abbd93982cb2bb3536a5e5af19b3c6755b | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Aug 11 18:31:59 2015 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Tue Aug 11 18:31:59 2015 -0700 |
| tree | 4d0f780c99e82dfbefe844ffa661adb0d03fdc85 | |
| parent | 33f46daa22597ac5c50601d28036c563b6e23fa5 [diff] | |
| parent | b184ec2a82e26b80fb1bdb45c4d3ecc903480e36 [diff] |
resolved conflicts for merge of b184ec2a to mnc-dev-plus-aosp Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d