| commit | ee26bf6a84ec697d9b4c1fe24c39c8238e2ec4df | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed May 28 16:02:45 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed May 28 16:02:45 2014 -0700 |
| tree | c0cd7def516f8907a90fba354489d36fba120777 | |
| parent | cf68ba00d4b2388abc41396cc3d4d8864866bf0d [diff] | |
| parent | 7e127ebe0bf8753fcbeeac6140916d512322e308 [diff] |
resolved conflicts for merge of 7e127ebe to master Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1