| commit | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 21 15:51:04 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Fri Nov 21 15:51:04 2014 -0800 |
| tree | 7a1842dd8f8b9b8e1880df7a3fe0fc7f5d103d48 | |
| parent | fa6547f6c0aad15c308a4ba946955087081ae1eb [diff] | |
| parent | 220c3f4f48b53b6010093a1ef437f4197a382ebf [diff] |
resolved conflicts for merge of 220c3f4f to master Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e