| commit | ee7352f160e3813a201010cf4a68972d0bac8420 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:41 2012 -0700 |
| tree | 29c084c65d0e4fc4181ca9a1c80b62b60321a013 | |
| parent | 77536f9f8fc030379102c9e36ad21ce5b2ab234c [diff] | |
| parent | f0e55de3b1b099c413d430d8f9d46361454c85d2 [diff] |
am f0e55de3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f0e55de3b1b099c413d430d8f9d46361454c85d2':