tree c77b0a5d0706ab9b7c833ad58ebc130a281694d1
parent d0284592070cfba543e378cd15b0dd885067532c
parent 9dd0bdea95559f2ba545942c153f8e1c640fe58e
author Ye Wen <ywen@google.com> 1416590579 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416590579 +0000

am 9dd0bdea: Merge "Make CREATOR columns read-only and auto set them in provider" into lmp-mr1-dev

* commit '9dd0bdea95559f2ba545942c153f8e1c640fe58e':
  Make CREATOR columns read-only and auto set them in provider