| commit | bc68463602b6c26cca8988e55df8dbf48ca653e5 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Sep 22 13:41:39 2015 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Sep 22 13:41:39 2015 -0700 |
| tree | 453e0aae952451213b14fea2bcd4fbc1d647ad98 | |
| parent | 37386768a64e63d5a1a1554e7f48dac59ccf721b [diff] | |
| parent | 5d7b68d4914c8ddb0171abd1f668716ff682fd84 [diff] |
resolved conflicts for 5d7b68d4 to master Change-Id: I6f56e8e11c35733f8d84346ca2b9a201784552e1