| commit | 9bef5b67dc48568e6f8be065dd7016f04058351c | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Sep 20 10:40:34 2013 -0700 |
| committer | Dianne Hackborn <hackbod@google.com> | Fri Sep 20 10:40:34 2013 -0700 |
| tree | bbda7c63fb7a62d6e89c61976b804bed9b74de67 | |
| parent | 52c77ea4d1f270d8f4f38081b2e74b1e90e74011 [diff] | |
| parent | 20021b300fa8c91559a555ac805f5bf8f6f88285 [diff] |
resolved conflicts for merge of 20021b30 to master Change-Id: Ie758de25a277ed0a25bf08e4cd2c57c9519bd52d