tree 9f077807d1461e9c1b24dea7fc7b0cd96082a314
parent d92d17a7a837ade9b98850430159dddb471904c5
parent 7a53dbb56693ee9f55c0cab1a8297436511e8613
author Dmitry Shmidt <dimitrysh@google.com> 1434061042 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434061042 +0000

am 7a53dbb5: Cumulative patch from commit 57e832de37ea0a82e650d8230457e0868a01b72e

* commit '7a53dbb56693ee9f55c0cab1a8297436511e8613':
  Cumulative patch from commit 57e832de37ea0a82e650d8230457e0868a01b72e