commit | 3a49cd8b15a854ef18aae96a8f32dcd403aa81a8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:24:27 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:24:27 2012 -0800 |
tree | 9d33d0b60b7559b2bf3c46820b5e063683c73665 | |
parent | d9db09d723538253169d4e297ff4fa974d16809e [diff] | |
parent | bdcf82513c64690ee0de6a791fdf07b005ebd43d [diff] |
am bdcf8251: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'bdcf82513c64690ee0de6a791fdf07b005ebd43d':