commit | c2f83b888d0f732d488c285108aca2b5838ca89e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:24 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:24 2012 -0700 |
tree | aec7a7ddbf5b0727563a685a44f4a07d83676143 | |
parent | 0987fb39007f6392a0169376374d2d1289699407 [diff] | |
parent | 4cdfb578e5032b37fe61e4580a55f6f39e369e87 [diff] |
am 4cdfb578: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4cdfb578e5032b37fe61e4580a55f6f39e369e87':