| commit | 8ede04dbd5c09fa6a350e7af2aa49a0bde71725b | [log] [tgz] |
|---|---|---|
| author | Alice Yang <alice@google.com> | Mon Mar 04 19:54:00 2013 -0800 |
| committer | Alice Yang <alice@google.com> | Mon Mar 04 19:54:00 2013 -0800 |
| tree | 23338620916945352f65dfd8d8c61b1ae6ca4cec | |
| parent | 2416ccd3f57e9eaf7ddda487b29964437514e389 [diff] | |
| parent | c4d46df70d525cb2289bd76fb0b0b12637dbbe23 [diff] |
resolved conflicts for merge of c4d46df7 to jb-mr2-dev Change-Id: I8d4c64832f989c70ef432730ab584e3dc71ad004