commit 5e477c49a39992f1cb7719b4a14e4581f2297363
author ihab@google.com <ihab@google.com> Tue Mar 25 21:25:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 25 21:25:01 2014 +0000
tree cdb4a261d2aae8e0caab07ae8805010c96fe365c
parent 4f8986e7ac40a49e574bb02635b971b265ac19fb
parent 3368b1f6df52b4e30b471494f484666bd31ed65e

am 63440e01: 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 bu

* commit '63440e01d01ae139f0e3978a41a902d972f488ef':
  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.