tree 9609fe8f5b0e207633c13c342a06ca1dcd3b69bc
parent 5a405aa885c48562ac7642c99f2c8321d7f7d53a
parent 227df654aed4f6bfc3b2f63841c6542f3f7c91ae
author Miao Wang <miaowang@google.com> 1442362271 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442362271 +0000

am 227df654: am 9ff9685f: Merge changes I7ced3653,I2b1cce8a

* commit '227df654aed4f6bfc3b2f63841c6542f3f7c91ae':
  Comments clean up for C++ API
  Fix updateFromNative in C++ API.