| commit | b57dd722f1dc0663417da37d3a82f8283ad3c982 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Sep 24 10:01:32 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Sep 24 10:01:32 2015 -0700 |
| tree | 49aec7f0e7b4bd68998dfcd78e83f9eb731f8ba1 | |
| parent | aa31169804dffa3b36654ccffe67a53f6ff4cdaf [diff] | |
| parent | a884d81e8675505d86569e034e83ca267c12a6a8 [diff] |
resolved conflicts for a884d81e to stage-aosp-master Change-Id: Ice485967fa96f13786024b6939b826638e906ff0