| commit | 4f362dfe593f4c8638873c3e7f9a53041bf3edd2 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Mar 29 10:15:42 2013 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Fri Mar 29 10:15:42 2013 -0700 |
| tree | b22f0979328e96c1f251e32e64ef32b71eebc4b0 | |
| parent | 252c3fd10c9da267c6c2c7772025b92bf1ec74e9 [diff] | |
| parent | c508483d99579bf439728133742d39d89c777615 [diff] |
resolved conflicts for merge of c508483d to jb-mr2-dev Change-Id: I15a1f2b2391a973645ef14c36bb3ddf71c815bc9