commit | d33e3775c8785bf6b93787058b9c779b67860368 | [log] [tgz] |
---|---|---|
author | Andrew Hsieh <andrewhsieh@google.com> | Fri Oct 12 13:41:41 2012 +0800 |
committer | Andrew Hsieh <andrewhsieh@google.com> | Fri Oct 12 13:44:50 2012 +0800 |
tree | 86d25aa684aa712602a2875c5606d9a47679e3c7 | |
parent | a562b0d69699f5b9de5032efacca698c8d857f0f [diff] |
resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp Change-Id: I10e96f48dcd7134cf45a6d8406bf8b69f6593eba