| commit | 87846c1e88b8c3f913a3b64edf437d9cae5868e5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Apr 02 16:27:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 02 16:27:36 2012 -0700 |
| tree | 79602fe23f6954b4b1df2a786d97c68661b1f473 | |
| parent | ed0976b2c3ff72189c39d20204e44a773ac8dc58 [diff] | |
| parent | c5f40bf576e2acc148366b84a22842f321290aab [diff] |
am c5f40bf5: Merge "Change the Mac OS 10.5 workaround so it can\'t be overridden on the command-line." into ics-mr1-plus-art * commit 'c5f40bf576e2acc148366b84a22842f321290aab': Change the Mac OS 10.5 workaround so it can't be overridden on the command-line.