commit | ebed8a53cca62d19d13ec2381c7e0f4acf1ba302 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:20:39 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:20:39 2012 -0800 |
tree | e06e5e113fec9dcccf0dfd4dccd1abe23f369713 | |
parent | 5debe92591363de3d73bc32b62f23df707b1aecf [diff] | |
parent | 62fcb21577ccdd68dddd6b6984ad0ce58ee0c228 [diff] |
am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '62fcb21577ccdd68dddd6b6984ad0ce58ee0c228':