tree e869c8904fae46cd6a7624e01bb04b7a69f39e68
parent af46239a10921980f5030222dff147a592480248
parent deba0610c89d54390c9d2d0a0f3b79fd7679779c
author Abhishek Arya <aarya@google.com> 1439862349 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439862349 +0000

am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit 'deba0610c89d54390c9d2d0a0f3b79fd7679779c':
  Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"