| commit | 3ea1b12e88180f6abce706c6a2534b8c7bbe7b0e | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Oct 17 07:06:55 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 17 07:06:55 2011 -0700 |
| tree | a5b61337ffcbaea9741cdbb5fffbaeb7b665d0e1 | |
| parent | 543030116428313af22966789e3c4d3a913de30f [diff] | |
| parent | f21a3e284705343eba1eeade90aa1086ce38e2c6 [diff] |
am f21a3e28: Merge "fix android beam icon and add make file" into ics-mr0 * commit 'f21a3e284705343eba1eeade90aa1086ce38e2c6': fix android beam icon and add make file