| commit | b7de2194d54eb81b1db4b50c171ddd0339831155 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jan 15 16:41:29 2013 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Tue Jan 15 16:41:29 2013 -0800 |
| tree | 03a09c0ff25281d52f69c773bfc44399b68b1716 | |
| parent | e45113a1564c6e701fcc076813bee276d501c576 [diff] | |
| parent | c71c678e9b6a4278337b69f2c60c0fbe9988bf93 [diff] |
resolved conflicts for merge of c71c678e to master Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a