| commit | 5bf7250ab79b961a412ebbd671c976784f0208a1 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Jul 27 09:27:00 2011 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Wed Jul 27 09:27:00 2011 -0700 |
| tree | bbf83ec5be558d536e86597a4eb2e0e0741a3a62 | |
| parent | 709305efe7b9d0241d3ea279855e4d8ba58ea49e [diff] | |
| parent | de44ac30a078f518e270bfb21315704afe8a8866 [diff] |
resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3