| commit | 71eef22e4ab03c02a2b2574559d14b15c4fd659b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 03 07:34:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 07:34:39 2012 -0700 |
| tree | 198ba3d9fb257bbf87da214ea41cefaa0b5ced18 | |
| parent | 75277754d21030275582f1c1d66982b7a0b45937 [diff] | |
| parent | 3ee91251be45830522c6a0aa8d2c145b08b5f327 [diff] |
am 3ee91251: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3ee91251be45830522c6a0aa8d2c145b08b5f327': JOP03 JOP02B