| commit | d35babb2a62522f785833594a7ec4c1423f830c4 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Thu Jan 05 12:08:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 05 12:08:27 2012 -0800 |
| tree | b7a1b8f9aeeebab1c8317da55b7bb3d568ee7f73 | |
| parent | 15fab1aa8c1ac4d92222dba349c473a8edd7ce99 [diff] | |
| parent | 6a203293681df031b6a47f2f189d4d9d44d18576 [diff] |
am 6a203293: Merge commit \'9a46327e\' into ics-mr1-plus-aosp * commit '6a203293681df031b6a47f2f189d4d9d44d18576': increment version to 4.0.4