| commit | 269c6e1f26767831cb6057c9d1ec0b3dc3844bb5 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Oct 08 15:58:47 2013 -0700 |
| committer | Dianne Hackborn <hackbod@google.com> | Tue Oct 08 15:58:47 2013 -0700 |
| tree | e9daba35a6e9189097b3313101ba7f4dcbae02cf | |
| parent | bd9c66484ef27ee184c89350ca3c0a9427175e42 [diff] | |
| parent | a3fd7bf0c4ea6dcd60cd4be3cd241dc18edd59d2 [diff] |
resolved conflicts for merge of a3fd7bf0 to master Change-Id: Ifcef32cbf9482aeec032e577c20761b74bdea775