tree 92021f3dbdd6b2b86ee4ddf1b980a7458e20bbe3
parent f03ceff2f506133a238848c2f5db4322285cc2b7
parent 10cb312ecd2e62600758e0270f977d0db585d393
author Jeff Sharkey <jsharkey@android.com> 1379457497 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379457498 +0000

Merge "Guard against null Context in attachInfo()." into klp-dev