| commit | 6e7b60b6f383b75a70f6c3cf6740ef884c8c2b0f | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Wed Oct 12 15:06:51 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 12 15:06:51 2011 -0700 |
| tree | 4937e24115cc7b234486eae0c5d97194b2a520f8 | |
| parent | 8257e9e851a229b61aed31cc5727288208b94a2f [diff] | |
| parent | 0f7e4e8e937c4d69ec1742fc03a1a5775bfa2877 [diff] |
am 0f7e4e8e: (-s ours) Merge "DO NOT MERGE cherrypick from master" into ics-mr0 * commit '0f7e4e8e937c4d69ec1742fc03a1a5775bfa2877': DO NOT MERGE cherrypick from master