| commit | e36af707c8a8705ebd19fcc359c51181f7ebd171 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Wed Nov 21 13:07:31 2012 +0900 |
| committer | Jean Chalard <jchalard@google.com> | Wed Nov 21 13:07:31 2012 +0900 |
| tree | fbae289dfb76e703f53ace1afea4ebdea7d52b99 | |
| parent | 41a77f9e6ef6470f7f947e08466983c055a516e7 [diff] | |
| parent | b7e6bbaebcfc0707890cd17a15f70688a01217a7 [diff] |
resolved conflicts for merge of b7e6bbae to master Change-Id: Ic02809190721472d138532d2189328519117e042