| commit | 9b1c3f9413a4b80ac34f1e6034aaab8c0d34edd2 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Fri Jan 24 13:22:39 2014 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Fri Jan 24 13:22:39 2014 -0800 |
| tree | 22ff9f07db7e715abd2a58ce65f9de9d55840612 | |
| parent | c396c932cc85308a6414ed7c1a8304af588e25f1 [diff] | |
| parent | 9e81c5ce3578341d88075f674d43f753b549095e [diff] |
resolved conflicts for merge of 9e81c5ce to master Change-Id: Ifb92d77ccd7497a253c40ff8f0fd50466e9e3f0f