tree a4d7d5ac34e2492dc17a0b47d8e61ea688e970d7
parent 785710e939bf0b1d1ad6cb900c846054ab6a3b7e
parent f58537919ca494dfd4af1ccab02e08b3a6f25dda
author Xavier Ducrohet <xav@google.com> 1404245880 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404245880 +0000

am f5853791: am 6572914d: Merge "Update version to 23.0.2" into idea133 automerge: 2810b9a

* commit 'f58537919ca494dfd4af1ccab02e08b3a6f25dda':
  Update version to 23.0.2