tree 6706aa909a4565426de1ef62a5450fad7e09b923
parent abf0d1982a64801cfd7ae36e425496ef47107230
parent 2e425d69801667e42b4874548f2a49dc16e95617
author Dmitry Shmidt <dimitrysh@google.com> 1415665835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415665835 +0000

am 2e425d69: Cumulative patch from commits: a7f5271 and 7465640

* commit '2e425d69801667e42b4874548f2a49dc16e95617':
  Cumulative patch from commits: a7f5271 and 7465640