| commit | 6080cc5fd7c332c79098a50605c0c37d99d4c481 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jan 15 14:24:56 2013 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Tue Jan 15 14:24:56 2013 -0800 |
| tree | d73683e19eb9236bb62e32409ff0b742557644d2 | |
| parent | 5941ff03721005228072dca5b1c808cb5d12a001 [diff] | |
| parent | dd52dfed52404490d51ca5ed43c2192cbc25a7a7 [diff] |
resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0