OSDN Git Service

am d3a456c8: am 97a49274: am f67156eb: Merge "Do not update the type of something...
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 29 Jun 2015 11:38:58 +0000 (11:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Jun 2015 11:38:58 +0000 (11:38 +0000)
* commit 'd3a456c80f0e8ec07a793796ab4e0d8976285ba8':
  Do not update the type of something we already know.


Trivial merge