commit | 01da3368d85dab0d03387a83b0145c85291b52c6 | [log] [tgz] |
---|---|---|
author | Justin Ho <justinho@google.com> | Fri Dec 16 11:56:19 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 16 11:56:19 2011 -0800 |
tree | 76a85ebc08e2538fb6a27cea972455efcc38a856 | |
parent | d79cad7814e5d13441d5fd24dcf37790af2572fa [diff] | |
parent | 65cd774f303c00ea1cecfa706074467ce8ea4c7f [diff] |
am 9edb26ea: am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1 * commit '9edb26ea551bec24fa417a854ecec3801f15dc1d': Cherry-picking Id45abeba and Ia065dec6 for MR1