tree 77c91686cf1cdb95b712bb0c071e4a7f9790dcaa
parent efc1799234e37aae81a3dd9b3298c62167570279
parent 09f0ee541498d7c421906e2817485398040550cf
author Anwar Ghuloum <anwarg@google.com> 1409936834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409936834 +0000

am 0b404514: (-s ours) am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev

* commit '0b404514d9a254c138a31d9e5bcb62dd4c760a79':
  Timing Hacks DO NOT MERGE