| commit | ccffea7a3d4ab33a1fed5648bb5926c65dea15b6 | [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 | 548be5b6ed7415adcd5b314cb8fe4622bc6f8421 | |
| parent | e8f0b4b3121e2cd457075ae0035c2c2ba9b83815 [diff] | |
| parent | 6d5e7fa0c5f8653adf97ba45db123da84b022d41 [diff] |
resolved conflicts for a884d81e to stage-aosp-master Change-Id: Ice485967fa96f13786024b6939b826638e906ff0