| commit | 9f5fdfc12ec1cb204346492dafe82b94f3482dbd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 15 10:53:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 15 10:53:14 2013 -0700 |
| tree | 2bc0c2aec0a628a79fce0f088ede1d0a5d3bc92b | |
| parent | 87c80267c4cd243620b9ba98da930a043be4a6cb [diff] | |
| parent | 6a3fb0c2e34a1c0b99befbc2b7f035fb35a4ba39 [diff] |
am 6a3fb0c2: Reconcile with jb-mr2-release - do not merge * commit '6a3fb0c2e34a1c0b99befbc2b7f035fb35a4ba39':