tree ee0d3bd63f9122e322a8d27a22bc10a76ac6251c
parent c7cf1602c4f6924675f86c1e10387f084c199ae0
parent 661b4f78e48c697429dc46154a4125892c001718
author Dmitry Shmidt <dimitrysh@google.com> 1412253465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412253465 +0000

am 661b4f78: Cumulative patch from commit a313d17de943cbaf12cbf67d666af14791be8ad2

* commit '661b4f78e48c697429dc46154a4125892c001718':
  Cumulative patch from commit a313d17de943cbaf12cbf67d666af14791be8ad2