tree f0a5e4dd168a651bc66c7adafd5f3cfe078f5402
parent 8cc97302b2cc42d70af3c6d84a6a46984a09fe24
parent 016806a71b911c8da0cffb7fa4dae0eab433a020
author Doug Zongker <dougz@google.com> 1359486461 -0800
committer Doug Zongker <dougz@google.com> 1359486461 -0800

resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aosp

Change-Id: Ie513c90bcad779203a241a541945b0cf7c936664