| commit | 465008a40dee670be5fec7fc4de77eba93fa0aef | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 13 10:19:41 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 13 10:19:41 2013 -0700 |
| tree | db4035b7935617ef8cb225aa3407386142e0930a | |
| parent | 8f7341440cf447efc91739bdc4ad24ce4957e83b [diff] | |
| parent | 15fd7684de1af7d5f9e76d5bb8695c1fda036ad0 [diff] |
resolved conflicts for merge of 15fd7684 to jb-mr2-dev Change-Id: I08a339b40bef989b54f5952b89cb41ad3385e8cc