| commit | be4c2c2b9902ae2d846c205a3ea3ba8b437a0775 | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Tue Apr 22 11:02:32 2014 -0700 |
| committer | Justin Koh <justinkoh@google.com> | Tue Apr 22 11:05:15 2014 -0700 |
| tree | bdbad6b2e17bbf76b10a7118770d8177a31ba983 | |
| parent | 0456e3aab1e0587512c805d7e240ad1461a69375 [diff] | |
| parent | d90712d044d9505966c6b37c14507156dcc8353a [diff] |
resolved conflicts for merge of d90712d0 to master Change-Id: Ia587476c001bce5f0969557b15d366aed6b322b1