| commit | 5eb3a72524481aaff0e52bbb0ba42b5e125fe4ef | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:54:42 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 01 07:54:42 2012 -0700 |
| tree | eb6b23cff810970054064862da2d14f98f1320f6 | |
| parent | e760c7d21d95464e2bee9ec546b708df5e06e2fe [diff] | |
| parent | c8a5ea665182c454d1e4889b8c2727750383e9d6 [diff] |
am c8a5ea66: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c8a5ea665182c454d1e4889b8c2727750383e9d6':