tree 5ff7871c26679062a3447a63f65c908f32786478
parent 933e08d42434185905b765dcd04b419a4fd3e133
parent 5f4eae4ad2e249d4898d4d4c46c49cfbf4b64a38
author Stephen Hines <srhines@google.com> 1442358611 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442358611 +0000

am 5f4eae4a: Merge "Bump version to 2310 to account for RS object change."

* commit '5f4eae4ad2e249d4898d4d4c46c49cfbf4b64a38':
  Bump version to 2310 to account for RS object change.