commit 3368b1f6df52b4e30b471494f484666bd31ed65e
author ihab@google.com <ihab@google.com> Tue Mar 25 21:18:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 25 21:18:33 2014 +0000
tree cdb4a261d2aae8e0caab07ae8805010c96fe365c
parent 8129716e669434a784e48c9f10eb5b68c622d000
parent 47d7306767d07b64868c89535cb7db6adac128d8

am a962af00: Merge "DO NOT MERGE. One-time patch change to resolve differences where klp-modular-dev became out of sync with klp-dev due to failures of automatic merges. We decided it is far better to submit this to fix the build rather than spending a bunch of time d

* commit 'a962af0073294ca8e1c447ba35b76ad46925e33d':
  DO NOT MERGE. One-time patch change to resolve differences where klp-modular-dev became out of sync with klp-dev due to failures of automatic merges. We decided it is far better to submit this to fix the build rather than spending a bunch of time doing forensics on the history of automated merges into klp-modular-dev.