| commit | a7fa6a460790b04883dd0d9e48ff6e40e333eb96 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Oct 16 17:41:33 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Oct 16 17:41:33 2012 -0700 |
| tree | 7e474a2a5533ef2cc1ee9c6992cc9c22e14442e6 | |
| parent | 4dc781657b7aa2385cc6ffedc8f3841abdcfd5f6 [diff] | |
| parent | 37868329b29ae7c2399860aee1fcf30f6ebd3fa6 [diff] |
resolved conflicts for merge of 37868329 to master Change-Id: I437f42a7197d1716b4783749f2b27e19c8721395