| commit | e8e2aa94ff0e83c8f1f13cfab131d9249088d611 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:16:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:16:16 2012 -0700 |
| tree | edd5c25e5bfc5b02a2418a59e0faa7f2b4065521 | |
| parent | b3276745ba2a30aea182933e27410853b79786ee [diff] | |
| parent | f28a40c748b159d3e3b9806848925638779b2705 [diff] |
am f28a40c7: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f28a40c748b159d3e3b9806848925638779b2705':