| commit | bc92a28eb36b09326c0502bf2bc1665604183698 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Dec 07 12:13:30 2012 -0800 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Fri Dec 07 12:13:30 2012 -0800 |
| tree | f2278f1b781b38d6e5cd9f88fb3ad794a0a59930 | |
| parent | 244faf968b1b5ac6d74dc28340e7de110ba4271f [diff] | |
| parent | d71914edfba61ca75f94a72d226de2154afee420 [diff] |
resolved conflicts for merge of d71914ed to jb-mr1-dev-plus-aosp Change-Id: Id8c29ea50dae0769c26008f309eb9343d7f317a7