| commit | c8a9913afea1419253f6948450275a48fffb5aee | [log] [tgz] |
|---|---|---|
| author | Benoit Goby <benoit@android.com> | Tue Nov 27 18:36:12 2012 -0800 |
| committer | Benoit Goby <benoit@android.com> | Tue Nov 27 18:36:12 2012 -0800 |
| tree | 8c30265af3703a90c055ac1e647123613fb56fe6 | |
| parent | 70b4345916cacd7c7c5a27e384b16402b23c9beb [diff] | |
| parent | 88f05e8db5f544366cf5418f40b294ef433c8e05 [diff] |
resolved conflicts for merge of 88f05e8d to master Change-Id: Ib18aebd1c0f4f3ace3d7307109fcc6ae5c7a7d65