commit | 43413f4f0689df973b12ae3f31b97134a2ef1806 | [log] [tgz] |
---|---|---|
author | Cary Clark <cary@android.com> | Wed Aug 25 13:59:01 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 25 13:59:01 2010 -0700 |
tree | da88d275823cf6341545bd984a25b1e900b95f8e | |
parent | 6587045a844393a02736e1e1319f0332af4b823d [diff] | |
parent | 1ef41605bbde97fb3979003a652fd365a0d034aa [diff] |
am 1ef41605: (-s ours) am d64f4a98: DO NOT MERGE fix null check Merge commit '1ef41605bbde97fb3979003a652fd365a0d034aa' * commit '1ef41605bbde97fb3979003a652fd365a0d034aa': DO NOT MERGE fix null check