| commit | dd9018e58820fcf0b3c31151242c57e129926bb9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 15:09:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 15:09:20 2012 -0700 |
| tree | 1e4f2833d5c5603be89a89efc5956fd9fd9cee71 | |
| parent | 36fcec447a8a904744a91ec748115da6e7d56914 [diff] | |
| parent | 3bbf7c7e75bb5ab181f778afc193f4fe598b733f [diff] |
am 3bbf7c7e: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3bbf7c7e75bb5ab181f778afc193f4fe598b733f':