| commit | faccc974381b13b385ddcce6af2b809c568d007b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:40:19 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:40:19 2012 -0800 |
| tree | 25c054d32ab6d2376cf77e474c8fa3dbc6e5e8ca | |
| parent | 747979cc04275aefce3307c923bfb0d3e8c658b8 [diff] | |
| parent | 7d16e89494ee1a8aefa1d2b77d602bb7c31596de [diff] |
am 7d16e894: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '7d16e89494ee1a8aefa1d2b77d602bb7c31596de':