| commit | b136e96373566e1cc4623dc28db678bfb37951f0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 21 08:29:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 21 08:29:34 2012 -0700 |
| tree | 4baf74690995b2311959232dfd03bfc9e15c21de | |
| parent | d83abaaceb9b36fbda12baa076f506fb8cd0b4c6 [diff] | |
| parent | 7697c9ee45a5d9e3fb0c7fbc242d3af1730eb5db [diff] |
am 7697c9ee: am da7280f2: Reconcile with ics-mr1-release * commit '7697c9ee45a5d9e3fb0c7fbc242d3af1730eb5db':