| commit | 57a8fa0d564257f5bfe55558f30e0e59655d5414 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:12:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:12:15 2012 -0700 |
| tree | b479405e32012ceefec3f433e6d45745492bd6ce | |
| parent | 9d2334a3913707944fe120f1f317e0955c897f95 [diff] | |
| parent | 0afc1f60b1374feb36012c9248adead192a7f081 [diff] |
am 0afc1f60: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0afc1f60b1374feb36012c9248adead192a7f081':