| commit | 696941803b049304a28a2b074899b98a8b5ca629 | [log] [tgz] |
|---|---|---|
| author | Jin Cao <jinyan@google.com> | Mon Dec 15 17:58:28 2014 -0800 |
| committer | Jin Cao <jinyan@google.com> | Mon Dec 15 17:58:28 2014 -0800 |
| tree | c6ad69596dcc9309a6628478ad80ffd5a0a47b55 | |
| parent | ef862b79ffd6a272ccadf2872c977dd7d16da199 [diff] | |
| parent | ffc0111fa742c72f2457cecc1116e4ea3c6c8c6e [diff] |
resolved conflicts for merge of ffc0111f to master Change-Id: I92bcf75bdb01503aa652890859c589441d0a1a0f