| commit | 387f598ef95d0fe6850cbb902300ddad6d75ff67 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Jan 20 15:17:31 2015 -0800 |
| committer | Craig Mautner <cmautner@google.com> | Tue Jan 20 15:17:31 2015 -0800 |
| tree | ff2b433fb5b13cd52443077e8c232bfe67add0dd | |
| parent | 0f2c90ed7692ef9e375abcad9fd565015e24a7d5 [diff] | |
| parent | a3342991a74ee77800b6660c5e4aadb9a5f0674a [diff] |
resolved conflicts for merge of a3342991 to master Change-Id: I6a26297c6ea7c312d0d152243172fb5472444936