tree b631abf9e8d127eec7aac5a08b19d50df993f793
parent 364c42505db59b2558f6cffa62fc06d9f904d96b
parent e144d1d90b1fbefdedc1d95b6ff33a45fad252ce
author Mindy Pereira <mindyp@google.com> 1330982835 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330982835 -0800

Merge "Include these property setters."