| commit | edb97397afd1af27d7f0d4a5b8e4e7fded710cc5 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Oct 01 19:49:22 2015 +0100 |
| committer | Sergio Giro <sgiro@google.com> | Thu Oct 01 19:49:22 2015 +0100 |
| tree | d6737b24fee0d4b965406dee4cac946c05a46111 | |
| parent | 096fdb9a988dc0c190526c13ea92cea9b0c44dd4 [diff] | |
| parent | 0bdceea1093ef125f02fdc3c539e857893556ea3 [diff] |
resolved conflicts for 70808827 to stage-aosp-master Change-Id: I2de8a63fa5be5423846df4c2e8ccc5f12e843f09