| commit | 5cf2d5c9cc7d3a582154c93ebc4fd7fc7584ded0 | [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 | 07ac315e92f509ea9832ed807498b4eaa8286ec3 [diff] | |
| parent | 70808827a4e22c257fd3d390bd4b282a06787fb3 [diff] |
resolved conflicts for 70808827 to stage-aosp-master Change-Id: I5e5030a20f2be3bd15b9fec8192dd22ec5a34d87