| commit | 0a9c324169b28cb411c15600cfb7111f13eab539 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Thu Dec 10 09:00:30 2015 -0800 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Thu Dec 10 09:00:30 2015 -0800 |
| tree | 6efe7843c2ba5b64697a9fa18ef9262b9ef475da | |
| parent | 1c3dadb4fa08dcbd616336f065e0411b14c70113 [diff] | |
| parent | bddc1339a2073295e6fb258eef447164144e0382 [diff] |
resolve merge conflicts of bddc1339a2 to master. Change-Id: Id5f1a7f364e05a20d78d6de72031b9b3c50ac019