| commit | f0256aba1f0b15cd79bc8f37303c87bde17e3f6a | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Dec 09 12:12:24 2014 -0800 |
| committer | Joe Fernandez <joefernandez@google.com> | Tue Dec 09 12:14:01 2014 -0800 |
| tree | a68fa093c34970b07922c2ae98ce2e9ed664aada | |
| parent | 3bf22c31e8053d0de9cfaddcc76fab77c33c9091 [diff] | |
| parent | dda0cb9fc5f2b711e8e29f063da9825d33555f90 [diff] |
resolved conflicts for merge of dda0cb9f to master Change-Id: Id649a91b403f0b6c077ada1c11495657ddc6d181