| commit | 325c4c9aa74f7238d834465b5ac85f6d3531c8ba | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Nov 20 15:16:22 2014 -0800 |
| committer | Dan Albert <danalbert@google.com> | Thu Nov 20 15:16:22 2014 -0800 |
| tree | 6cd14fd5e9cae4da4385fd0f2b900526b92e4942 | |
| parent | 47513e87395e00ba558e30808901c14e1d34c664 [diff] | |
| parent | c1ced8bbcd0ab8ddb75513290954e8a56f80040e [diff] |
resolved conflicts for merge of c1ced8bb to master Change-Id: I83db00ff986ace8a1c77648738b93124613ddfc0