| commit | fc832e3ef270d7c271520a99ffa2f84e82f0b855 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Sep 25 11:54:05 2015 -0700 |
| committer | Jorim Jaggi <jjaggi@google.com> | Fri Sep 25 11:54:05 2015 -0700 |
| tree | 2573efb0c6cc4acb58ff5179ffa43c6408e82d4b | |
| parent | bf0282105a3b57bf32d6ffe60e8511ece9ce9e9b [diff] | |
| parent | c594e9354a45f59472a670f2f87c42efa1fd9557 [diff] |
resolved conflicts for c594e935 to master Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0