tree 0329940840e1cd560d5e1e5b0318bba41d8629e7
parent d3576ef8906798d91da3ee88a103f4bedcab169e
parent 14836fb17335b147ebc8081fea11fda0d46ce532
author Jesse Wilson <jessewilson@google.com> 1284684895 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284684895 -0700

am 14836fb1: Merge "Add optional tags to frameworks/base ext." into gingerbread

Merge commit '14836fb17335b147ebc8081fea11fda0d46ce532' into gingerbread-plus-aosp

* commit '14836fb17335b147ebc8081fea11fda0d46ce532':
  Add optional tags to frameworks/base ext.