| commit | 94fc9124f51f0a101cc11e4563f9c647980fe2aa | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Sep 30 17:16:09 2013 -0700 |
| committer | Adam Lesinski <adamlesinski@google.com> | Mon Jan 27 10:31:06 2014 -0800 |
| tree | 4ffd9a362c864d96ccb14d16a20aff533aad32e9 | |
| parent | a5018c900f126ee8424c82497f32983873db741b [diff] |
resolved conflicts for merge of 0c923b7c to master Change-Id: I4f314b48c7714706329509d931d2c53079f5e248