| commit | ae492fd5f2468ac128b65ec4ae0f4d513c68ee60 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jun 30 21:42:44 2016 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Thu Jun 30 21:42:44 2016 -0700 |
| tree | d70d0c89b8f3ad255a34adf4bc70f0b0ae07cfba | |
| parent | 80b32402dced361a2ea8fc4804753fe0f4ad2981 [diff] | |
| parent | 9d73af09346247352cd3eea8bbc857432ced6c32 [diff] |
resolve merge conflicts of 9d73af0 to stage-aosp-master Change-Id: I984c48310e72cb509b859501cfb07258214038fa