| commit | 8c374054b3d4ffc6e77a1b1d6248215d0ce3e462 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Mar 27 17:04:05 2013 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed Mar 27 17:04:05 2013 -0700 |
| tree | 499fc3e15aad7bb0b1f0810267e25aa93d8bfb22 | |
| parent | 4b7359662b532484f9a329f58b7f5c3c016a5ac5 [diff] | |
| parent | 9a3b17d1847f7477362d05e1139ad9ce82472652 [diff] |
resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6