tree ea6ca9b98bea95133137b2dcdff4cb3d476b09fe
parent e9d25570a8f67156a77260176b4a7a6f008e156c
parent 2e6d4ae02a955d33a75c0642b8ffead20e11fd9a
author Max Cai <maxtroy@google.com> 1408642739 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408642739 +0000

am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."

* commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a':
  Keep pointers to extension values.