| commit | 52200d54e3166743e8811491d07e6700cf256d2c | [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 | 05444e8af43aebc3622febb154cfe602619c6c06 | |
| parent | 331b1e7e1f79be5047bc37557aa414ccbe36f2c5 [diff] | |
| parent | 7264fd1de9f8f26ce0ed6544d07717b42e574a16 [diff] |
am 1ef41605: (-s ours) am d64f4a98: DO NOT MERGE fix null check Merge commit '1ef41605bbde97fb3979003a652fd365a0d034aa' * commit '1ef41605bbde97fb3979003a652fd365a0d034aa': DO NOT MERGE fix null check