| commit | 8bba8a69b19677853e0650ff6371d39d3bf76cd9 | [log] [tgz] |
|---|---|---|
| author | Kenny Guy <kennyguy@google.com> | Fri Feb 06 16:22:47 2015 +0000 |
| committer | Kenny Guy <kennyguy@google.com> | Fri Feb 06 16:22:47 2015 +0000 |
| tree | 7362d2c7c73230b6243e9a89dc1c15b6844ea40f | |
| parent | a9041c05a31357dbada5ea7327f9d34f87a9d3e8 [diff] | |
| parent | 3abcb7b7781b73356f06090102a2a75cfd086449 [diff] |
resolved conflicts for merge of 3abcb7b7 to master Change-Id: Ib2bec554f39e76287ea061c10852ce9028d61d17