tree 3e8c71c2c9f3b87441a75741ee867d51cff77b72
parent 2e5a13d2d60528d10f5637ef51b11dcd946724ff
parent 04c5cc6310761d468dae03c2182d4b61e52e6320
author Unsuk Jung <unsuk@google.com> 1433960129 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433960129 +0000

am 04c5cc63: am fe6b9f87: Update the Change log

* commit '04c5cc6310761d468dae03c2182d4b61e52e6320':
  Update the Change log