commit | 270ee0c6c62e1bcf278892094653e7ab008b3685 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:24:18 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 07 10:24:18 2012 -0800 |
tree | aab4a58c499dbc46a2b6c8e79d96aaf3b3134d3c | |
parent | f621d62adcbcd81d6479223d9afe47c1d966710d [diff] | |
parent | ba70ed9ae7dab75bde317a8dc8886da309831eca [diff] |
am ba70ed9a: Reconcile with jb-mr1-release - do not merge * commit 'ba70ed9ae7dab75bde317a8dc8886da309831eca':