| commit | e74b853d9f2dd698a0a7635c1b7125fc3cb64b66 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Wed Jun 11 15:02:55 2014 +0200 |
| committer | Adrian Roos <roosa@google.com> | Wed Jun 11 15:02:55 2014 +0200 |
| tree | cd27cbf53803345b82f73da5003f002d2ef10d4f | |
| parent | e6cad8027c644b7d4dfc38984fa52732cb7906cd [diff] | |
| parent | eb29d330c31e677b6beba7a88955b52b7ca5f39b [diff] |
resolved conflict for merge of 3ca33b70 to master Change-Id: I5226015ca7cef030586349cc698a46e458ac788e