commit | 8a0cbe1bcb3e605f194c79c014c4ee5ef6047528 | [log] [tgz] |
---|---|---|
author | Andrew Hsieh <andrewhsieh@google.com> | Wed Oct 17 13:04:07 2012 +0800 |
committer | Andrew Hsieh <andrewhsieh@google.com> | Wed Oct 17 13:04:07 2012 +0800 |
tree | 01610dec479020fa54355b283d31f8c58b1c59f3 | |
parent | d33e3775c8785bf6b93787058b9c779b67860368 [diff] |
resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp Change-Id: I2d7c57c43249cfbb0adacefebe4c1ec0fef1dc9e