am 1d5707b5: Update Tag app for API changes.

Merge commit '1d5707b5a864f5f154bc2de98f7c2027b8390387' into gingerbread-plus-aosp

* commit '1d5707b5a864f5f154bc2de98f7c2027b8390387':
  Update Tag app for API changes.