| commit | 1620a65d32251ca058b60cb2751394e9ee1f0019 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Apr 07 11:39:51 2015 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Tue Apr 07 11:39:51 2015 -0700 |
| tree | 133f4bbf13071dbed33f9f9d9dcfbbd3527462f4 | |
| parent | 068907be9704ca9267075ef9ba82b83f8fb3ae34 [diff] | |
| parent | 06adabdbec7207e61b84d006e538a9f5ead6e79c [diff] |
resolved conflicts for merge of 06adabdb to master Change-Id: Ifb09e2e6242f79cabe76e95eacc982f6cc7e1a6c