| commit | 76dd8e33689292e6255b090da7408fba76919424 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Tue Jan 29 11:07:41 2013 -0800 |
| committer | Doug Zongker <dougz@google.com> | Tue Jan 29 11:07:41 2013 -0800 |
| tree | f0a5e4dd168a651bc66c7adafd5f3cfe078f5402 | |
| parent | 8cc97302b2cc42d70af3c6d84a6a46984a09fe24 [diff] | |
| parent | 016806a71b911c8da0cffb7fa4dae0eab433a020 [diff] |
resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aosp Change-Id: Ie513c90bcad779203a241a541945b0cf7c936664