| commit | 338e74648ddfe480cf4bfb52cf5a9bb8732e1135 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Apr 14 14:23:07 2015 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Tue Apr 14 14:23:07 2015 -0700 |
| tree | 235b3137adf18ae1451c5208f2dc005ea7a66df4 | |
| parent | 7caa691652a901ac354755c44990cca11b5cdb23 [diff] | |
| parent | 1d5a259276c897743936b250cde5e22555604d62 [diff] |
resolved conflicts for merge of 1d5a2592 to master Change-Id: Ia1ea7c9c8c23eeffcd596b96506e961989ccb7a6