tree 27d087b584ca5577de0aea0e6128467b550555d9
parent c0c9d38170d61081e7cb8afeedd7a9cdef3dcfc9
parent 6ec561d0d919edd0abe58440a0fac2b7a028802a
author Jeff Hamilton <jham@android.com> 1288043205 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1288043205 -0700

Merge "Add a RHS status bar slot for NFC." into gingerbread