tree 86d25aa684aa712602a2875c5606d9a47679e3c7
parent a562b0d69699f5b9de5032efacca698c8d857f0f
author Andrew Hsieh <andrewhsieh@google.com> 1350020501 +0800
committer Andrew Hsieh <andrewhsieh@google.com> 1350020690 +0800

resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp

Change-Id: I10e96f48dcd7134cf45a6d8406bf8b69f6593eba