commit | 69747880790a89feb80fe231a814f21b1bc0485e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:30:12 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:30:12 2012 -0800 |
tree | 72eb425348bf7d44b464f26200dd514baa12a75a | |
parent | bd815ec0000ac77ec2a1d1c026d62f194c4ed6ea [diff] | |
parent | a12b114c705f8e1c70b83aa354bae00b6ac09f63 [diff] |
am a12b114c: am fcc33af6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'a12b114c705f8e1c70b83aa354bae00b6ac09f63':