| commit | d274400205d054010e60ddd69f1535bedf41d96b | [log] [tgz] |
|---|---|---|
| author | Mady Mellor <madym@google.com> | Thu Apr 30 16:17:16 2015 -0700 |
| committer | Mady Mellor <madym@google.com> | Thu Apr 30 16:17:16 2015 -0700 |
| tree | f69d2c67a7fcd12073371f746e17d29199b08f02 | |
| parent | 52cf4f960b9dfe99fe5c2eef03e0eb3638fad65f [diff] | |
| parent | 04f2fe3958b0bf1e663e01f5107562c748db46e1 [diff] |
resolved conflicts for merge of 04f2fe39 to master Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce