| commit | 80bea9cde179e37def61748ff0e68b4155b5360c | [log] [tgz] |
|---|---|---|
| author | Man Cao <manc@google.com> | Wed Jun 24 17:28:01 2015 -0700 |
| committer | Man Cao <manc@google.com> | Wed Jun 24 17:28:01 2015 -0700 |
| tree | 6a02a09a1f1b8d34231ce06eacdc49d0918f8b5c | |
| parent | 952abf4289b48bccdaef24591f855640dcfe6f49 [diff] | |
| parent | 8fb8207412905d034305b4b1be6eac07bdac833f [diff] |
resolved conflicts for merge of 8fb82074 to master Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb