| commit | f3c660ceb3d7f63c85f61adb96c33b1f3a3bdf73 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 26 11:44:12 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 26 11:44:12 2012 -0700 |
| tree | 7fea88ebb106b73d66636e168125f5932759aa57 | |
| parent | a0991ecf777a62f43a8aeca838b85baef97b417f [diff] | |
| parent | 479368b43cc96ca3387c56304badd30fde219a50 [diff] |
resolved conflicts for merge of 479368b4 to master Change-Id: Ie000624d9b3f194d47fc506347c4e4ad5b19101b