commit | dcec4836a7e8153b172db27c10c49fa5d11e684c | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:12:38 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:12:38 2012 -0800 |
tree | 442a287e4340daa619cf37145029bacf1b1ff9db | |
parent | a6326ef671e269863fda56f086388f9b76849e26 [diff] | |
parent | 3902e1967eacb8211c2805eb4281c555bb0df8d8 [diff] |
am 3902e196: am f2701a8a: Reconcile with jb-mr1-release - do not merge * commit '3902e1967eacb8211c2805eb4281c555bb0df8d8':