| commit | d26f7139a7ff42ca1be470657515767f7509955b | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Jun 08 13:59:21 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 08 13:59:21 2012 -0700 |
| tree | ef3fd100490290892bfb71ed7e3eeab11cfcdb2e | |
| parent | efcc0ca7545190f49bcbc25182d83b21aa01b2aa [diff] | |
| parent | e38b1c4d156a569efc646e86a72ab3a3e3ccf6fc [diff] |
Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp