| commit | dc00610496d39b7a782e4b595e1fa284bd945f77 | [log] [tgz] |
|---|---|---|
| author | David Zeuthen <zeuthen@google.com> | Wed Sep 09 12:40:16 2015 -0400 |
| committer | David Zeuthen <zeuthen@google.com> | Wed Sep 09 12:40:16 2015 -0400 |
| tree | 74ffe8acee8c6fbda73e9716a30548a533d1b3ca | |
| parent | b4e5fbae9d790fe239c6d3431262da0aafceba83 [diff] | |
| parent | 587dec5be5b74fcc52e23b6f33df77d55d8e0f9b [diff] |
resolved conflicts for d8eed7ff to stage-aosp-master Change-Id: I7fb3ddc07d798f0f98075b9fab0bb88c88249455