| commit | 1f7488e21994d7b6e143a4540659c1fbae630634 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Jan 10 11:15:19 2014 -0800 |
| committer | Craig Mautner <cmautner@google.com> | Fri Jan 10 11:15:19 2014 -0800 |
| tree | 5f37492c5e042151ac5eced68c6ade6b04f78875 | |
| parent | b0574ac0a3bb7cf169b86dcbfa8873cf0e7b1233 [diff] | |
| parent | 4504de5d5a8e1c7dfb306b16282f348856c24764 [diff] |
resolved conflicts for merge of 4504de5d to master Change-Id: I8d96fd2b479aebd6de913e617ca190f66c25aaa5