| commit | 98e1c7e2d75ddf2f9fb3da2a69a4c1ebb9b7987a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 22 07:27:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 22 07:27:40 2013 -0700 |
| tree | 515ab3c5450e1a156ccad2993a16a509bdfc8f69 | |
| parent | 473b81abcf61602e1a5f2c7444765fcddba6f066 [diff] | |
| parent | 65b43b81d13cd285d46af0be5734bd2f6ae5a159 [diff] |
am 65b43b81: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '65b43b81d13cd285d46af0be5734bd2f6ae5a159':