| commit | ea3027fec4bafc94a0404b117d051c3a821ca263 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 03 14:07:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 03 14:07:22 2013 -0700 |
| tree | 996b5cfc5ff3ef996bed74cfd56753102ec95e2f | |
| parent | cbc7acb6f521fb680564a4fc6132c1913491de77 [diff] | |
| parent | 0532b398ad3f817f9756bd671ebd2018d1a96291 [diff] |
am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '0532b398ad3f817f9756bd671ebd2018d1a96291':