| commit | 0772bfd2069e4776dab3dcdbe2a60241873fcca9 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Tue Aug 18 20:04:01 2015 -0700 |
| committer | Jorim Jaggi <jjaggi@google.com> | Tue Aug 18 20:04:01 2015 -0700 |
| tree | bed0f881ee624871296a0f2ae22c2a798b038840 | |
| parent | f0c28807a07207a94e3a00178926c2e558987375 [diff] | |
| parent | caacc8ba5e937e6740ea14fa97e70dbe16dd0bfb [diff] |
"resolved conflicts for merge of caacc8ba to master" Change-Id: I7904ac66ded45c3173af14d2940dc8210088e387