| commit | d88a9bc821a660bd86056e39fe8189d521b0f860 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Mar 12 23:10:53 2015 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Thu Mar 12 23:25:27 2015 -0700 |
| tree | a2baa728e17e955228b6d9ee58abede7c7f5bbb1 | |
| parent | b3fd7e1be658b331cc3e9229aa594fbd1b3d0deb [diff] | |
| parent | ef1741d27b19fe63a7d8541b8745e166eb135252 [diff] |
resolved conflicts for merge of ef1741d2 to master Change-Id: I5379d5f756695f5176d92249ac6304bffcf95751