| commit | 7d9a18eeb684e87da5a907c96d25da21918119b5 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue Jun 12 12:37:42 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 12 12:37:42 2012 -0700 |
| tree | 9c74ba8e52846dc1c00eb3c0be389e4b52f8b17e | |
| parent | 01cb25fddeb03d72585ae13a8a1f1721f4bcef8c [diff] | |
| parent | f195b80c2b8d40211cd91665fc9d2f62ad47f91d [diff] |
Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp