| commit | 8a041e196616af2e1cc1dd1901262a552083d486 | [log] [tgz] |
|---|---|---|
| author | Adam Momtaz <amomtaz@google.com> | Thu Dec 06 20:14:13 2012 -0800 |
| committer | Adam Momtaz <amomtaz@google.com> | Thu Dec 06 23:16:17 2012 -0800 |
| tree | 250991342284a46490359378df54498eba934d36 | |
| parent | 6edc30923dd510ba6683ce65ab92b33d0c5155f3 [diff] | |
| parent | 2dd58b1558c772e355c9e0b6849c27108ea02697 [diff] |
resolved conflicts for merge of 2dd58b15 to master Change-Id: I8563045fffa7910ed530da617162c20d12787cbe