tree 7b3b2187bfff6f4bdc1c22737d5c5c0708579071
parent a18484fb3819feac248255d6ce509049330aca1b
parent ba69d3bd7d0d73296283e44785dd622324662054
author Ryan PC Gibson <ryanpc@google.com> 1314720284 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314720284 -0700

Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread