| commit | 4781e30a96f5b0251b8c090351ff8aa20aeddf0d | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Mar 07 17:58:32 2013 -0800 |
| committer | Ying Wang <wangying@google.com> | Thu Mar 07 18:00:03 2013 -0800 |
| tree | ca42f574512d50844f62e55126ab2ccd229d8c33 | |
| parent | c08eceee8e09a5bd4414d307792712adae741e4e [diff] | |
| parent | de949b11afb58a343178a7eac9c2ca0860f7405f [diff] |
resolved conflicts for merge of de949b11 to jb-mr2-dev Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5