| commit | c020d7b4740aff3aca2867c197f83ebdee572212 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Fri Jul 08 17:53:06 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 08 17:53:06 2011 -0700 |
| tree | fab0586fb1b9fdc53f6be23b6b8999d5bc57fb5d | |
| parent | e2dece12ba4e9a0ea71135ea4e1d4bf1fc3ea125 [diff] | |
| parent | d1c15f96dd2e3b07da6968ea54f6f2bdebe8e190 [diff] |
am d1c15f96: am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 * commit 'd1c15f96dd2e3b07da6968ea54f6f2bdebe8e190': cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c