| commit | f45ffab037ff8ea5dc0ee8cd91c554baba77b249 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:59:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 05:59:17 2012 -0700 |
| tree | e5fadb2f26899bc340141accfe01cb9fff7cd21c | |
| parent | 60d87c5af8e4bfe07b3bba3d6036dd6321eb9bf1 [diff] | |
| parent | c8c5ad6a323476b85adba337574b72d38649c8aa [diff] |
am 2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6':