| commit | bdae9bf2ec3bbf8e33a34caa412bd8fd7bc2d434 | [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 | 3f43729a36a7f2b318a8738bdb9660dd891dfa04 [diff] | |
| parent | 70808827a4e22c257fd3d390bd4b282a06787fb3 [diff] |
resolved conflicts for 70808827 to stage-aosp-master Change-Id: I2de8a63fa5be5423846df4c2e8ccc5f12e843f09