| commit | 84bb18f4c959355cc88a8d18db0e7466f93e4267 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Wed Jun 13 06:45:38 2012 +0900 |
| committer | Satoshi Kataoka <satok@google.com> | Wed Jun 13 06:45:38 2012 +0900 |
| tree | 70768502a554f63095dffb06ead04a3a7cc402bc | |
| parent | 58d9e46ce0594989eb7a89be15b29472351cb01f [diff] | |
| parent | ee78e780fcf598b49a04d1a49932ef85c442eb11 [diff] |
resolved conflicts for merge of ee78e780 to master Change-Id: I88a4996bdd17c5378a67781d8075eff311670c3b