commit | 13805ae9595e0e85a98632439abfaf2893630338 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 09 14:57:37 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 09 14:57:37 2011 -0800 |
tree | 3b28bb8c008ded5fc280ae23d4e5943b1dc10ce6 | |
parent | 4367b4ad61be4c20174678a7ed481e480142710b [diff] | |
parent | 336658c321a6f15f121514342b0a508d84b4b415 [diff] |
am 336658c3: Reconcile with ics-mr1-release * commit '336658c321a6f15f121514342b0a508d84b4b415':