commit fa0f1140fbaf6c684cb2ad9daab0a1c0a934c346
author ihab@google.com <ihab@google.com> Tue Mar 25 14:42:19 2014 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 25 14:42:19 2014 -0700
tree 20ba5c1ee8d77011e64ed79df0a275448c5be3a4
parent b30d376800e717b2d6f33f97fe074c4f2de4aa0b
parent 4543f9140b3c9935fbe4d94a3ced1137a2f22b03

am 2d7ad753: 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

* commit '2d7ad753d0745c9ba61d8e5e4b82cc7f3a4c1e06':
  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.