| commit | d1c1988f1dea1c2946cca61144229eb74c893630 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 27 11:36:39 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 11:36:39 2012 -0800 |
| tree | 949deb9a50bab5bc45e16e2fde02d98ca3206118 | |
| parent | ae9f9d72a460bcc2dec462d51933ca5583b15d56 [diff] | |
| parent | 6a93582cf4517d0f379989dd8970d71333c2962b [diff] |
am 6a93582c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '6a93582cf4517d0f379989dd8970d71333c2962b':