| commit | f798f300f39c9b45e06e18b610cf0f996eea0161 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 26 12:17:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 26 12:17:45 2013 -0700 |
| tree | 0470fa4f153d85feb5e2a84f3d1d868672f6a6ae | |
| parent | 82075a4044efe57ad9bad3d18982e311b4ef53ae [diff] | |
| parent | 540c9fbaf58593e2d9046efd6a29caff6af0e77b [diff] |
am 540c9fba: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '540c9fbaf58593e2d9046efd6a29caff6af0e77b':