commit 4543f9140b3c9935fbe4d94a3ced1137a2f22b03
author ihab@google.com <ihab@google.com> Tue Mar 25 21:36:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 25 21:36:40 2014 +0000
tree fba86ed96a817e479f6b7c8ff34e39b467be5925
parent 46a345c9e987d964b61d86bbd79039830fa8f247
parent 5e477c49a39992f1cb7719b4a14e4581f2297363

am 6d0bb796: (-s ours) 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

* commit '6d0bb7960c225e4818ccfcf54b2c95e0236cff5c':
  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.