| commit | 2dd58b1558c772e355c9e0b6849c27108ea02697 | [log] [tgz] |
|---|---|---|
| author | Adam Momtaz <amomtaz@google.com> | Thu Dec 06 14:00:00 2012 -0800 |
| committer | Adam Momtaz <amomtaz@google.com> | Thu Dec 06 14:00:00 2012 -0800 |
| tree | 954d5422549d0939f8e6d0459752852a0af3a542 | |
| parent | e88b60b61d85172ccd575f9697978a22f646afb8 [diff] | |
| parent | c5b61b93ccee22c3d9eaccf19aa88c7d85caf67e [diff] |
resolved conflicts for merge of c5b61b93 to jb-mr1-dev-plus-aosp Change-Id: If9cc7b6494fe80eae354c423d3bf6424de2fa22d