| commit | a051004cc4c922fe507d8008c22263e94d730a43 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Thu Aug 27 15:17:59 2015 -0700 |
| committer | Clay Murphy <claym@google.com> | Thu Aug 27 15:17:59 2015 -0700 |
| tree | c4fb9dea9e6c7b8dd84677dfd236cfbcda75ecac | |
| parent | f8d1532a28abac10debbe5ce3b7f0b1e4d11cbd4 [diff] | |
| parent | ed4233d371ef25154381173084050c63e7e582f1 [diff] |
resolved conflicts for merge of ed4233d3 to stage-aosp-master Change-Id: Iada1e833c9a66cc9b6d78901523eeda11e67c567