| commit | 2c1078fbbd550d8adb7ca0d39447bfebc6092012 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Mar 10 15:36:20 2015 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Mar 10 15:45:36 2015 -0700 |
| tree | 5a8b61e3f7e7c2223e67ae4bdd1e41235a1649cf | |
| parent | c4be90872685c4507b516e96040d57a796792165 [diff] | |
| parent | b6d6c04a717222178184bff135bd12cfc4c019a1 [diff] |
resolved conflicts for merge of b6d6c04a to master Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7