| commit | c530787a27b308554cf24148b37b765181f639b6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:49:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 07:49:43 2012 -0700 |
| tree | bdf1f0348d5a9901cfa86498bd7f88f216b6475c | |
| parent | d870b3dca941208eb6670d8b454ba6bc697ae593 [diff] | |
| parent | 86b5c67993dea522f6cc2549c93f63b0eae05379 [diff] |
am 86b5c679: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '86b5c67993dea522f6cc2549c93f63b0eae05379':