| commit | f291ad46ebab58a9254bdd13c0e5dd581c197e6b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 27 07:44:41 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 07:44:41 2012 -0800 |
| tree | a311f0a5bdea0e196382aaa9be7d4287c129a90c | |
| parent | 5c7d48e411478a78a891e9639a32f1d2ed32155e [diff] | |
| parent | 26cb353457293f1812ed9c9fda87477724ad51ee [diff] |
am 26cb3534: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '26cb353457293f1812ed9c9fda87477724ad51ee':