| commit | a0e3ce5db6d67be4d3a7a3af22b56c987d8b2009 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Jun 21 17:22:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 21 17:22:57 2012 -0700 |
| tree | e95687bba5face5a39aa0d1f23bcaae8d4674260 | |
| parent | cc59ae597cdaca6fbd42e15e34437e2abf026d70 [diff] | |
| parent | 56f8408e43d0ac9e36aab6a34fbdf90398aa4377 [diff] |
am 56f8408e: (-s ours) am 0c3d438a: Fix NPE in BeamDemo if NFC not present. do not merge. * commit '56f8408e43d0ac9e36aab6a34fbdf90398aa4377': Fix NPE in BeamDemo if NFC not present. do not merge.