tree f0a5e4dd168a651bc66c7adafd5f3cfe078f5402
parent db9697b3b059469153e81bf9e8844fb8e23149ea
parent 0fe9742e385f7641a1f6272699349510ac57da9d
author Doug Zongker <dougz@google.com> 1359485422 -0800
committer Doug Zongker <dougz@google.com> 1359485422 -0800

resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp

Change-Id: Ie7a8b642dec0f07d4c8bfd9d8f736fd66c4febe0