| commit | b87716db6e7e493e9ca07d45b9071cb22f2c44be | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:43:02 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:43:02 2012 -0700 |
| tree | 9690cc9eb57aead43dbb1e6dd660d8bb9bfdc0d8 | |
| parent | 9b0b66a8550639c1cdbd44e90a48c80af39583ab [diff] | |
| parent | 7e364dbf0a8f6dcfde76a984a9b7c2bd4a82cd0a [diff] |
am 7e364dbf: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '7e364dbf0a8f6dcfde76a984a9b7c2bd4a82cd0a':