| commit | a66c2f10d5f4d553ba45876d013d8637320f3192 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 22 07:27:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 22 07:27:37 2013 -0700 |
| tree | 3fa80b0e077d807990e02480fb785232e3537104 | |
| parent | 116d791e251994f85d906502806c05217c88da2e [diff] | |
| parent | 242e1d2840b439463e0a44ea989ff0afbe07068f [diff] |
am 242e1d28: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '242e1d2840b439463e0a44ea989ff0afbe07068f':