| commit | efdf77e842f5c9d698f857a6957a830a284a03cd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:23:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:23:15 2012 -0700 |
| tree | fb90bdf484d931322c08707793da1131a96353f0 | |
| parent | 0ee1b75922c483f8b15f04e9c6fe98046bce4f86 [diff] | |
| parent | b2cb14e07651411ae26745b6bef150617fe5989f [diff] |
am b2cb14e0: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b2cb14e07651411ae26745b6bef150617fe5989f':