tree 5faa07c2745c1998911666b1429c421df5692ae8
parent faf6d63c778b5390b0432aab25eac419e022eac1
parent 2b3bae61e4b9b360512ab649b25043ee8e990bcc
author Abhishek Arya <aarya@google.com> 1440036288 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440036288 +0000

am 2b3bae61: am 3c376c6f: am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '2b3bae61e4b9b360512ab649b25043ee8e990bcc':
  Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"