| commit | e50892e01b01f5d2fa5bad4df1f5b2c0f507989c | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 05 22:43:45 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:43:45 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 35419830c69b434c4d2e13a0dd9f396760c63b26 [diff] | |
| parent | 49ab0f1636833270019b3c1ed733b0a4129f08be [diff] |
am 49ab0f16: (-s ours) am 34412965: am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev * commit '49ab0f1636833270019b3c1ed733b0a4129f08be':