tree 9609fe8f5b0e207633c13c342a06ca1dcd3b69bc
parent ca9f12e26134648c05445a72333e67d8c8c77540
parent 9ff9685f3f1013dcc416f762408f817f00ea116e
author Miao Wang <miaowang@google.com> 1442361754 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442361754 +0000

am 9ff9685f: Merge changes I7ced3653,I2b1cce8a

* commit '9ff9685f3f1013dcc416f762408f817f00ea116e':
  Comments clean up for C++ API
  Fix updateFromNative in C++ API.