tree 01610dec479020fa54355b283d31f8c58b1c59f3
parent d33e3775c8785bf6b93787058b9c779b67860368
author Andrew Hsieh <andrewhsieh@google.com> 1350450247 +0800
committer Andrew Hsieh <andrewhsieh@google.com> 1350450247 +0800

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

Change-Id: I2d7c57c43249cfbb0adacefebe4c1ec0fef1dc9e