| commit | 96d9fa29cd1ff48b733eb090e99fe165d194d313 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Wed Jul 11 19:36:17 2012 -0700 |
| committer | Guang Zhu <guangzhu@google.com> | Wed Jul 11 19:36:17 2012 -0700 |
| tree | 8a1933a06a125b9c2bbf8aa988ba81fb611c0114 | |
| parent | c16c945497852629294f9207d317886f8af3a375 [diff] | |
| parent | ef1335eda485cc4d6a7172e08dc89212fb27ed6b [diff] |
resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15