am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread

Merge commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2' into gingerbread-plus-aosp

* commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2':
  Fix android:allowClearUserData.