| commit | ff8200e38955212da5fa20a7d3b28eece5a34073 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Fri May 09 15:39:52 2014 -0700 |
| committer | Andrew Lee <anwlee@google.com> | Fri May 09 15:39:52 2014 -0700 |
| tree | 6e1bb7e4322d04e17954efa59c1efbf2866e3d0f | |
| parent | f62fe2b612e643f2ceef67a5cb5693feaa1376e9 [diff] | |
| parent | 56021c74461fef9783cfc853afdac96e7b7a3bdf [diff] |
resolved conflicts for merge of d5557cb1 to master-nova Change-Id: I6c9d594781d9d8de830104b1e038d381aacbc969