tree 4398b0d32593a13204a5bf69b680425af6fca235
parent 5698c8b2281ff756bfaf4232fa7e99be3ca5eb0f
parent 192ff843b903cc21540b2ca8787c8a0adecb7428
author Elliott Hughes <enh@google.com> 1442009655 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442009655 +0000

am b56bd000: Merge "Add ParseInt (and ParseUint)."

* commit 'b56bd000460254aacaaa897a07e90191b05e7160':
  Add ParseInt (and ParseUint).