| commit | 97013f483d6a4f20a665d7dc383df5079b4b0bce | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 14 12:42:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 12:42:51 2012 -0800 |
| tree | 1dce1b1b9e8006c8febfee4fb876db797eab312b | |
| parent | 687bb9b854e47314175bce3c1a651e176ece174e [diff] | |
| parent | 355cec04df1440cc5b14c206bb1bdc97657a5bf5 [diff] |
am 355cec04: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '355cec04df1440cc5b14c206bb1bdc97657a5bf5':