| commit | 11ce84fcaadb7051735dd50a35f6e6c234fbe480 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Fri Jan 21 09:41:40 2011 -0800 |
| committer | Nick Pelly <npelly@google.com> | Fri Jan 21 09:41:40 2011 -0800 |
| tree | 777cf7ace038ada15ebe002d6af14d17e9a2b8d4 | |
| parent | df80645a97d994f20a9fba1311a884bf17d2b774 [diff] | |
| parent | 97ac293507bfa2913e115f736df3dfd91230a232 [diff] |
resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350