| commit | 25e40de45f89490f03ca010a88d2265d9c901493 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri May 30 11:51:20 2014 -0700 |
| committer | Kenny Root <kroot@google.com> | Fri May 30 11:51:20 2014 -0700 |
| tree | b546d2ffc3907bb4dbdaaa29dad77ed7e25caa1d | |
| parent | 26e8f040ba383dc44c25013692748cc27e50799d [diff] | |
| parent | b68f5f0932511fb9975b7e04eebe48707af59e0a [diff] |
resolved conflicts for merge of b68f5f09 to master Change-Id: Ib8dd3a353f40a3357c8dc5ac591cd5e3ab4d0a4b