| commit | d3389e2f32478bba4eddff3b7b63e07b74008ea7 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Oct 29 11:23:45 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Wed Oct 29 11:23:45 2014 +0000 |
| tree | 76032bfe380bdb8b7902e05741f058b80a0f2007 | |
| parent | b27ea56312692c5ee0f38dad38e2a3832086b40a [diff] | |
| parent | 9834af9ccf75b896c6bfbfec784055ac552759ad [diff] |
resolved conflicts for merge of 9834af9c to stage-aosp-master Change-Id: Ibdada14406f49684cf345162204b9810452f25a2