| commit | b428689142d236505b73c09bf48244b174b3f6a1 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue Apr 22 10:35:59 2014 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Tue Apr 22 11:38:12 2014 -0700 |
| tree | a413a3eb64aad3d06fe4e98907474abdf1c4cd77 | |
| parent | 54c6034e576fa000aae1029e5147056961043ccf [diff] | |
| parent | cd1fa3922c10f1951f845386cc43dabf69e31ccc [diff] |
resolved conflicts for merge of cd1fa392 to master-nova Change-Id: I60df511b2b8b7ae19a10fcfa36afa7b331b33389