| commit | 8e5bb3ddf1ee4be88790778599a80e00958a68ac | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Oct 01 18:54:33 2015 +0100 |
| committer | Sergio Giro <sgiro@google.com> | Thu Oct 01 18:54:33 2015 +0100 |
| tree | 31c3325b4eeb94ce66d70d509117377fe38629c9 | |
| parent | 3a4f0192b3420adeb28de2742edb1765f9ed3317 [diff] | |
| parent | 0bdceea1093ef125f02fdc3c539e857893556ea3 [diff] |
resolved conflicts for 70808827 to stage-aosp-master Change-Id: I5e5030a20f2be3bd15b9fec8192dd22ec5a34d87