| commit | d49bc888eac89657efc9b199afa557ee9027b19f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Mar 19 16:49:19 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Mar 19 16:49:19 2015 -0700 |
| tree | 49b3fd890d4045fad7856413acd8a7a5b50a03c5 | |
| parent | 1c87cb62f151205146783addcc50c27338a6838d [diff] | |
| parent | 2da1483721c2b2c1314c9335cd1fdf676a97baac [diff] |
resolved conflicts for merge of 2da14837 to master Change-Id: Ib530d0f76775f77117d1abf3014db8fb3e1532f2