| commit | ead7b78b9eb303115c93f393160a3d91e1e89fab | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Dec 09 13:58:23 2014 -0800 |
| committer | Joe Fernandez <joefernandez@google.com> | Tue Dec 09 13:58:23 2014 -0800 |
| tree | 9248e7465d96ad82bd897b98c282b0cd08a76d13 | |
| parent | 3bf22c31e8053d0de9cfaddcc76fab77c33c9091 [diff] | |
| parent | 66189de6f8624c1c3f3c66121c1dabe5e51bd852 [diff] |
resolved conflicts for merge of 66189de6 to master Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa