| commit | fa088ed67325ccd94093f47f074982e92392884d | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Fri Jun 03 10:26:15 2011 +0900 |
| committer | satok <satok@google.com> | Fri Jun 03 10:26:15 2011 +0900 |
| tree | f131f449d1316816f9fb2411882e310e1c6f955d | |
| parent | c9ab4fc18afd2cfa371d229f146159cc2f1a930b [diff] | |
| parent | c7223cbf058620c49f74f9dfc1e71508895eefe7 [diff] |
resolved conflicts for merge of 7e2181c0 to master Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0