| commit | b989c5561ea10e623d73e7bb89b37ac38ccdd908 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Feb 05 17:10:47 2015 -0800 |
| committer | Alan Viverette <alanv@google.com> | Thu Feb 05 17:10:47 2015 -0800 |
| tree | d7b124b5ea7a685b2c676af4181de3c6daad242a | |
| parent | fe7712e758c12e3fbe26c652dc4ca33267210bd0 [diff] | |
| parent | cbe32de4544bbd8a4a360949dc2535eeeb0e21ff [diff] |
resolve merge conflicts of da9653a to master. Change-Id: I7458452389fb7b048fe5c6daa375fd4dbb9d9766