| commit | 8ca27b1e87b987a53f112897d0947e7d4b1d47f3 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Mon Aug 22 14:55:48 2016 +0100 |
| committer | Janis Danisevskis <jdanis@google.com> | Mon Aug 22 14:55:48 2016 +0100 |
| tree | 40e1992584e918a4fc15c7a8c6aa6bdee19e254e | |
| parent | 7493756f8b996d34f56a4156f4cb972d7850148a [diff] | |
| parent | 8b6704cbddc9201b522b2b4f5ebdd631aa6dc49f [diff] |
resolve merge conflicts of 8b6704c to stage-aosp-master Change-Id: I0b121f94c92a9b8f3b7535fd6f7b8ed685e043db