| commit | 4dcde90649cc51ca815a50d338a73adb408ab258 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Sat Jun 28 10:58:27 2014 -0700 |
| committer | Matthew Xie <mattx@google.com> | Sat Jun 28 10:58:27 2014 -0700 |
| tree | c3de3a4661db326391b833172057857491c7475f | |
| parent | a7324778bb12390f4c8fead853a0eb7d9b558886 [diff] | |
| parent | b44cc59d286ad255e872c60df02e032bd8d9d75b [diff] |
resolved conflicts for merge of b44cc59d to master Change-Id: I74c86dd5a13d4cc0b225a4b1d516904c4382db74