| commit | 8cc97302b2cc42d70af3c6d84a6a46984a09fe24 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Tue Jan 29 10:50:22 2013 -0800 |
| committer | Doug Zongker <dougz@google.com> | Tue Jan 29 10:50:22 2013 -0800 |
| tree | f0a5e4dd168a651bc66c7adafd5f3cfe078f5402 | |
| parent | db9697b3b059469153e81bf9e8844fb8e23149ea [diff] | |
| parent | 0fe9742e385f7641a1f6272699349510ac57da9d [diff] |
resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp Change-Id: Ie7a8b642dec0f07d4c8bfd9d8f736fd66c4febe0