| commit | 096298d8aef266fc16a1578c48803433a4f4fb06 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:51:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:51:53 2012 -0700 |
| tree | 0a04d688799841c9cb7bfec820b7f7550734f368 | |
| parent | 4e4306ab14f1f2125035ed43fbb021db8bc99c3f [diff] | |
| parent | a82220fef779cff41fc628e63bbd03dc02c4a6a0 [diff] |
am a82220fe: (-s ours) Reconcile with jb-release - do not merge * commit 'a82220fef779cff41fc628e63bbd03dc02c4a6a0': Fix a logging NPE problem