| commit | 22db36b37e3835f9a02a4d2d1ae7c57f7ea31ada | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Wed Nov 05 15:57:52 2014 -0800 |
| committer | Stephen Hines <srhines@google.com> | Wed Nov 05 15:57:52 2014 -0800 |
| tree | 50ab340ad1edbbb2037245dc48eaa51ec2713700 | |
| parent | 019eb4dab9402a0c4c6bc08e15632fd4cceb74d2 [diff] | |
| parent | d6c7dc4cbd5ccb77ca3b0b05ff6287e3b2932607 [diff] |
resolved conflicts for merge of d6c7dc4c to stage-aosp-master Change-Id: I3341acd382e58d99d9a1b869878bb352e1ca8d56