| commit | 32ee05818f05b933a6999deb8dec70c96e297310 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Sep 23 17:58:25 2015 +0100 |
| committer | Sergio Giro <sgiro@google.com> | Wed Sep 23 17:58:25 2015 +0100 |
| tree | 450c8b2064bd5a7a4e04a8bb85b784ea0f9048e2 | |
| parent | 6a6af6289fe1ddc3719535a0966caae987a94bb7 [diff] | |
| parent | 2a6c66d20098ff0095e48f3321b5fd0dc284161e [diff] |
resolved conflicts for 6ee734cf to stage-aosp-master Change-Id: Ia06c4d941d9b8828707299bb363f51fab5549897