tree 9375dc14d1a8b723390a35158eb3a54f12504a9f
parent 17e0eebdc6223de1f94b5ee538919adda9f58a9a
parent 175a1e60366df522b3146d8ade9cb2b895a29cf9
author Deepanshu Gupta <deepanshu@google.com> 1399058874 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399058874 +0000

am 175a1e60: am e821d0cc: (-s ours) am b27d8814: am 21cf9843: am d1084cc0: Add missing native methods. [DO NOT MERGE]

* commit '175a1e60366df522b3146d8ade9cb2b895a29cf9':
  Add missing native methods. [DO NOT MERGE]