| commit | 1430d895acbcdc152e17709dec1f356c41b875b3 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Wed Apr 23 14:45:57 2014 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Wed Apr 23 14:45:57 2014 -0700 |
| tree | 1dd7878a834dd298adc61e68ef1d2720618f35bf | |
| parent | 15c02bcdca55d45b1245d9c55355115fb0524dd5 [diff] | |
| parent | 200cb1c38dfa88ab3593b6cd0c0f9c82f39c9bc9 [diff] |
resolved conflicts for merge of faa97b36 to master-nova Change-Id: Ief63a53f6873b25b4be810acb1c7ee4ffbe4b80f