| commit | f777655d85af3aefa4a1683f289da1ec67988330 | [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 | 64c058da2335b37b7a179fd3ffef5cbf7b5e2a25 [diff] | |
| parent | 6ee734cfa029e7d2d61fe577af23c28cd831b8b6 [diff] |
resolved conflicts for 6ee734cf to stage-aosp-master Change-Id: Ia06c4d941d9b8828707299bb363f51fab5549897